Imported from util-linux-2.13-pre1 tarball.

55 files changed, 37448 insertions, 30676 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 000000000..7f187f57c
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,11 @@
+2005-07-29  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.5.
+	* en@boldquot.header: New file, from gettext-0.14.5.
+	* en@quot.header: New file, from gettext-0.14.5.
+
+2005-01-30  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* en@boldquot.header: New file, from gettext-0.14.1.
+	* en@quot.header: New file, from gettext-0.14.1.
+
diff --git a/po/GNU.ABOUT-NLS b/po/GNU.ABOUT-NLS
deleted file mode 100644
index 28d38c76f..000000000
--- a/po/GNU.ABOUT-NLS
+++ /dev/null
@@ -1,226 +0,0 @@
-Notes on the Free Translation Project
-*************************************
-
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site.  But you do *not*
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-One advise in advance
-=====================
-
-   If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias or message inheritance) as the
-implementation here.  It is also not possible to offer this additional
-functionality on top of a `catgets' implementation.  Future versions of
-GNU `gettext' will very likely convey even more functionality.  So it
-might be a good idea to change to GNU `gettext' as soon as possible.
-
-   So you need not provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-INSTALL Matters
-===============
-
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions.  If neither is available, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is *not* required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --with-catgets
-     ./configure --disable-nls
-
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), or
-else, *totally* disable translation of messages.
-
-   When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   By default the configuration process will not test for the `catgets'
-function and therefore they will not be used.  The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library.  If you nevertheless
-want to use the `catgets' functions use
-
-     ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system).  If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
-
-   Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
-   As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-ISO 639 `LL' two-letter code prior to using the programs in the
-package.  For example, let's suppose that you speak German.  At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
-can be done from your `.login' or `.profile' file, once and for all.
-
-   An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'.  Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs.  In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'.  For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available.  This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
-
-Translating Teams
-=================
-
-   For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list, courtesy of Linux
-International.  You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of December
-1997:
-
-     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
-     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
-     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
-     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
-     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
-     Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
-   If you'd like to volunteer to *work* at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is *not* the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate
-*actively* in translations, or at solving translational difficulties,
-rather than merely lurking around.  If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of December
-1997.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
-
-     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-                     .----------------------------------------------------.
-     bash            |       []          []          []                   |  3
-     bison           |       []          []          []                   |  3
-     clisp           |       [] [] []    []                               |  4
-     cpio            |       []    []    []       [] []    []             |  6
-     diffutils       |       []    []    []                []          [] |  5
-     enscript        |       []    [] [] []          []             []    |  6
-     fileutils       | []    []    []    []       [] []    [] []    [] [] | 10
-     findutils       |       []    []    [] []    [] []    []    []    [] |  9
-     flex            |             []    []       []                   [] |  4
-     gcal            |       []          []          []    []          [] |  5
-     gettext         |    [] []    []    []       [] [] [] [] []    [] [] | 12
-     grep            |       []    []    []       [] [] [] []    [] [] [] | 10
-     hello           |    [] []    []    []       [] [] [] [] []    [] [] | 11
-     id-utils        |       []          []                []             |  3
-     indent          |    [] []                   []       []    []       |  5
-     libc            |       []    []    []       [] []    []          [] |  7
-     m4              |       []          []    []    []          []    [] |  6
-     make            |       []    []    []       [] []    []             |  6
-     music           |                   []                []             |  2
-     ptx             |       []    []    []          [] [] [] []       [] |  8
-     recode          |    [] []    []    []          []    [] []    [] [] |  9
-     sh-utils        |       []    []    []          [] [] [] []       [] |  8
-     sharutils       | []    []    []    []          []                [] |  6
-     tar             | []    []          [] []    [] [] [] [] []    [] [] | 11
-     texinfo         | []    []          []                               |  3
-     textutils       | []    []    []    []       [] [] [] []          [] |  9
-     wdiff           | []    []    []    []          [] [] []          [] |  8
-                     `----------------------------------------------------'
-       17 languages    cs da de en es fi fr it ja ko nl no pl pt ru sl sv
-       27 packages      6  4 25  1 18  1 26  2  1 12 20  9 19  7  4  7 17  179
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If December 1997 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.
-
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 000000000..37c8563ef
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+ca cs da de es et fi fr it ja nl pt_BR ru sl sv tr uk vi
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index ec62b9903..000000000
--- a/po/Makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-PACKAGE = util-linux
-
-include ../make_include
-include ../MCONFIG
-
-ifeq "$(DISABLE_NLS)" "yes"
-  DO_NLS=no
-else
-  DO_NLS=$(HAVE_XGETTEXT)
-endif
-
-#
-# po2tbl.sed is not taken from /usr/share/gettext/intl
-# Often it is not present.
-# A RedHat 5.2 installation only has po2tbl.sed.in.
-#
-PO2TBL = ./po2tbl.sed
-INTL = /usr/share/gettext/intl
-
-SHELL = /bin/sh
-
-localedir = $(LOCALEDIR)
-gnulocaledir = $(LOCALEDIR)
-
-# Not giving an explicit path improves the chances of finding this
-INSTALL = install -c
-INSTALL_DATA = ${INSTALL} -m 644
-
-# Not giving an explicit path improves the chances of finding these
-# On the other hand, I have both xgettext 0.10.35 (in /usr/bin) and
-# /usr/openwin/bin/xgettext, and only the former can be used here..
-GENCAT = gencat
-MSGFMT = msgfmt
-# MSGFMT = msgfmt -c	# -c: undocumented, but useful option
-XGETTEXT = xgettext
-MSGMERGE = msgmerge
-
-
-# ..      for <config.h> (if HAVE_CONFIG_H is set)
-# $(INTL) for "libgettext.h"
-INCLUDES = -I.. -I$(INTL)
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-# Enter here all .po files
-POFILES = ca.po cs.po da.po de.po es.po et.po fi.po fr.po it.po ja.po nl.po pt_BR.po sl.po sv.po tr.po uk.po
-# the same but with .gmo
-GMOFILES = ca.gmo cs.gmo da.gmo de.gmo es.gmo et.gmo fi.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sl.gmo sv.gmo tr.gmo uk.gmo
-
-CATALOGS = $(GMOFILES)
-CATOBJEXT = .gmo
-INSTOBJEXT = .mo
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	$(MSGFMT) -o $@ $<
-
-.po.cat:
-	sed -f $(PO2TBL) < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-all: all-$(DO_NLS)
-
-all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
-
-util-linux.pot:
-	$(XGETTEXT) --default-domain=util-linux --directory=.. \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=POTFILES.in $(FOREIGN)
-	mv util-linux.po util-linux.pot
-
-cat-id-tbl.c: stamp-cat-id
-stamp-cat-id: util-linux.pot
-	rm -f cat-id-tbl.tmp
-	sed -f $(PO2TBL) util-linux.pot \
-		| sed -e "s/@PACKAGE NAME@/util-linux/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp cat-id-tbl.c; \
-	fi
-	rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-install: install-data-$(DO_NLS)
-install-data-no: all
-install-data-yes: all
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  ../mkinstalldirs $$dir; \
-	  $(INSTALL_DATA) $$cat $$dir/util-linux$(INSTOBJEXT); \
-	  echo "installing $$cat as $$dir/util-linux$(INSTOBJEXT)"; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/util-linux$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/util-linux$(INSTOBJEXT).m"; \
-	  fi; \
-	done
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT).m; \
-	done
-
-cat-id-tbl.o: $(INTL)/libgettext.h
-
-clean:
-	rm -f core core.* *~ *.o cat-id-tbl.c cat-id-tbl.tmp
-
-distclean: clean
-	rm -f POTFILES *.gmo *.mo *.msg *.cat *.cat.m
-
-# also util-linux.pot is a generated file
-# however, the translation robot likes it
-
-# only for translators not using the robot
-update-po: 
-	rm -f util-linux.pot
-	$(MAKE) util-linux.pot
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po util-linux.pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: 
-	./update-potfiles
-
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 000000000..22eddd193
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.14.4
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @prefix@/usr/share
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+	  --files-from=$(srcdir)/POTFILES.in \
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000000000..03a156659
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Adrian Bunk <bunk@stusta.de>
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = Adrian Bunk <bunk@stusta.de>
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644
index 000000000..32692ab4b
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8429149a..7c5f8250d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ disk-utils/mkfs.cramfs.c
 disk-utils/mkfs.minix.c
 disk-utils/mkswap.c
 disk-utils/raw.c
-disk-utils/setfdprm.c
 fdisk/cfdisk.c
 fdisk/disksize.c
 fdisk/fdiskaixlabel.c
@@ -29,25 +28,19 @@ hwclock/cmos.c
 hwclock/hwclock.c
 hwclock/kd.c
 hwclock/rtc.c
-lib/carefulputc.c
 lib/env.c
-lib/err.c
 lib/md5.c
-lib/my_reboot.c
 lib/setproctitle.c
-lib/xstrncpy.c
 login-utils/agetty.c
 login-utils/checktty.c
 login-utils/chfn.c
 login-utils/chsh.c
-login-utils/cryptocard.c
 login-utils/initctl.c
 login-utils/islocal.c
 login-utils/last.c
 login-utils/login.c
 login-utils/mesg.c
 login-utils/newgrp.c
-login-utils/passwd.c
 login-utils/selinux_utils.c
 login-utils/setpwnam.c
 login-utils/shutdown.c
@@ -80,12 +73,13 @@ mount/mount.c
 mount/mount_guess_fstype.c
 mount/mount_guess_rootdev.c
 mount/nfsmount.c
+mount/nfsmount_clnt.c
+mount/nfsmount_xdr.c
 mount/pivot_root.c
 mount/realpath.c
 mount/sundries.c
 mount/swapon.c
 mount/umount.c
-mount/version.c
 mount/xmalloc.c
 partx/addpart.c
 partx/bsd.c
@@ -96,8 +90,9 @@ partx/gpt.c
 partx/partx.c
 partx/solaris.c
 partx/unixware.c
-rescuept/rescuept.c
-sys-utils/arch.c
+schedutils/chrt.c
+schedutils/ionice.c
+schedutils/taskset.c
 sys-utils/ctrlaltdel.c
 sys-utils/cytune.c
 sys-utils/dmesg.c
@@ -108,7 +103,6 @@ sys-utils/rdev.c
 sys-utils/readprofile.c
 sys-utils/renice.c
 sys-utils/setsid.c
-sys-utils/sln.c
 sys-utils/tunelp.c
 text-utils/col.c
 text-utils/colcrt.c
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 000000000..9c2a995e3
--- /dev/null
+++ b/po/Rules-quot
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff --git a/po/boldquot.sed b/po/boldquot.sed
new file mode 100644
index 000000000..4b937aa51
--- /dev/null
+++ b/po/boldquot.sed
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“/g
+s/”/”/g
+s/‘/‘/g
+s/’/’/g
diff --git a/po/ca.gmo b/po/ca.gmo
new file mode 100644
index 000000000..8267f7f21
--- /dev/null
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index c39b726e7..1bcbd5508 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,8 @@
 # translation of util-linux.po to Catalan
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
+# Jordi Mallach <jordi@gnu.org>, 2004, 2005.
+# Josep Puigdemont <josep@imatge-sintetica.com>, 2005
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -9,20 +11,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2003-08-01 10:59+0200\n"
-"Last-Translator: Antoni Bella Perez <bella5@teleline.es>\n"
+"Project-Id-Version: util-linux-2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-31 20:23+0100\n"
+"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
 
 #: disk-utils/blockdev.c:62
 msgid "set read-only"
-msgstr "estableix a sols lectura"
+msgstr "estableix a només lectura"
 
 #: disk-utils/blockdev.c:63
 msgid "set read-write"
@@ -30,15 +31,15 @@ msgstr "estableix a lectura/escriptura"
 
 #: disk-utils/blockdev.c:66
 msgid "get read-only"
-msgstr "obtindre sols lectura"
+msgstr "obtingues només lectura"
 
 #: disk-utils/blockdev.c:69
 msgid "get sectorsize"
-msgstr "obtindre la mida del sector"
+msgstr "obtingues la mida del sector"
 
 #: disk-utils/blockdev.c:72
 msgid "get blocksize"
-msgstr "obtindre la mida del bloc"
+msgstr "obtingues la mida del bloc"
 
 #: disk-utils/blockdev.c:75
 msgid "set blocksize"
@@ -46,20 +47,19 @@ msgstr "estableix la mida del bloc"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
-msgstr ""
+msgstr "obtingues el compte de sectors de 32 bits"
 
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "obtindre la mida"
+msgstr "obtingues la mida en octets"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
-msgstr "estableix 'readahead'"
+msgstr "estableix «readahead»"
 
 #: disk-utils/blockdev.c:87
 msgid "get readahead"
-msgstr "obtindre 'readahead'"
+msgstr "obtingues \"readahead\""
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
@@ -72,7 +72,7 @@ msgstr "torna a llegir la taula de particions"
 #: disk-utils/blockdev.c:103
 #, c-format
 msgid "Usage:\n"
-msgstr "Ús:\n"
+msgstr "Forma d'ús:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
@@ -82,17 +82,17 @@ msgstr "  %s --report [dispositius]\n"
 #: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
-msgstr "  %s [-v|-q] comandaments dels dispositius\n"
+msgstr "  %s [-v|-q] ordres dispositius\n"
 
 #: disk-utils/blockdev.c:107
 #, c-format
 msgid "Available commands:\n"
-msgstr "Comandaments disponibles:\n"
+msgstr "Ordres disponibles:\n"
 
 #: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr "%s: Comandament desconegut: %s\n"
+msgstr "%s: Ordre desconeguda: %s\n"
 
 #: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
@@ -102,27 +102,27 @@ msgstr "%s requereix un argument\n"
 #: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
-msgstr "%s ha tingut èxit.\n"
+msgstr "%s s'ha completat amb èxit.\n"
 
 #: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: No pot obrir %s\n"
+msgstr "%s: no es pot obrir %s\n"
 
 #: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr "%s: Error de ioctl en %s\n"
+msgstr "%s: s'ha produït un error d'ioctl en %s\n"
 
 #: disk-utils/blockdev.c:391
 #, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
-msgstr "RO    RA   SSZ   BSZ  Comença Sec.  Mida    Dispositiu\n"
+msgstr "RO    RA   SSZ   BSZ   SectInici    Mida    Dispositiu\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
-msgstr "ús:\n"
+msgstr "forma d'ús:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -141,12 +141,13 @@ msgstr "S'està verificant... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
-msgstr "Llegeix: "
+msgstr "Lectura: "
 
 #: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr "Problema llegint el cilindre %d, s'esperava %d i s'ha llegit %d\n"
+msgstr ""
+"Hi ha un problema en llegir el cilindre %d, s'esperava %d i s'ha llegit %d\n"
 
 #: disk-utils/fdformat.c:79
 #, c-format
@@ -155,27 +156,26 @@ msgid ""
 "Continuing ... "
 msgstr ""
 "dades incorrectes al cilindre %d\n"
-"Continuant... "
+"S'està continuant... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "ús: %s [ -n ] dispositiu\n"
+msgstr "forma d'ús: %s [ -n ] dispositiu\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
-msgstr "%s provinent de %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
+msgstr "%s des de %s\n"
 
 #: disk-utils/fdformat.c:130
 #, c-format
 msgid "%s: not a block device\n"
-msgstr "%s: No és un dispositiu de bloc\n"
+msgstr "%s: no és un dispositiu de bloc\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
@@ -184,17 +184,17 @@ msgstr "No es pot determinar l'actual tipus de format"
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%s cares, %d pistes, %d segons/pista. Capacitat total %d kB.\n"
+msgstr "Cara %s, %d pistes, %d segons/pista. Capacitat total %d kB.\n"
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr "Doble densitat"
+msgstr "Doble"
 
 #: disk-utils/fdformat.c:142
 msgid "Single"
-msgstr "Densitat simple"
+msgstr "Simple"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,113 +203,118 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
-"ús: %s [-hv] [-x dir] fitxer\n"
+"forma d'ús: %s [-hv] [-x dir] fitxer\n"
 " -h         mostra aquesta ajuda\n"
-" -x dir     extreu a dins del dir\n"
+" -x dir     extreu dins del directori dir\n"
 " -v         mostra més missatges\n"
 " fitxer     fitxer a comprovar\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr "%s: Error %d al descomprimir! %p(%d)\n"
+msgstr "%s: s'ha produït un error %d en descomprimir! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: Error en la mida de l'enllaç simbòlic `%s'\n"
+msgstr "%s: hi ha un error en la mida de l'enllaç simbòlic «%s»\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
-msgstr "  descomprimint el bloc en %ld a %ld (%ld)\n"
+msgstr "  s'està descomprimint el bloc de %ld a %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
-msgstr "%s: Mode fals en `%s' (%o)\n"
+msgstr "%s: mode erroni a «%s» (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "  buit en %ld (%d)\n"
+msgstr "  forat a %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: No bloc (%ld) octets\n"
 
-#: disk-utils/fsck.cramfs.c:353
+# "No mida" no és gens correcte... jm
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
-msgstr "%s: No mida (%ld vs %ld) octets\n"
+msgstr "%s: Octets sense mida (%ld vs %ld)\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: cramfs no vàlid, longitud de la ruta errònia\n"
+msgstr "%s: el cramfs és invàlid, la longitud del camí és errònia\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: Compilat sense suport per a -x\n"
+msgstr "%s: compilat sense implementar -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: Atenció, no es pot determinar la mida del sistema de fitxers \n"
+msgstr "%s: avís; no es pot determinar la mida del sistema de fitxers \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
-msgstr "%s no és un dispositiu de bloc o un fitxer\n"
+msgstr "%s no és cap dispositiu de bloc o un fitxer\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
-msgstr "%s: cramfs no vàlid, longitud del fitxer massa curta\n"
+msgstr "%s: el cramfs és invàlid, la longitud del fitxer és massa curta\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr "%s: cramfs no vàlid, màgia errònia\n"
+msgstr "%s: el cramfs és invàlid, la màgia és errònia\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr "%s: Atenció; longitud del fitxer massa llarga, imatge desplaçada?\n"
+msgstr ""
+"%s: avís; la longitud del fitxer és massa llarga, potser és una imatge amb "
+"farciment?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
-msgstr "%s: cramfs no vàlid, error del crc\n"
+msgstr "%s: el cramfs és invàlid, error de crc\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr "%s: Atenció; imatge cramfs antiga, no és CRC\n"
+msgstr "%s: avís; la imatge cramfs és antiga, no té CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr "%s: cramfs no vàlid, superbloc dolent\n"
+msgstr "%s: el cramfs és invàlid, el superbloc és erroni\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
-"%s: cramfs no vàlid, el final de les dades als directoris (%ld)\n"
-"és diferent del començament de les dades dels fitxers (%ld)\n"
+"%s: el cramfs és invàlid, el final de les dades als directoris (%ld)\n"
+"és diferent de l'inici de les dades dels fitxers (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr "%s: cramfs no vàlid, desplaçament no vàlid de les dades dels fitxers\n"
+msgstr ""
+"%s: el cramfs és invàlid, hi ha un desplaçament invàlid de les dades dels "
+"fitxers\n"
 
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Ús: %s [-larvsmf] /dev/_nom_\n"
+msgstr "Forma d'ús: %s [-larvsmf] /dev/nom\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
@@ -318,36 +323,37 @@ msgstr "%s està muntat.\t "
 
 #: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
-msgstr "N'esteu segur que desitgeu continuar?"
+msgstr "Esteu segur de voler continuar?"
 
 #: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
-msgstr "comprovació avortada.\n"
+msgstr "s'ha avortat la comprovació.\n"
 
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Número de zona < FIRSTZONE en el fitxer `%s'."
+msgstr "Número de zona < FIRSTZONE en el fitxer «%s»."
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Número de zona >= ZONES en el fitxer `%s'."
+msgstr "Número de zona >= ZONES en el fitxer «%s»."
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
-msgstr "Elimina bloc"
+msgstr "Elimina el bloc"
 
 #: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Error de lectura: No es pot cercar el bloc en el fitxer '%s'\n"
+msgstr ""
+"S'ha produït un error de lectura: no es pot cercar el bloc al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Error de lectura: Bloc incorrecte en el fitxer '%s'\n"
+msgstr "S'ha produït un error de lectura: bloc erroni al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:389
 #, c-format
@@ -355,21 +361,22 @@ msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Error intern: S'està intentant escriure un bloc incorrecte\n"
-"El requeriment d'escriptura serà ignorat\n"
+"S'ha produït un error intern: s'està intentant escriure un bloc erroni\n"
+"S'ha ignorat la petició d'escriptura\n"
 
 #: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
-msgstr "error cercant en write_block"
+msgstr "s'ha produït un error en fer una cerca en write_block"
 
 #: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Error d'escriptura: Bloc incorrecte en el fitxer '%s'\n"
+msgstr ""
+"S'ha produït un error d'escriptura: hi ha un bloc incorrecte al fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
-msgstr "error cercant en write_super_block"
+msgstr "s'ha produït un error en fer una cerca en write_super_block"
 
 #: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
@@ -377,7 +384,7 @@ msgstr "no es pot escriure el superbloc"
 
 #: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
-msgstr "No es pot escriure el mapa de ínodes"
+msgstr "No es pot escriure el mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
@@ -385,11 +392,11 @@ msgstr "No es pot escriure el mapa de zona"
 
 #: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
-msgstr "No es poden escriure els ínodes"
+msgstr "No es poden escriure els nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:557
 msgid "seek failed"
-msgstr "error cercant"
+msgstr "la cerca ha fallat"
 
 #: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
@@ -401,7 +408,7 @@ msgstr "número màgic incorrecte en el superbloc"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "Sols es suporten blocs o zones de 1k"
+msgstr "Només es suporten blocs o zones de 1k"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
@@ -413,23 +420,25 @@ msgstr "Camp s_zmap_blocks incorrecte en el superbloc"
 
 #: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
-msgstr "No es pot assignar memòria temporal per al mapa de ínodes"
+msgstr ""
+"No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
-msgstr "No es pot assignar memòria temporal per als ínodes"
+msgstr "No es pot assignar memòria intermèdia per als nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
-msgstr "No es pot assignar memòria temporal per al nombre de ínodes"
+msgstr ""
+"No es pot assignar memòria intermèdia per al nombre de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
-msgstr "No es pot assignar memòria temporal per al nombre de zones"
+msgstr "No es pot assignar memòria intermèdia per al nombre de zones"
 
 #: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
-msgstr "No es pot llegir el mapa de ínodes"
+msgstr "No es pot llegir el mapa de nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
@@ -437,7 +446,7 @@ msgstr "No es pot llegir el mapa de zones"
 
 #: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
-msgstr "No es poden llegir els ínodes"
+msgstr "No es poden llegir els nodes d'identificació"
 
 #: disk-utils/fsck.minix.c:612
 #, c-format
@@ -447,7 +456,7 @@ msgstr "Atenció: Firstzone != Norm_firstzone\n"
 #: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
-msgstr "%ld ínodes\n"
+msgstr "%ld nodes d'identificació\n"
 
 #: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
@@ -457,17 +466,17 @@ msgstr "%ld blocs\n"
 #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Primerazonadades=%ld (%ld)\n"
+msgstr "Primera zona de dades=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Midadelazona=%d\n"
+msgstr "Mida de la zona=%d\n"
 
 #: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
-msgstr "Midamàxima=%ld\n"
+msgstr "Mida màxima=%ld\n"
 
 #: disk-utils/fsck.minix.c:622
 #, c-format
@@ -480,42 +489,44 @@ msgid ""
 "namelen=%d\n"
 "\n"
 msgstr ""
-"Longituddelnom=%d\n"
+"longitud del nom=%d\n"
 "\n"
 
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "L'ínode %d està marcat com a no usat, però és usat pel fitxer '%s'\n"
+msgstr ""
+"El node d'identificació %d està marcat com a no usat, però és usat pel "
+"fitxer «%s»\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
-msgstr "Marcar en ús"
+msgstr "Marca'l en ús"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr "El fitxer `%s' té el mode %05o\n"
+msgstr "El fitxer «%s» té el mode %05o\n"
 
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
 msgid "Warning: inode count too big.\n"
-msgstr "Atenció: Nombre d'ínodes massa gran.\n"
+msgstr "Avís: el nombre de nodes d'identificació és massa gran.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "l'ínode arrel no és un directori"
+msgstr "el node d'identificació arrel no és un directori"
 
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer `%s'."
+msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer \"%s\"."
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
 #: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
-msgstr "Esborra"
+msgstr "Neteja"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
@@ -524,13 +535,14 @@ msgstr "El bloc %d en el fitxer `%s' està marcat com a no usat."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
-msgstr "Correcte"
+msgstr "Corregeix"
 
 #: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
-"El directori `%s' conté un nombre d'ínode incorrecte per al fitxer '%.*s'."
+"El directori `%s' conté un nombre de nodes d'identificació incorrecte per al "
+"fitxer «%.*s»."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
@@ -539,22 +551,22 @@ msgstr " Elimina"
 #: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "`%s': Directori incorrecte: '.' no és el primer\n"
+msgstr "«%s»: directori incorrecte: «.» no és el primer\n"
 
 #: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr "`%s': Directori incorrecte: '..' no és el segon\n"
+msgstr "«%s»: directori incorrecte: «..» no és el segon\n"
 
 #: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: Directori incorrecte: '.' no és el primer\n"
+msgstr "%s: directori incorrecte: «.» no és el primer\n"
 
 #: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr "%s: Directori incorrecte: '..' no és el segon\n"
+msgstr "%s: directori incorrecte: «..» no és el segon\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
@@ -563,31 +575,35 @@ msgstr "error intern"
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
-msgstr "%s: Directori incorrecte: Mida < 32"
+msgstr "%s: directori incorrecte: mida < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
-msgstr "error cercant en bad_zone"
+msgstr "s'ha produït un error en cercar a bad_zone"
 
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "No s'ha esborrat el mode de l'ínode %d."
+msgstr "No s'ha esborrat el mode del node d'identificació %d."
 
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr "L'ínode %d no s'usa; marcat com en ús en el mapa de bits."
+msgstr ""
+"El node d'identificació %d no s'usa; s'ha marcat com a usat en el mapa de "
+"bits."
 
 #: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "S'està usant el ínode %d; marcat com a no en ús en el mapa de bits."
+msgstr ""
+"S'està usant el node d'identificació %d; marcat com a en desús en el mapa de "
+"bits."
 
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "Ínode %d (mode = %07o), i_nlinks=%d, comptats=%d."
+msgstr "Node d'identificació %d (mode = %07o), i_nlinks=%d, comptats=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
@@ -596,21 +612,21 @@ msgstr "Estableix i_nlinks als comptats"
 #: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr "Zona %d: Marcada com en ús; cap fitxer no l'utilitza."
+msgstr "Zona %d: marcada com a en ús; cap fitxer no l'utilitza."
 
 #: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Elimina marca"
+msgstr "Elimina la marca"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: En ús, comptada=%d\n"
+msgstr "Zona %d: en ús, comptada=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zona %d: No en ús, comptada=%d\n"
+msgstr "Zona %d: no en ús, comptada=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
@@ -619,20 +635,20 @@ msgstr "Estableix"
 #: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
 #: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
-msgstr "mida d'ínode incorrecte"
+msgstr "mida de node d'identificació incorrecte"
 
 #: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
-msgstr "mida d'ínode v2 incorrecte"
+msgstr "mida de node d'identificació v2 incorrecte"
 
 #: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
-msgstr "es necessita una terminal per a reparacions interactives"
+msgstr "es necessita un terminal per a reparacions interactives"
 
 #: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
-msgstr "No es pot obrir '%s'"
+msgstr "no es pot obrir '%s'"
 
 #: disk-utils/fsck.minix.c:1301
 #, c-format
@@ -642,13 +658,12 @@ msgstr "%s està net; no es comprova.\n"
 #: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Forçant comprovació del sistema de fitxers en %s.\n"
+msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
 
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr ""
-"Al sistema de fitxers en %s hi han elements estranys, s'han de comprovar.\n"
+msgstr "Hi ha elements estranys al sistema de fitxers %s, s'ha de comprovar.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -657,7 +672,7 @@ msgid ""
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 "\n"
-"%6ld ínodes usats (%ld%%)\n"
+"%6ld nodes d'identificació usats (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1338
 #, c-format
@@ -701,32 +716,32 @@ msgstr ""
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "%s: Error a l'obrir: %s\n"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: Error cercant en %s\n"
+msgstr "%s: s'ha produït un error en cercar a %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr "%s: Llegint l'errada en %s\n"
+msgstr "%s: s'ha produït un error de lectura a %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr "sector número: %d, mida del sector: %d\n"
+msgstr "compte de sectors: %d, mida del sector: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr "%s: Error a l'analitzar l'opció\n"
+msgstr "%s: s'ha produït un error en analitzar l'opció\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "Ús: %s [-x] [-d <núm>] imatge-iso9660\n"
+msgstr "Forma d'ús: %s [-x] [-d <núm>] imatge-iso9660\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -734,12 +749,12 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
-"Ús: %s [-v] [-N núm_de_ínodes] [-V nom_volumen]\n"
+"Forma d'ús: %s [-v] [-N nr_de_nodes_d'identificació] [-V nom_volum]\n"
 "       [-F nom_sis._fitx.] dispositiu [quants_blocs]\n"
 
 #: disk-utils/mkfs.bfs.c:135
 msgid "volume name too long"
-msgstr "nom del volumen massa llarg"
+msgstr "nom del volum massa llarg"
 
 #: disk-utils/mkfs.bfs.c:142
 msgid "fsname name too long"
@@ -748,7 +763,7 @@ msgstr "nom del sistema de fitxers massa llarg"
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
 msgid "cannot stat device %s"
-msgstr "No es pot fer `stat' sobre el dispositiu %s"
+msgstr "no es pot fer \"stat\" al dispositiu %s"
 
 #: disk-utils/mkfs.bfs.c:171
 #, c-format
@@ -763,7 +778,7 @@ msgstr "%s no es pot obrir"
 #: disk-utils/mkfs.bfs.c:187
 #, c-format
 msgid "cannot get size of %s"
-msgstr "no es pot aconseguir la mida de %s"
+msgstr "no es pot obtenir la mida de %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
@@ -772,14 +787,14 @@ msgstr "el nombre de blocs es massa gran, el màxim és de %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr "masses ínodes; el màxim és de 512"
+msgstr "massa nodes d'identificació; el màxim és de 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositiu: %s\n"
@@ -787,7 +802,7 @@ msgstr "Dispositiu: %s\n"
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr "Volumen: <%-6s>\n"
+msgstr "Volum: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
@@ -802,12 +817,12 @@ msgstr "MidaBloc: %d\n"
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr "Ínodes: %d (al 1 bloc)\n"
+msgstr "Nodes d'identificació: %d (al 1 bloc)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr "Ínodes: %d (als %ld blocs)\n"
+msgstr "Nodes d'identificació: %d (als %ld blocs)\n"
 
 #: disk-utils/mkfs.bfs.c:238
 #, c-format
@@ -817,56 +832,57 @@ msgstr "Blocs: %ld\n"
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
 msgid "Inode end: %d, Data end: %d\n"
-msgstr "Últim ínode: %d, Dada final: %d\n"
+msgstr "Últim node d'identificació: %d, Dada final: %d\n"
 
 #: disk-utils/mkfs.bfs.c:244
 msgid "error writing superblock"
-msgstr "error escrivint superbloc"
+msgstr "s'ha produït un error en escriure el superbloc"
 
 #: disk-utils/mkfs.bfs.c:264
 msgid "error writing root inode"
-msgstr "error escrivint ínode arrel"
+msgstr "s'ha produït un error en escriure el node d'identificació arrel"
 
 #: disk-utils/mkfs.bfs.c:269
 msgid "error writing inode"
-msgstr "error escrivint ínode"
+msgstr "s'ha produït un error en escriure el node d'identificació"
 
 #: disk-utils/mkfs.bfs.c:272
 msgid "seek error"
-msgstr "error cercant"
+msgstr "s'ha produït un error en cercar"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr "error escrivint . entrada"
+msgstr "s'ha produït un error en escriure l'entrada ."
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr "error escrivint .. entrada"
+msgstr "s'ha produït un error en escriure l'entrada .."
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
-msgstr "error tancant %s"
+msgstr "s'ha produït un error en tancar %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"Ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu [mida]\n"
+"Forma d'ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu "
+"[mida]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: Memòria esgotada\n"
+msgstr "%s: No hi ha prou memòria\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versió %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -883,20 +899,22 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"ús: %s [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
-"fitxer_eixida\n"
-" -h         mostra aquesta ajuda\n"
-" -v         més missatges\n"
-" -E         converteix els avisos en errors (estatus d'eixida no cero)\n"
-" -e edició  estableix el nombre d'edició (part de fsid)\n"
-" -i fitxer  insereix una imatge de fitxer al sistema de fitxers (requereix\n"
-"            >= 2.4.0)\n"
-" -n nom     estableix el nom del sistema de fitxers cramfs\n"
-" -p         desplaça %d octets per al codi d'arrencada\n"
-" -s         ordena les entrades de directori (opció antiga, ignorar)\n"
-" -z         crear buits explícits (requereix >= 2.3.39)\n"
-" nom_dir    arrel del sistema de fitxers que serà comprimit\n"
-" fit._eix.  fitxer d'eixida\n"
+"forma d'ús: %s [-h] [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
+"sortida\n"
+" -h        mostra aquesta ajuda\n"
+" -v        més missatges\n"
+" -E        converteix els avisos en errors (estat de sortida no zero)\n"
+" -b        utilitza aquesta mida de bloc, ha de ser igual que la mida\n"
+"           de pàgina\n"
+" -e edició estableix el número d'edició (part de fsid)\n"
+" -i fitxer insereix una imatge de fitxer al sistema de fitxers\n"
+"           (requereix >= 2.4.0)\n"
+" -n nom    estableix el nom del sistema de fitxers cramfs\n"
+" -p        desplaça %d octets per al codi d'arrencada\n"
+" -s        ordena les entrades de directori (opció antiga, s'ignora)\n"
+" -z        crea forats explícits (requereix >= 2.3.39)\n"
+" nom_dir   arrel del sistema de fitxers que es comprimirà\n"
+" sortida   fitxer de sortida\n"
 
 #: disk-utils/mkfs.cramfs.c:335
 #, c-format
@@ -904,14 +922,14 @@ msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
-"Trobo que és massa llarg (%u octets), nom del fitxer `%s'.\n"
-" Si us plau, incrementeu MAX_INPUT_NAMELEN en mkcramfs.c i recompileu. "
-"Sortint.\n"
+"S'ha trobat un nom de fitxer '%2$s' molt llarg (%1$u octets).\n"
+" Incrementeu MAX_INPUT_NAMELEN a mkcramfs.c i recompileu-lo. S'està "
+"sortint.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr "sistema de fitxers massa gran.  Sortint.\n"
+msgstr "el sistema de fitxers és massa gran. S'està sortint.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -919,14 +937,13 @@ msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
-"S'han excedit les MAXENTRIES. Incrementeu aquest valor en mkcramfs.c i\n"
-"recompileu.  Sortint.\n"
+"S'ha excedit MAXENTRIES. Incrementeu aquest valor a mkcramfs.c i\n"
+"recompileu. S'està sortint.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr "CARAM: Bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
+msgstr "Ep: bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
 
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
@@ -939,13 +956,13 @@ msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
-"atenció: S'estima que la mida requerida (cota superior) és %LdMB, però la "
-"mida màxima de la imatge és %uMB. Podria abortar prematurament.\n"
+"avís: s'estima que la mida requerida (cota superior) és d %LdMB, però la "
+"mida màxima de la imatge és %uMB. Es podria sortir prematurament.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
-msgstr "Incloguent: %s\n"
+msgstr "S'està incloent: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
@@ -960,7 +977,7 @@ msgstr "Tot: %d kilooctets\n"
 #: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
-msgstr "Super bloc: %d octets\n"
+msgstr "Súper bloc: %d octets\n"
 
 #: disk-utils/mkfs.cramfs.c:886
 #, c-format
@@ -970,47 +987,43 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "no hi ha prou espai per a l'imatge ROM (assignat %Ld, emprat %d)\n"
+msgstr "no hi ha prou espai per a la imatge ROM (assignats %Ld, emprats %d)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr "ha fallat l'escriptura de l'imatge ROM (%d %d)\n"
+msgstr "No és possible escriure la imatge ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "atenció: Els noms dels fitxers es trunquen a 255 octets.\n"
+msgstr "avís: els noms de fitxer es trunquen a 255 octets.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
 msgid "warning: files were skipped due to errors.\n"
-msgstr "atenció: S'han saltat fitxers degut a errors.\n"
+msgstr "avís: s'han saltat fitxers degut a errors.\n"
 
 #: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr "atenció: Les mides es trunquen a %luMB (menys 1 octet).\n"
+msgstr "avís: la mida dels fitxers es trunca a %luMB (menys 1 octet).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: Els uids es trunquen a %u bits,  (Podria ser un problema de "
-"seguretat).\n"
+"avís: els identificadors d'usuari (uid) es trunquen a %u bits,  (podria ser "
+"un problema de seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: Els gids es trunquen a %u bits.  (Podria ser un problema de "
-"seguretat).\n"
+"avís: els identificadors de grup (gid) es trunquen a %u bits.  (Podria ser "
+"un problema de seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1018,65 +1031,64 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"ATENCIÓ: Els nombres de dispositiu es trunquen a %u bits.  Amb seguretat "
-"que\n"
-"es deu a fitxers de dispositius erronis.\n"
+"AVÍS: els nombres de dispositiu es trunquen a %u bits. És gairebé segur que\n"
+"això provocarà que alguns dispositius de fitxers siguin erronis.\n"
 
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/_nom_ [blocs]\n"
+msgstr "Forma d'ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/nom [blocs]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s està muntat; aquí no es crearà un sistema de fitxers!"
+msgstr "%s ja està muntat; no s'hi crearà cap sistema de fitxers."
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
-msgstr "Error cercant el bloc d'arrencada en write_tables"
+msgstr "s'ha produït un error en cercar el bloc d'arrencada a write_tables"
 
 #: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
-msgstr "No es pot esborrar el sector d'arrencada"
+msgstr "no s'ha pogut netejar el sector d'arrencada"
 
 #: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
-msgstr "Error cercant en write_tables"
+msgstr "s'ha produït un error en cercar a write_tables"
 
 #: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
-msgstr "No es pot escriure el mapa dels ínodes"
+msgstr "no s'ha pogut escriure el mapa dels nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
-msgstr "No es pot escriure el mapa de zones"
+msgstr "no s'ha pogut escriure el mapa de zones"
 
 #: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
-msgstr "No es poden escriure els ínodes"
+msgstr "no s'ha pogut escriure els nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
-msgstr "Error escrivint en write_block"
+msgstr "no s'ha pogut escriure a write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
-msgstr "Hi han masses blocs incorrectes"
+msgstr "hi ha massa blocs incorrectes"
 
 #: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
-msgstr "No hi han prous blocs correctes"
+msgstr "no hi ha prou blocs correctes"
 
 #: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
-msgstr "No es pot assignar memòria temporal per als mapes"
+msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
 #: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
-msgstr "No és possible assignar memòria temporal per als ínodes"
+msgstr ""
+"no s'ha pogut assignar memòria intermèdia per als nodes d'identificació"
 
 #: disk-utils/mkfs.minix.c:512
 #, c-format
@@ -1084,27 +1096,27 @@ msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
-"Midamàx.=%ld\n"
+"Mida_màx.=%ld\n"
 "\n"
 
 #: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
-msgstr "Error cercant durant la comprovació de blocs"
+msgstr "no s'ha pogut cercar durant la comprovació de blocs"
 
 #: disk-utils/mkfs.minix.c:534
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
-msgstr "Valors estranys en do_check: Probablement hi han errors\n"
+msgstr "Hi ha valors estranys a do_check: probablement hi ha errors\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
-msgstr "Error cercant en check_blocks"
+msgstr "no s'ha pogut cercar a check_blocks"
 
 #: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"Blocs incorrectes abans de l'àrea de dades: No es pot crear el sistema de "
-"fitxers"
+"blocs incorrectes abans de l'àrea de dades: no s'ha pogut crear el sistema "
+"de fitxers"
 
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
@@ -1123,7 +1135,7 @@ msgstr "no es pot obrir el fitxer de blocs incorrectes"
 #: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "strtol error: number of blocks not specified"
-msgstr "error de strtol: No s'han especificat el nombre de blocs"
+msgstr "error a strtol: no s'han especificat el nombre de blocs"
 
 #: disk-utils/mkfs.minix.c:704
 #, c-format
@@ -1138,109 +1150,112 @@ msgstr "no es pot fer stat per a %s"
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "no s'intentarà crear el sistema de fitxers en '%s'"
+msgstr "no s'intentarà crear cap sistema de fitxers a '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "la mida de la pàgina %d especificada pel usuari es incorrecte\n"
+msgstr "La mida de la pàgina que ha especificat l'usuari, %d, no és correcte\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
-"S'utilitza la mida de la pàgina %d especificada pel usuari, en comptes dels "
-"valors del sistema %d/%d\n"
+"S'està fent servir la mida de la pàgina %d especificada per l'usuari, en "
+"comptes dels valors del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Assumint que la mida de les pàgines és de %d (no %d)\n"
+msgstr "S'està assumint que la mida de les pàgines és de %d (i no %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
+"La mida de la capçalera d'intercanvi és errònia, no s'ha escrit cap "
+"etiqueta.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "S'ha truncat l'etiqueta.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "etiqueta"
+msgstr "sense etiqueta, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "sense uuid\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Ús: %s [-c] [-v0|-v1] [-pMIDA_PÀG] /dev/_nom_ [blocs]\n"
+msgstr ""
+"Forma d'ús: %s [-c] [-v0|-v1] [-pMIDAPÀG] [-L etiqueta] /dev/_nom_ [blocs]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
-msgstr "hi han masses pàgines incorrectes"
+msgstr "hi ha massa pàgines incorrectes"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
-msgstr "Memòria esgotada"
+msgstr "S'ha esgotat la memòria"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "una pàgina incorrecta\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d pàgines incorrectes\n"
+msgstr "%lu pàgines incorrectes\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s: Error: No heu especificat a on està l'espai d'intercanvi?\n"
+msgstr "%s: error: no es pot especificar l'espai d'intercanvi enlloc?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
-msgstr "%s: Error: La mida %ld es superior a la mida del dispositiu %d\n"
+msgstr "%s: error: la mida %lu es més gran que a la mida del dispositiu %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr "%s: Error: Versió desconeguda %d\n"
+msgstr "%s: error: versió desconeguda %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: Error: L'espai d'intercanvi ha de tindre com a mínim %ldkB\n"
+msgstr "%s: error: l'espai d'intercanvi ha de tenir com a mínim %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: Atenció: L'espai d'intercanvi s'ha truncat en %ldkB\n"
+msgstr "%s: avís: l'espai d'intercanvi s'ha truncat a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: Error: No heu especificat a on està l'espai d'intercanvi?\n"
+msgstr "%s: error: etiqueta només amb espai d'intercanvi v1\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "No s'intentarà crear el dispositiu d'intercanvi en '%s'"
+msgstr "No s'intentarà crear cap dispositiu d'intercanvi a '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
-msgstr "fatal: No es pot llegir la primera pàgina"
+msgstr "fatal: no es pot llegir la primera pàgina"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1248,128 +1263,90 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: El dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
-"Això probablement significa que crear un espai d'intercanvi v0 destruirà\n"
-"la taula de particions. No s'ha creat l'espai d'intercanvi. Si de veres\n"
-"desitgeu crear-lo en aquest dispositiu, useu l'opció -f per a forçar-ho.\n"
+"%s: el dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
+"Això probablement significa que si es crea un espai d'intercanvi v0, es\n"
+"destruirà la taula de particions.\n"
+"No s'ha creat l'espai d'intercanvi. Si de realment voleu crear un espai\n"
+"d'intercanvi v0 en aquest dispositiu, useu l'opció -f per a forçar-ho.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
-msgstr "No es pot configurar l'espai d'intercanvi: No es pot llegir"
+msgstr "No s'ha pogut configurar l'espai d'intercanvi: no es pot llegir"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
+msgstr "S'està configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
-msgstr "No es pot rebobinar el dispositiu d'intercanvi"
+msgstr "no s'ha pogut rebobinar el dispositiu d'intercanvi"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
-msgstr "no es pot escriure la pàgina de la firma"
+msgstr "no s'ha pogut escriure la pàgina de la signatura"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
-msgstr "fsync ha fallat"
-
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Número no vàlid: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Error de sintaxi: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Paràmetre no establert: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] nom del dispositiu\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] dispositiu mida sectors capçals pistes stretch interval tassa "
-"spec1 format_interval\n"
+msgstr "no s'ha pogut fer fsync"
 
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dispositiu\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dispositiu\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilitzable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espai lliure"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
-msgstr "S'ha modificat el disc.\n"
+msgstr "El disc s'ha modificat.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
-"Reinicieu el sistema per a assegurar-vos de que la taula de particions ha "
-"estat actualitzada correctament.\n"
+"Arrenqueu de nou el sistema per a assegurar-vos de que la taula de "
+"particions s'ha actualitzat correctament.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1378,817 +1355,794 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: Si heu creat o modificat alguna de les\n"
-"particions de DOS 6.x, si us plau consulteu la pàgina\n"
-"del manual de cfdisk per a informació addicional.\n"
+"ATENCIÓ: Si heu creat o modificat alguna partició\n"
+"DOS 6.x, consulteu la pàgina del manual de cfdisk\n"
+"per a informació addicional.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERROR FATAL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
-msgstr "Premeu una tecla per a sortir de cfdisk"
+msgstr "Premeu una tecla per a sortir del cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Error accedint a la unitat de disc"
+msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
-msgstr "No es pot llegir la unitat de disc"
+msgstr "No s'ha pogut llegir la unitat de disc"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
-msgstr "No es pot escriure en la unitat de disc"
+msgstr "No s'ha pogut escriure a la unitat de disc"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
-msgstr "Hi han masses particions"
+msgstr "Hi ha massa particions"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partició comença abans del sector 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partició acaba abans del sector 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partició comença despres de la fí del disc"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partició acaba despres de la fí del disc"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partició acaba en l'últim cilindre parcial"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
-msgstr "les particions lògiques no estan en un ordre de disc"
+msgstr "les particions lògiques no estan en l'ordre del disc"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
-msgstr "solapament de particions lògiques"
+msgstr "les particions lògiques s'encavalquen"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
-msgstr "solapament de les particions lògiques ampliades"
+msgstr "les particions lògiques ampliades s'encavalquen"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Error intern al crear una unitat lògica sense partició estesa !!!!"
+"!!!! Error intern en crear una unitat lògica sense partició estesa !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"No es pot crear una unitat lògica aquí; es crearan dos particions esteses"
+"No s'ha pogut crear cap unitat lògica; es crearan dues particions esteses"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "Ítem del menú massa llarg; l'aspecte del menú pot ser estrany."
+msgstr "L'element del menú és massa llarg; l'aspecte del menú pot ser estrany."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Menú sense direcció; l'opció per defecte és horitzontal."
+msgstr "El menú no té direcció; l'opció per defecte és horitzontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla no permesa"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Premeu una tecla per a continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primària"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
-msgstr "Crear una nova partició primària"
+msgstr "Crea una nova partició primària"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Lògica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
-msgstr "Crear una nova partició lògica"
+msgstr "Crea una nova partició lògica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
-msgstr "No crear cap partició"
+msgstr "No creïs cap partició"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Error intern !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Mida (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Principi"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
-msgstr "Afegir partició al principi de l'espai lliure"
+msgstr "Afegeix partició al principi de l'espai lliure"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
-msgstr "Afegir partició al final de l'espai lliure"
+msgstr "Afegeix partició al final de l'espai lliure"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
-msgstr "No hi ha espai per a crear la partició estesa"
+msgstr "No hi ha espai per crear la partició estesa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "no hi ha cap taula de particions.\n"
+msgstr "No hi ha cap taula de particions.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "No hi ha taula de partició o aquesta té una firma desconeguda"
+msgstr ""
+"No hi ha cap taula de particions. S'està començant amb una taula buida."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "Sols imprimir la taula de particions"
+msgstr "La signatura a la taula de particions és errònia"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "no hi ha cap taula de particions.\n"
+msgstr "Es desconeix el tipus de taula de particions"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Desitgeu començar amb una taula buida [s/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Heu especificat més cilindres dels que caben al disc"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
-msgstr "No es pot obrir la unitat de disc"
+msgstr "No s'ha pogut obrir la unitat de disc"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
-msgstr "El disc obert és de sols lectura; no teniu permís per a escriure-hi"
+msgstr "S'ha obert un disc de només lectura; no teniu permís per a escriure-hi"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
-msgstr "No es pot obtindre la mida del disc"
+msgstr "No s'ha pogut obtenir la mida del disc"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partició primària incorrecta"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partició lògica incorrecta"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Atenció!! Això pot destruir les dades del vostre disc!"
+msgstr "Avís: Això pot destruir les dades del disc!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Esteu segurs de que voleu escriure la taula de particions al disc? (si o "
-"no): "
+"Esteu segur que voleu escriure la taula de particions al disc? (sí o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "No s'ha escrit la taula de particions al disc"
 
-#: fdisk/cfdisk.c:1872
+# FIXME: és possible que no es puga introduir l'accent. jm
+#: fdisk/cfdisk.c:1870
 msgid "yes"
-msgstr "si"
+msgstr "sí"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
-msgstr "Si us plau escriviu `si' o `no'"
+msgstr "Escriviu «sí» o «no»"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
-msgstr "Escrivint la taula de particions al disc..."
+msgstr "S'està escrivint la taula de particions al disc..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
-msgstr "Taula de particions del disc, escrita"
+msgstr "S'ha escrit la taula de particions del disc"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"S'ha escrit la taula de particions, però la nova lectura de la taula ha "
-"fallat.  Reinicieu per a actualitzar-la."
+"S'ha escrit la taula de particions, però no s'ha pogut rellegir.  Arrenqueu "
+"de nou per actualitzar-la."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"No hi han particions primàries marcades com a d'arrencada. Així la MBR del "
-"DOS no podrà arrencar."
+"No hi ha particions primàries marcades com a d'arrencada. La MBR del DOS no "
+"podrà arrencar."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Hi ha més d'una partició primària marcada com d'arrencada. Així la MBR del "
-"DOS no podrà arrencar."
+"Hi ha més d'una partició primària marcada com a d'arrencada. La MBR del DOS "
+"no podrà arrencar."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
-"Escriviu el nom del fitxer o premeu Intro per a visualitzar-lo en pantalla: "
+"Escriviu el nom del fitxer o premeu la tecla de retorn per visualitzar-ho en "
+"pantalla: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "No es pot obrir el fitxer '%s'"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unitat de disc: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Cap   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Lòg"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primària"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Lògica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Cap"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Taula de particions per a %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Primer      Últim\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
-" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
-"Flag\n"
-" # Tipus      Sector      Sector   Despl.    Long.    (ID) Sist. Fitxers   "
-"Etiqueta\n"
+" # Tipus      Sector      Sector   Despl.    Longitud  (ID) T. de sist. "
+"fitx.  Senyal.\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
-"-- ------- ----------- ----------- ------ ----------- -------------------- "
-"----\n"
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
+"\n"
+"-- -----      ------      ------   ------    --------  "
+"----------------------  ------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
-msgstr "         ---Inici---         ----Final----     Inici     Nombre de\n"
+msgstr "         ---Inici---        ----Final----      Inici     Nombre de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
-msgstr " # Indi. Cap. Sec. Cil.  ID  Cap. Sec. Cil.   Sector     Sectors\n"
+msgstr " # Senyal Cap Sec  Cil   ID  Cap  Sec  Cil     Sector    Sectors\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ------ --- ---  ---   --  ---  ---  ---     ------    ------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
-msgstr "En cru"
+msgstr "Crues"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
-msgstr "Imprimeix la taula utilitzant el format de dades en cru"
+msgstr "Imprimeix la taula utilitzant el format de dades crues"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectors"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Imprimeix la taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
-msgstr "Sols imprimir la taula de particions"
+msgstr "Imprimeix només la taula de particions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
-msgstr "No imprimir la taula"
+msgstr "No imprimeixes la taula"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla d'ajuda per a cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "Això és el cfdisk, un programa per al particionament del disc basat en"
+msgstr "Això és el cfdisk, un programa per a la partició de discs basat en"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "curses, el qual us permetrà crear, suprimir i modificar particions en"
+msgstr "curses, que us permet crear, suprimir i modificar particions del"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
-msgstr "el vostre disc dur."
+msgstr "disc dur."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright © 1994-1999 Kevin E. Martin i aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
-msgstr "Comandament Significat"
+msgstr "Ordre       Significat"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
-msgstr "----------- ----------"
+msgstr "-----       ----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b         Fixa l'etiqueta d'arrencada en la partició actual"
+msgstr "  b          Fixa el senyalador d'arrencada a la partició actual"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
-msgstr "  d         Suprimeix l'actual partició"
+msgstr "  d          Suprimeix l'actual partició"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
-"  g         Canvia paràmetres de cilindres, capçals i sectors per pista"
+"  g          Canvia paràmetres de cilindres, capçals i sectors per pista"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
-msgstr "            ATENCIÓ: Aquesta opció sols hauria de ser usada per gent"
+msgstr "             Avís: Aquesta opció només l'hauria d'usar aquells qui"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "            que conegui el funcionament de la mateixa."
+msgstr "             saben el que es fan."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
-msgstr "  h         Imprimeix aquesta pantalla"
+msgstr "  h          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m         Maximitza l'utilització de disc de la partició actual"
+msgstr "  m          Maximitza la utilització de disc de la partició actual"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "            Nota: Aquesta opció pot fer la partició incompatible"
+msgstr "             Nota: Aquesta opció pot fer la partició incompatible"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
-msgstr "            amb DOS, OS/2, ..."
+msgstr "             amb DOS, OS/2..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
-msgstr "  n         Crea una nova partició des de l'espai lliure"
+msgstr "  n          Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
-"  p         Imprimeix la taula de particions en la pantalla o en un fitxer"
+"  p          Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
-msgstr "            Hi han diversos formats diferents per a la partició"
+msgstr "             Hi ha diversos formats diferents per a la partició"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
-msgstr "            entre els que podeu escollir:"
+msgstr "             entre els quals podeu escollir:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "               r - Dades en cru (exactament el que s'escriurà al disc)"
+msgstr "                r - Dades crues (exactament el que s'escriurà al disc)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
-msgstr "               s - Taula ordenada per sectors"
+msgstr "                s - Taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
-msgstr "               t - Taula en format en cru"
+msgstr "                t - Taula en format cru"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
-msgstr "  q         Surt del programa sense escriure la taula de particions"
+msgstr "  q          Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
-msgstr "  t         Canvia el tipus del sistema de fitxers"
+msgstr "  t          Canvia el tipus del sistema de fitxers"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
-msgstr "  u         Canvia les unitats de la mida visualitzava de la partició"
+msgstr "  u          Canvia les unitats de la mida visualitzava de la partició"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "            Alterna entre MB, sectors i cilindres"
+msgstr "             Alterna entre MB, sectors i cilindres"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W         Escriu la taula de particions al disc (W en majúscula)"
+msgstr "  W          Escriu la taula de particions al disc (W en majúscula)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "            Donat que això destruirà les dades del disc, haureu"
+msgstr "             Com que això destruirà les dades del disc, ho haureu"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "            de confirmar o denegar escrivint `si' o"
+msgstr "             de confirmar o denegar escrivint «sí» o"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
-msgstr "            `no'"
+msgstr "              «no»"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Fletxa amunt  Desplaça el cursor a l'anterior partició"
+msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Fletxa avall  Desplaça el cursor a la següent partició"
+msgstr "Fletxa avall Desplaça el cursor a la següent partició"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
-msgstr "Ctrl-L        Redibuixa la pantalla"
+msgstr "Ctrl-L       Redibuixa la pantalla"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
-msgstr "  ?           Imprimeix aquesta pantalla"
+msgstr "  ?          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Nota: Tots els comandaments es poden escriure en majúscules o"
+msgstr "Nota: Totes les ordres es poden escriure en majúscules o"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindres"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
-msgstr "Canviar la geometria dels cilindres"
+msgstr "Canvia la geometria dels cilindres"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Capçals"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
-msgstr "Canviar la geometria dels capçals"
+msgstr "Canvia la geometria dels capçals"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
-msgstr "Canviar la geometria dels sectors"
+msgstr "Canvia la geometria dels sectors"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fet"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "S'ha finalitzat el canvi de geometria"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
-msgstr "Escriviu el nombre de cilindres: "
+msgstr "Introduïu el nombre de cilindres: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
-msgstr "Valor dels cilindres no permes"
+msgstr "Valor dels cilindres no permès"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
-msgstr "Escriviu el nombre de capçals: "
+msgstr "Introduïu el nombre de capçals: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
-msgstr "Valor dels capçals no permes"
+msgstr "Valor dels capçals no permès"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
-msgstr "Escriviu el nombre de sectors per pista: "
+msgstr "Introduïu el nombre de sectors per pista: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
-msgstr "Valor dels sectors no permes"
+msgstr "Valor dels sectors no permès"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
-msgstr "Escriviu el tipus del sistema de fitxers: "
+msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "No es pot canviar el tipus del sistema de fitxers a buit"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
-msgstr "No es pot canviar el tipus del sistema de fitxers a estes"
+msgstr "No es pot canviar el tipus del sistema de fitxers a estès"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Lòg"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconegut (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unitat de disc: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Mida: %lld octets, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Mida: %lld octets, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
-msgstr "Etiquetes"
+msgstr "Senyaladors"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tipus part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipus Sis.Fitx."
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sectors"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cilindres"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Mida (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Mida (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
-msgstr "Arrencada"
+msgstr "Arrencable"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
-msgstr "Establir l'etiqueta de la partició actual com d'arrencada"
+msgstr "Commuta el senyalador d'arrencada de la partició actual"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
-msgstr "Suprimir"
+msgstr "Suprimeix"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
-msgstr "Suprimir l'actual partició"
+msgstr "Suprimeix la partició actual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
-msgstr "Canviar la geometria del disc (sols usuaris experts)"
+msgstr "Canvia la geometria del disc (només usuaris experts)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "Imprimir pantalla d'ajuda"
+msgstr "Mostra la pantalla d'ajuda"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
-"Maximitzar la utilització del disc en la partició actual (sols usuaris "
+"Maximitza la utilització del disc en la partició actual (només usuaris "
 "experts)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
-msgstr "Crear una nova partició des de l'espai lliure"
+msgstr "Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
-msgstr "Imprimir"
+msgstr "Imprimeix"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
-msgstr "Imprimir la taula de particions en la pantalla o en un fitxer"
+msgstr "Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
-msgstr "Sortir"
+msgstr "Surt"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
-msgstr "Sortir del programa sense escriure la taula de particions"
+msgstr "Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipus"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Canviar el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
+msgstr "Canvia el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unitats"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Canviar les unitats de la mida de la partició (MB, sect., cil.)"
+msgstr "Canvia les unitats de la mida de la partició (MB, sectors, cilindres)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
-msgstr "Escriure"
+msgstr "Escriu"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Escriure la taula de particions al disc (això pot destruir les dades)"
+msgstr "Escriu la taula de particions al disc (això pot destruir les dades)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
-msgstr "No es pot fer aquesta partició arrencable"
+msgstr "Aquesta partició no es pot fer arrencable"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "No es pot suprimir una partició buida"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "No es pot maximitzar aquesta partició"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Aquesta partició és inutilitzable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Aquesta partició ja està en ús"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "No es pot canviar el tipus d'una partició buida"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "No hi ha més particions"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
-msgstr "Comandament no permès"
+msgstr "Ordre no permesa"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright © 1994-2002 Kevin E. Martin i aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2208,17 +2162,17 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Usar:\n"
-"Imprimir la versió:\n"
+"Forma d'ús:\n"
+"Imprimeix la versió:\n"
 "        %s -v\n"
-"Imprimir la taula de particions:\n"
+"Imprimeix la taula de particions:\n"
 "        %s -P {r|s|t} [opcions] dispositiu\n"
 "Ús interactiu:\n"
 "        %s [opcions] dispositiu\n"
 "\n"
 "Opcions:\n"
-"-a:  Empra la fletxa en comptes del ressaltat.\n"
-"-z:  Comença amb una taula de particions a zero en comptes de llegir\n"
+"-a:  Utilitza la fletxa en comptes del ressaltat.\n"
+"-z:  Comença amb una taula de particions des de zero en comptes de llegir-\n"
 "     la del disc.\n"
 "-c C -h H -s S: Modifica la idea del nucli sobre el nombre de cilindres,\n"
 "                el nombre de capçals i el nombre de sectors per pista.\n"
@@ -2241,15 +2195,15 @@ msgid ""
 msgstr ""
 "\n"
 "\tEn aquest disc teniu una etiqueta AIX vàlida.\n"
-"\tActualment Linux no pot manejar aquests discs.\n"
+"\tActualment Linux no pot gestionar aquests discs.\n"
 "\tTot i això, tingueu en compte alguns consells:\n"
-"\t1. fdisk destruirà el seu contingut a l'escriure.\n"
+"\t1. fdisk en destruirà el contingut en escriure.\n"
 "\t2. Comproveu que aquest disc no sigui una part vital\n"
-"\t   d'un grup de volúmens. (En cas contrari podríeu\n"
+"\t   d'un grup de volums. (En cas contrari podríeu\n"
 "\t   esborrar els altres discs, si no estan duplicats.)\n"
-"\t3. Abans d'esborrar aquest volúmen físic, esborreu\n"
+"\t3. Abans d'esborrar aquest volum físic, esborreu\n"
 "\t   el disc lògicament de la màquina AIX.\n"
-"\t   (O us haureu de convertir en un AIXpert)."
+"\t   (O convertiu-vos en un AIXpert)."
 
 #: fdisk/fdiskbsdlabel.c:122
 #, c-format
@@ -2260,73 +2214,72 @@ msgstr ""
 "\n"
 "Etiqueta BSD per al dispositiu: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
-msgstr "Acció del comandament"
+msgstr "Acció de l'ordre"
 
 #: fdisk/fdiskbsdlabel.c:130
 msgid "   d   delete a BSD partition"
-msgstr "   d   Esborrar una partició BSD"
+msgstr "   d   esborra una partició BSD"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr "   e   Editar dades de la unitat"
+msgstr "   e   edita dades de la unitat"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
-msgstr "   i   Instal·lar carregador"
+msgstr "   i   instal·la el carregador d'arrencada"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr "   l   Llistar els tipus de sistemes de fitxers coneguts"
+msgstr "   l   llista els tipus de sistemes de fitxers coneguts"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
-msgstr "   m   imprimir aquest menú"
+msgstr "   m   imprimeix aquest menú"
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr "   n   Afegir una nova partició BSD"
+msgstr "   n   afegeix una nova partició BSD"
 
 #: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr "   p   Imprimir taula de particions BSD"
+msgstr "   p   imprimeix la taula de particions BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
-msgstr "   q   sortir sense desar els canvis"
+msgstr "   q   surt sense desar els canvis"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
-msgstr "   r   tornar al menú principal"
+msgstr "   r   torna al menú principal"
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr "   s   Veure totes les etiquetes de disc"
+msgstr "   s   mostra totes les etiquetes del disc"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr "   t   Canviar l'identificador del sistema de fitxers d'una partició"
+msgstr "   t   canvia l'identificador del sistema de fitxers d'una partició"
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   canviar unitats (cilindres/sectors)"
+msgstr "   u   canvia les unitats (cilindres/sectors)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr "   w   Escriure l'etiqueta de disc al disc"
+msgstr "   w   escriu l'etiqueta de disc al disc"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   Enllaçar la partició BSD amb una partició no BSD"
+msgstr "   x   enllaça la partició BSD a una partició no BSD"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
@@ -2336,7 +2289,7 @@ msgstr "La partició %s no és vàlida perquè comença pel sector 0.\n"
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Llegint l'etiqueta de disc de %s en el sector %d.\n"
+msgstr "S'està llegint l'etiqueta de disc de %s en el sector %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2345,18 +2298,20 @@ msgstr "No hi ha cap partició *BSD en %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "Comandament d'etiqueta de disc BSD (m per a l'ajuda): "
+msgstr "Ordre d'etiqueta de disc BSD (m per a l'ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+# Parla d'etiquetes, segurament és femení
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
-msgstr "Primer %s"
+msgstr "Primera %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+# Parla d'etiquetes, segurament és femení
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "Últim %s o +mida o +midaM o +midaK"
+msgstr "Última %s o +mida o +midaM o +midaK"
 
 #: fdisk/fdiskbsdlabel.c:318
 #, c-format
@@ -2381,12 +2336,12 @@ msgstr "etiqueta: %.*s\n"
 #: fdisk/fdiskbsdlabel.c:323
 #, c-format
 msgid "flags:"
-msgstr "indicadors:"
+msgstr "senyaladors:"
 
 #: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid " removable"
-msgstr " remobible"
+msgstr " extraïble"
 
 #: fdisk/fdiskbsdlabel.c:327
 #, c-format
@@ -2398,8 +2353,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " sector dolent"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2430,16 +2383,19 @@ msgstr "cilindres: %ld\n"
 msgid "rpm: %d\n"
 msgstr "r.p.m.: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr "inter-fullatge: %d\n"
+msgstr "entrellaçat: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "decalatge: %d\n"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
@@ -2472,12 +2428,12 @@ msgstr ""
 #: fdisk/fdiskbsdlabel.c:356
 #, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "núm     començà    acaba     mida     sist.fitx. [fmida bmida   cpg]\n"
+msgstr "núm     inici       final    mida     sist.fitx. [fmida bmida   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Escrivint etiqueta de disc a %s.\n"
+msgstr "S'està escrivint l'etiqueta de disc a %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
@@ -2500,8 +2456,8 @@ msgstr "sectors/pista"
 msgid "tracks/cylinder"
 msgstr "pistes/cilindre"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindres"
 
@@ -2518,14 +2474,17 @@ msgstr "Ha de ser <= sectors/pista * pistes/cilindre (valor per defecte).\n"
 msgid "rpm"
 msgstr "r.p.m."
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:484
 msgid "interleave"
-msgstr "inter-fullatge"
+msgstr "entrellaçat"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
 msgstr "decalatge de les pistes"
 
+# FIXME
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
 msgstr "decalatge dels cilindres"
@@ -2536,7 +2495,7 @@ msgstr "canvi de capçal"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
-msgstr "recerca pista a pista"
+msgstr "cerca pista a pista"
 
 #: fdisk/fdiskbsdlabel.c:529
 #, c-format
@@ -2546,19 +2505,19 @@ msgstr "Carregador: %sboot -> boot%s (%s): "
 #: fdisk/fdiskbsdlabel.c:554
 #, c-format
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Carregador solapat amb una etiqueta de disc!\n"
+msgstr "El carregador s'encavalca amb l'etiqueta de disc.\n"
 
 #: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
 msgid "Bootstrap installed on %s.\n"
-msgstr "Carregador instal·lat en %s.\n"
+msgstr "S'ha instal·lat el carregador a %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:599
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partició (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "S'ha creat el màxim nombre de particions\n"
@@ -2571,7 +2530,7 @@ msgstr "Aquesta partició ja existeix.\n"
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Atenció: Masses particions (%d, el màxim són %d).\n"
+msgstr "Avís: hi ha massa particions (%d, el màxim són %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 #, c-format
@@ -2580,9 +2539,9 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 "\n"
-"Sincronitzant els discs.\n"
+"S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2593,16 +2552,15 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Ús: fdisk [-b SSZ] [-u] DISK      Canvia la taula de particions\n"
-"    fdisk -l [-b SSZ] [-u] DISK   Llista la(es) taula(es) de partició(ons)\n"
-"    fdisk -s PARTICIÓ             Augmenta l'espai en blocs\n"
-"    fdisk -v                      Dona la versió del fdisk\n"
-"Aquest DISC estarà sota /dev/hdb o /dev/sda i la PARTICIÓ serà quelcom\n"
-"a /dev/hda7\n"
-"-u: Dona el principi i final de la unitat en sectors (no en cilindres)\n"
+"Forma d'ús: fdisk [-b SSZ] [-u] DISC Canvia la taula de particions\n"
+"      fdisk -l [-b SSZ] [-u] DISC    Llista les taules de particions\n"
+"      fdisk -s PARTICIÓ              Mostra la mida de la parcició en blocs\n"
+"      fdisk -v                       Mostra la versió de fdisk\n"
+"DISC és del tipus /dev/hdb o /dev/sda i PARTICIÓ és del tipus /dev/hda7\n"
+"-u: Mostra l'inici i el final de la unitat en sectors (no en cilindres)\n"
 "-b 2048: (per als discs MO) usa 2048 octets per sector\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2611,7 +2569,7 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Ús: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
+"Forma d'ús: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
 "P.ex.: fdisk /dev/hda  (per al primer disc IDE)\n"
 "    o: fdisk /dev/sdc  (per al tercer disc SCSI)\n"
 "    o: fdisk /dev/eda  (per a la primera unitat PS/2 ESDI)\n"
@@ -2619,198 +2577,185 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
-msgstr "No es pot obrir %s\n"
+msgstr "No s'ha pogut obrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
-msgstr "No es pot llegir %s\n"
+msgstr "No s'ha pogut llegir %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "No es pot cercar en %s\n"
+msgstr "No s'ha pogut cercar en %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
-msgstr "No es pot escriure %s\n"
+msgstr "No s'ha pogut escriure %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "El ioctl BLKGETSIZE ha fallat en %s\n"
+msgstr "No s'ha pogut executar ioctl BLKGETSIZE a %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
-msgstr "No es pot assignar més memòria\n"
+msgstr "No s'ha pogut assignar més memòria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Error fatal\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
-msgstr "   a   establir un indicador de sols lectura"
+msgstr "   a   estableix un senyalador de només lectura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
-msgstr "   b   editar etiqueta de disc bsd"
+msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
-msgstr "   c   establir indicatiu de muntable"
+msgstr "   c   estableix senyalador de muntable"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
-msgstr "   d   suprimir una partició"
+msgstr "   d   suprimeix una partició"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
-msgstr "   l   llistar els tipus de particions conegudes"
+msgstr "   l   llista els tipus de particions conegudes"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
-msgstr "   n   afegir una nova partició"
+msgstr "   n   afegeix una nova partició"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o   crear una nova taula de particions DOS buida"
+msgstr "   o   crea una nova taula de particions DOS buida"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
-msgstr "   p   imprimir la taula de particions"
+msgstr "   p   imprimeix la taula de particions"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s   crear una etiqueta de disc Sun nova"
+msgstr "   s   crea una etiqueta de disc Sun nova"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t   canviar l'identificador del sistema d'una partició"
+msgstr "   t   canvia l'identificador del sistema d'una partició"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u   canviar les unitats de visualització/entrada"
+msgstr "   u   canvia les unitats de visualització/entrada"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
-msgstr "   v   verificar la taula de particions"
+msgstr "   v   verifica la taula de particions"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
-msgstr "   w   escriure la taula al disc i sortir"
+msgstr "   w   escriu la taula al disc i surt"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
-msgstr "   x   funcions addicionals (sols experts)"
+msgstr "   x   funcions addicionals (només experts)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a   seleccionar partició d'arrencada"
+msgstr "   a   selecciona la partició d'arrencada"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
-msgstr "   b   editar l'entrada del fitxer d'arrencada"
+msgstr "   b   edita l'entrada del fitxer d'arrencada"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
-msgstr "   c   seleccionar partició d'intercanvi sgi"
+msgstr "   c   selecciona la partició d'intercanvi sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
-msgstr "   a   establir un indicatiu d'arrencada"
+msgstr "   a   estableix un senyalador d'arrencada"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c   establir l'indicatiu de compatibilitat amb DOS"
+msgstr "   c   estableix el senyalador de compatibilitat amb DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
-msgstr "   a   canviar el nombre de cilindres alternatius"
+msgstr "   a   canvia el nombre de cilindres alternatius"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
-msgstr "   c   canviar el nombre de cilindres"
+msgstr "   c   canvia el nombre de cilindres"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
-msgstr "   d   imprimir les dades en cru en la taula de particions"
+msgstr "   d   imprimeix les dades crues a la taula de particions"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e   canviar el nombre de sectors addicionals per cilindre"
+msgstr "   e   canvia el nombre de sectors addicionals per cilindre"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
-msgstr "   h   canviar el nombre de capçals"
+msgstr "   h   canvia el nombre de capçals"
 
-#: fdisk/fdisk.c:403
+# FIXME
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
-msgstr "   i   canviar factor d'inter-fullatge"
+msgstr "   i   canvia el factor d'entrellaçat"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   canviar velocitat de rotació (r.p.m.)"
+msgstr "   o   canvia velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
-msgstr "   s   canviar el nombre de sectors per pista"
+msgstr "   s   canvia el nombre de sectors per pista"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
-msgstr "   y   canviar el nombre de cilindres físics"
+msgstr "   y   canvia el nombre de cilindres físics"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
-msgstr "   b   desplaçar al començament les dades d'una partició"
+msgstr "   b   desplaça les dades d'una partició a l'inici"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
-msgstr "   e   llistar particions esteses"
+msgstr "   e   llista les particions esteses"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr "   g   crear una taula de particions IRIX (SGI)"
+msgstr "   g   crea una taula de particions IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   f   fixar un ordre de particions"
+msgstr "   f   arregla l'ordre de les particions"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Heu de definir els"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "capçals"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectors"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2819,11 +2764,11 @@ msgstr ""
 "%s%s.\n"
 "Podeu fer això des del menú de funcions addicionals.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
-msgstr " y "
+msgstr " i "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2836,37 +2781,40 @@ msgid ""
 msgstr ""
 "\n"
 "El nombre de cilindres per a aquest disc està establert en %d.\n"
-"Això no és desencertat, però va més enllà del 1024 i podríeu\n"
-"tindre problemes amb certes configuracions de:\n"
-"1) Programari executat en temps d'arrencada (p.e., versions\n"
-"   antigues de LILO)\n"
-"2) Arrencar i particionar des d'un altre SO\n"
-"   (p.e., DOS FDISK, OS/2 FDISK)\n"
+"Això no és incorrecte, però és més gran que 1024 i podríeu\n"
+"tenir problemes amb certes configuracions de:\n"
+"1) Programari que s'executa durant d'arrencada (p.ex., versions\n"
+"   antigues del LILO)\n"
+"2) En arrencar i particionar des d'un altre SO\n"
+"   (p.ex., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplaçament incorrecte en particions primàries esteses\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Avís: s'estan ometent les particions posteriors a la #%d.\n"
+"S'eliminaran si deseu aquesta taula de particions.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Atenció: Enllaç d'apuntador addicional en la taula de particions %d\n"
+msgstr ""
+"Avís: hi ha un punter d'enllaç addicional a la taula de particions %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
-"Atenció: S'ignoren les dades addicionals en la taula de particions %d\n"
+"Avís: s'està ignorant les dades addicionals de la taula de particions %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2874,144 +2822,146 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"S'està creant una etiqueta de disc DOS nova. Els canvis sols\n"
-"romandran a la memòria, fins que decidiu escriure-los. Després\n"
-"d'aquesta operació, l'anterior contingut no podrà ser recuperat.\n"
+"S'està creant una etiqueta de disc DOS nova. Els canvis només\n"
+"romandran a la memòria fins que decidiu escriure'ls. Després\n"
+"d'aquesta operació, l'anterior contingut no es podrà recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Nota: La mida del sector és %d (no %d)\n"
+msgstr "Nota: la mida del sector és %d (no %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podreu escriure la taula de particions.\n"
 
-#: fdisk/fdisk.c:952
+# NO només es va fer una traducció a partir de la versió
+# espanyola, sinó que a més a més es va fer malament.
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
-"Aquest disc té tanta màgia DOS com BSD.\n"
-"Empreu el comandament 'b' per anar al mode BSD.\n"
+"Aquest disc té tan màgia DOS com BSD.\n"
+"Empreu l'ordre «b» per anar al mode BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
-"El dispositiu no conté una taula de particions DOS vàlida, així com tampoc "
-"una etiqueta de disc Sun, SGI o OSF\n"
+"El dispositiu no conté ni taula de particions DOS vàlida, ni cap etiqueta de "
+"disc Sun, SGI o OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Error intern\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "S'ignorarà la partició estesa addicional %d\n"
+msgstr "S'està ignorant la partició estesa addicional %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
-"Atenció: Etiqueta 0x%04x no vàlida de la taula de particions %d serà "
-"corregida amb w(rite)\n"
+"Avís: el senyalador 0x%04x invàlid de la taula de particions %d es corregirà "
+"amb w(escriu)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 "\n"
-"s'ha aconseguit un EOF tres vegades - sortint...\n"
+"s'ha obtingut EOF tres vegades - s'està sortint...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
-msgstr "Codi hex. (escriviu L per a veure la llista de codis): "
+msgstr "Codi hex. (escriviu L per veure la llista de codis): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
-msgstr "Usant el valor per defecte %u\n"
+msgstr "S'està utilitzant el valor per defecte %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor està fora del rang.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Nombre de partició"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Atenció: La partició %d és del tipus buit\n"
+msgstr "Avís: la partició %d no té tipus\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
-msgstr "No hi ha cap partició definida!\n"
+msgstr "Encara no hi ha cap partició definida.\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr "Ja s'han definit totes les particions primàries!\n"
+msgstr "Ja s'han definit totes les particions primàries.\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindre"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Canviant les unitats de visualització/entrada a %s\n"
+msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "ATENCIÓ: La partició %d és una partició estesa\n"
+msgstr "Avís: la partició %d és una partició estesa\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
-msgstr "L'etiqueta de compatibilitat amb DOS està establerta\n"
+msgstr "S'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr "L'etiqueta de compatibilitat amb DOS no està establerta\n"
+msgstr "No s'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "La partició %d encara no existeix!\n"
+msgstr "La partició %d encara no existeix.\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3020,117 +2970,117 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 "El tipus 0 significa espai lliure per a molts sistemes\n"
-"(però no per a Linux). Probablement no sigui sensat\n"
-"tindre particions del tipus 0. Podeu suprimir-les\n"
-"amb el comandament `d'.\n"
+"(però no per a Linux). No és aconsellable tenir\n"
+"particions del tipus 0. Les podeu suprimir amb\n"
+"l'ordre «d».\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"No podeu convertir una partició en estesa ni viceversa primer\n"
-"haureu d'esborrar-la.\n"
+"No podeu convertir una partició a estesa, o al revés, primer\n"
+"cal que l'esborreu.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Es recomana deixar la partició 3 com a disc complet (5), donat\n"
+"Es recomana deixar la partició 3 com a disc complet (5), ja\n"
 "que així ho espera SunOS/Solaris i fins i tot és adequat per a\n"
 "Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Es recomana deixar la partició 9 com a capçalera de volumen (0)\n"
-"i la partició 11 com a volumen complet (6) donat que IRIX així ho\n"
+"Es recomana deixar la partició 9 com a capçalera de volum (0)\n"
+"i la partició 11 com a volum complet (6) ja que IRIX així ho\n"
 "espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "La partició %d té diferents començaments físics/lògics (no Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     físic=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lògic=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partició %d té diferents finals físics/lògics:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partició %i no comença en el límit del cilindre:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "ha de ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partició %i no acaba en un límit de cilindre.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "ha de ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disc %s: %ld MiB, %lld octets\n"
+"Disc %s: %ld MB, %lld octets\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disc %s: %ld.%ld GiB, %lld octets\n"
+"Disc %s: %ld.%ld GB, %lld octets\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d capçals, %d sectors/pista, %d cilindres"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu sectors"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3139,42 +3089,44 @@ msgstr ""
 "Unitats = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Res a fer. L'ordre és correcte.\n"
+"Res a fer. L'ordenament ja és correcte.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Això no sembla cap taula de particions\n"
+"Probablement heu seleccionat un dispositiu incorrecte.\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s Arrenc.   Comença       Acaba    Blocs    Id  Sistema\n"
+msgstr "%*s Arrenc.   Inici         Final    Blocs    Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositiu"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 "\n"
-"Les entrades en la taula de particions no estan en ordre al disc\n"
+"Les entrades a la taula de particions no estan en l'ordre del disc\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3185,83 +3137,83 @@ msgstr ""
 "Disc %s: %d capçals, %d sectors, %d cilindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
-msgstr "Núm IA Cab Sect Cil Cap Sect Cil    Comença    Mida ID\n"
+msgstr "N. IA Cap Sect Cil Cap Sect Cil     Inici      Mida ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Atenció: La partició %d conté el sector 0\n"
+msgstr "Avís: la partició %d conté el sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partició %d: El capçal %d supera el màxim %d\n"
+msgstr "Partició %d: el capçal %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partició %d: El sector %d supera el màxim %d\n"
+msgstr "Partició %d: el sector %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partició %d: El cilindre %d supera el màxim %d\n"
+msgstr "Partició %d: el cilindre %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr "Partició %d: Sectors anteriors %d difereixen del total %d\n"
+msgstr "Partició %d: sectors anteriors %d difereixen del total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Atenció: Inici de dades incorrecte en la partició %d\n"
+msgstr "Avís: inici de dades incorrecte en la partició %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Atenció: La partició %d es solapa amb la partició %d.\n"
+msgstr "Avís: la partició %d cavalca amb la partició %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Atenció: La partició %d està buida\n"
+msgstr "Avís: la partició %d està buida\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partició lògica %d no està integrada en la partició %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "El total de sectors assignats %d supera el màxim de %d\n"
+msgstr "El total de sectors assignats %d supera el màxim de %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d sectors no assignats\n"
+msgstr "%lld sectors no assignats\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partició %d ja està definida. Esborreu-la abans de tornar-la a afegir.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hi ha cap sector lliure disponible\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3269,65 +3221,65 @@ msgid ""
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
-"\tHo sento - aquest fdisk no pot manejar etiquetes de disc AIX.\n"
+"\tAquest fdisk no pot gestionar etiquetes de disc AIX.\n"
 "\tSi desitgeu afegir particions DOS, creeu una nova taula de\n"
 "\t particions DOS (Useu o).\n"
-"\tATENCIÓ: Això destruirà l'actual contingut del disc.\n"
+"\tAvís: Això destruirà el contingut actual del disc.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Primer heu de suprimir alguna partició i afegir-ne una d'estesa\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "les particions lògiques no estan en un ordre de disc"
+msgstr "S'usen totes les particions lògiques\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Partició primària incorrecta"
+msgstr "S'està afegint una partició primària\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
 "   %s\n"
 "   p   primary partition (1-4)\n"
 msgstr ""
-"Acció del comandament\n"
+"Acció de l'ordre\n"
 "%s\n"
-"   p   Partició primària (1-4)\n"
+"   p   partició primària (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   lògica (5 o superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   estesa"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Nombre de partició no vàlid per al tipus `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"Ja s'ha modificat la taula de particions!\n"
+"S'ha modificat la taula de particions.\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr "Cridant a ioctl() per a rellegir la taula de particions.\n"
+msgstr "S'està cridant ioctl() per rellegir la taula de particions.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3336,11 +3288,12 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: El rellegir la taula de particions ha fallat amb l'error %d: %s.\n"
+"Avís: No s'ha pogut rellegir la taula de particions, s'ha produït l'error %"
+"d: %s.\n"
 "El nucli encara usa l'antiga taula.\n"
-"La taula nova s'usarà després de reiniciar.\n"
+"La taula nova s'usarà després d'arrencar de nou.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3349,102 +3302,103 @@ msgid ""
 "information.\n"
 msgstr ""
 "\n"
-"ATENCIÓ: Si heu creat o modificat qualsevol de les\n"
-"particions DOS 6.x, mireu la pàgina del manual del fdisk\n"
+"Avís: Si heu creat o modificat alguna partició\n"
+"DOS 6.x, mireu la pàgina del manual de fdisk\n"
 "per a informació addicional.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Error tancant %s\n"
+msgstr ""
+"\n"
+"S'ha produït un error en tancar el fitxer\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
-msgstr "Sincronitzant els discs.\n"
+msgstr "S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
-msgstr "La partició %d no té cap àrea amb dades\n"
+msgstr "La partició %d no té cap àrea de dades\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nou començament de dades"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
-msgstr "Comandament expert (m per a l'ajuda): "
+msgstr "Ordre d'expert (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
-"Atenció: Establint desplaçament del sector per a la compatibilitat amb DOS\n"
+"Avís: s'està establint el desplaçament del sector per a la compatibilitat "
+"amb DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disc %s no conté una taula de particions vàlida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "no es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
-msgstr "%c: Comandament desconegut\n"
+msgstr "%c: ordre desconeguda\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
-"Aquest nucli cerca la mida del sector por si mateix; l'opció -b serà "
-"ignorada\n"
+"Aquest nucli troba la mida del sector automàtiament; s'ignorarà l'opció -b\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Atenció: L'opció -b (estableix la mida del sector) ha de ser usada amb un "
+"Avís: l'opció -b (estableix la mida del sector) s'ha d'usar amb un "
 "dispositiu específic\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
-"A l'entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
+"En entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
 "s.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
-msgstr "Comandament (m per a l'ajuda): "
+msgstr "Ordre (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3453,16 +3407,16 @@ msgstr ""
 "\n"
 "L'actual fitxer d'arrencada és: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
-msgstr "Si us plau entreu el nom del nou fitxer d'arrencada: "
+msgstr "Entreu el nom del nou fitxer d'arrencada: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No s'ha modificat el fitxer d'arrencada\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3470,8 +3424,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"\tHo sento, no hi ha menú d'usuaris experts per a les taules de particions "
-"SGI.\n"
+"\tNo hi ha menú d'usuari expert per a les taules de particions SGI.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:80
@@ -3488,7 +3441,7 @@ msgstr "SGI secrepl"
 
 #: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
-msgstr "SGI raw"
+msgstr "SGI cru"
 
 #: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
@@ -3500,7 +3453,7 @@ msgstr "SGI sysv"
 
 #: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
-msgstr "Volúmen SGI"
+msgstr "Volum SGI"
 
 #: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
@@ -3530,21 +3483,21 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Intercanvi Linux"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
 #: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
-msgstr "Linux RAID"
+msgstr "RAID Linux"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
@@ -3552,17 +3505,19 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"Segons la MIPS Computer Systems, Inc. l'etiqueta no pot contindre més de 512 "
+"Segons MIPS Computer Systems, Inc. l'etiqueta no pot contenir més de 512 "
 "octets\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
-"Detectada una etiqueta de disc sgi amb una suma de comprovació incorrecta.\n"
+"S'ha detectat una etiqueta de disc sgi amb una suma de comprovació "
+"incorrecta.\n"
 
+# FIXME
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3575,13 +3530,13 @@ msgstr ""
 "\n"
 "Disc %s (etiqueta de disc SGI): %d capçals, %d sectors\n"
 "%d cilindres, %d cilindres físics\n"
-"%d sectors per cilindre addicionals, inter-fullatge %d:1\n"
+"%d sectors per cilindre addicionals, entrellaçat %d:1\n"
 "%s\n"
-"Unitats = %s de %d * 512 octets\n"
+"Unitats = %s de %d * %d octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3590,7 +3545,7 @@ msgid ""
 msgstr ""
 "\n"
 "Disc %s (etiqueta de disc SGI): %d capçals, %d sectors, %d cilindres\n"
-"Unitats = %s de %d * 512 octets\n"
+"Unitats = %s de %d * %d octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3600,7 +3555,7 @@ msgid ""
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- particions -----\n"
-"Pt# %*s  Info     Comença    Acaba  Sectors  Id  Sistema\n"
+"Pt# %*s  Info     Inici       Final Sectors  Id  Sistema\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, c-format
@@ -3618,7 +3573,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u mida%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3628,8 +3582,8 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Fitxer d'arrencada no vàlid!\n"
-"\tEl fitxer d'arrencada ha de ser un nom de ruta absolut\n"
+"El fitxer d'arrencada no és vàlid!\n"
+"\tEl fitxer d'arrencada ha de ser un camí absolut\n"
 "\tdiferent de zero, p.e. \"/unix\" o \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:310
@@ -3639,7 +3593,7 @@ msgid ""
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tNom del fitxer d'arrencada massa llarg: Màxim de 16 octets.\n"
+"\tEl nom del fitxer d'arrencada és massa llarg: màxim de 16 octets.\n"
 
 #: fdisk/fdisksgilabel.c:315
 #, c-format
@@ -3648,8 +3602,7 @@ msgid ""
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tEl fitxer d'arrencada ha de tindre un nom de ruta completament "
-"qualificat.\n"
+"\tEl fitxer d'arrencada ha de tenir un camí completament qualificat.\n"
 
 #: fdisk/fdisksgilabel.c:322
 #, c-format
@@ -3670,14 +3623,14 @@ msgid ""
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tEs canvia el fitxer d'arrencada a \"%s\".\n"
+"\tS'ha canviat el fitxer d'arrencada a \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Hi ha present més d'una entrada de disc completa.\n"
+msgstr "Hi ha present més d'una entrada de disc complet.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hi han particions definides\n"
@@ -3703,12 +3656,12 @@ msgid ""
 "but the disk is %d diskblocks long.\n"
 msgstr ""
 "La partició de disc sencer sols té un mida de %d blocs,\n"
-"mentres que el disc té una longitud de %d blocs.\n"
+"mentre que el disc té una longitud de %d blocs.\n"
 
 #: fdisk/fdisksgilabel.c:465
 #, c-format
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Una partició (11) haurà d'abastar el disc sencer.\n"
+msgstr "Una partició (#11) hauria d'abastar el disc sencer.\n"
 
 #: fdisk/fdisksgilabel.c:475
 #, c-format
@@ -3728,7 +3681,7 @@ msgstr "Les particions %d i %d es solapen en %d sectors.\n"
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
 #, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Espai no usat de %8u sectors - sectors %8u-%u\n"
+msgstr "Hi ha un buit que no s'usa de %8u sectors - sectors %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3762,11 +3715,10 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHeu escollit un nom de fitxer d'arrencada inusual.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Ho sento sols podeu canviar l'etiqueta de les particions no buides.\n"
+msgstr "Podeu canviar l'etiqueta de les particions no buides.\n"
 
 #: fdisk/fdisksgilabel.c:550
 msgid ""
@@ -3777,36 +3729,34 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 "Està altament recomenat que la partició en el desplaçament 0\n"
-"sigui del tipus \"SGI volhdr\"; el sistema IRIX l'usarà per a\n"
-"recuperar des del seu directori utilitats com sash i fx.\n"
-"Sols la secció de disc sencer \"Volúmen SGI\" pot infringir això.\n"
-"Escriviu SI si esteu segur sobre tornar a etiquetar aquesta partició.\n"
+"sigui del tipus \"SGI volhdr\"; el sistema IRIX l'usarà per\n"
+"recuperar des del seu directori d'utilitats com ara sash i fx.\n"
+"Només l'entrada de disc sencer \"Volum SGI\" pot infringir això.\n"
+"Escriviu SÍ si esteu segur que voleu tornar a etiquetar aquesta partició.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
-msgstr "SI\n"
+msgstr "SÍ\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr "Sabeu si heu produït un solapament de partició en el disc?\n"
+msgstr "Ja sabeu que hi ha un encavalcament de particions al disc?\n"
 
 #: fdisk/fdisksgilabel.c:637
 #, c-format
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr "S'intenta generar una entrada de disc sencer automàticament.\n"
+msgstr "S'està intentant generar una entrada de disc sencer automàticament.\n"
 
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "El disc sencer ja està cobert amb particions.\n"
+msgstr "El disc sencer ja està cobert de particions.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"S'ha produït un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "S'ha produït un encavalcament de particions al disc. Corregiu-ho.\n"
 
 #: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
 #, c-format
@@ -3814,14 +3764,13 @@ msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"Es altament recomenat que la partició onze cobreixi\n"
-"el disc sencer i que sigui del tipus `Volúmen SGI'\n"
+"Es recomana especialment que la onzena partició\n"
+"cobreixi el disc sencer i sigui del tipus 'volum SGI'\n"
 
 #: fdisk/fdisksgilabel.c:671
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"Es produirà un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "Es produirà un encavalcament de particions al disc. Corregiu-ho.\n"
 
 #: fdisk/fdisksgilabel.c:676
 #, c-format
@@ -3836,9 +3785,9 @@ msgid ""
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Construint una nova etiqueta de disc SGI. Els canvis sols romandran\n"
-"en la memòria, fins que decidiu escriure-los. Després d'això, l'anterior\n"
-"contingut serà irrecuperable.\n"
+"S'està construint una nova etiqueta de disc SGI. Els canvis només romandran\n"
+"a la memòria fins que decidiu escriure'ls. Després d'això, no es podrà\n"
+"recuperar l'anterior contingut.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3848,59 +3797,57 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"ATENCIÓ:  BLKGETSIZE el ioctl ha fallat sobre %s.  S'esta usant el valor %d "
-"per a\n"
-"la geometria del cilindre. Aquest valor es podria tuncar per a dispositius > "
-"33,8 GB.\n"
+"Avís: no s'ha pogut executar ioctl BLKGETSIZE a %s. S'està utilitzant el "
+"valor de la geometria del cilindre %d.\n"
+"Aquest valor es pot truncar per a dispositius > 33.8 GB.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
-msgstr "S'intenten mantindre els paràmetres de la partició %d.\n"
+msgstr "S'està intentant mantenir els paràmetres de la partició %d.\n"
 
 #: fdisk/fdisksgilabel.c:743
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr "ID=%02x\tCOMENÇAMENT=%d\tLONGITUD=%d\n"
+msgstr "ID=%02x\tINICI=%d\tLONGITUD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Buida"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
-msgstr "SunOS root"
+msgstr "SunOS arrel"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS d'intercanvi"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disc sencer"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS estàndard"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
-msgstr "Autodetecció Linux raid"
+msgstr "Autodetecció RAID Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3909,16 +3856,16 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 "S'ha detectat una etiqueta de disc amb una suma de comprovació incorrecta.\n"
-"Probablement tindreu que establir tots els valors,\n"
-"p.e. capçals, sectors, cilindres i particions, o forçar\n"
-"una nova etiqueta (comandament s al menú principal)\n"
+"Probablement haureu d'establir tots els valors,\n"
+"p.ex. capçals, sectors, cilindres i particions, o forçar\n"
+"una nova etiqueta (ordre s del menú principal)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "La configuració automàtica ha trobat un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3926,12 +3873,12 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Construint una nova etiqueta de disc sun. Els canvis sols romandran\n"
-"en la memòria, fins que decidiu escriure-los. Després d'això, l'anterior\n"
+"S'està construint una nova etiqueta de disc sun. Els canvis només romandran\n"
+"a la memòria fins que decidiu escriure'ls. Després d'això, l'anterior\n"
 "contingut serà irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3939,83 +3886,84 @@ msgid ""
 msgstr ""
 "Tipus d'unitat\n"
 "   ?   Amb configuració automàtica\n"
-"   0   Personalitzada (amb valors per defecte detectats pel maquinari)"
+"   0   Personalitzada (amb valors per defecte que detecti el maquinari)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
-msgstr "Seleccionar tipus (? automàtica, 0 personalitzada): "
+msgstr "Seleccioneu el tipus (? automàtica, 0 personalitzada): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
-msgstr "Falla en la configuració automàtica.\n"
+msgstr "No s'ha pogut fer la configuració automàtica.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectors/pista"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindres físics"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+# FIXME
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
-msgstr "Factor d'inter-fullatge"
+msgstr "Factor d'entrellaçat"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Sectors addicionals per cilindre"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "Podeu canviar tots els paràmetres de disc des del menú x"
+msgstr "Podeu canviar tots els paràmetres del disc des del menú x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
-msgstr "Disquet de 3,5 polsades"
+msgstr "Disquet de 3,5 polzades"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
-msgstr "Linux personalitzat"
+msgstr "Linux personalitzada"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partició %d no acaba en un límit de cilindre\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr "La partició %d es solapa amb d'altres en els sectors %d-%d\n"
+msgstr "La partició %d encavalca amb d'altres en els sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "Espai no usat - sectors 0-%d\n"
+msgstr "Buit no usat - sectors 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr "Espai no usat - sectors %d-%d\n"
+msgstr "Buit no usat - sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"D'altres particions estan cobrint el disc sencer.\n"
+"Altres particions cobreixen el disc sencer.\n"
 "Abans de tornar-hi esborreu-ne o reduïu-ne la seva mida.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4023,20 +3971,19 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 "No heu cobert el disc sencer amb la tercera partició, però el\n"
-"valor %d %s es solapa amb d'altres particions. La vostra entrada\n"
-"s'ha canviat per %d %s\n"
+"valor %d %s encavalca amb d'altres particions. S'ha canviat l'entrada\n"
+"per %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Si desitgeu mantindre la compatibilitat amb SunOS/Solaris, considereu el "
-"deixar\n"
+"Si desitgeu mantenir la compatibilitat amb SunOS/Solaris, considereu deixar\n"
 "aquesta partició com a Disc sencer (5), començant en 0, amb %u sectors\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4044,13 +3991,14 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
-"És altament recomenat que la partició en el desplaçament 0\n"
-"sigui UFS, EXT2FS o SunOS d'intercanvi. El posar Linux\n"
-"d'intercanvi pot destruir la taula de particions i el bloc d'arrencada.\n"
-"Escriviu SI si n'esteu segur de que desitgeu que la partició sigui\n"
-"etiquetada amb 82 (Linux d'intercanvi): "
+"Es recomana especialment que la partició en el desplaçament 0\n"
+"sigui UFS, EXT2FS o SunOS d'intercanvi. Si es posa Linux\n"
+"d'intercanvi, es pot destruir la taula de particions i el bloc d'arrencada.\n"
+"Escriviu SÍ si esteu segur que desitgeu que s'etiqueti la partició\n"
+"amb el 82 (Linux d'intercanvi): "
 
-#: fdisk/fdisksunlabel.c:659
+# FIXME
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4064,12 +4012,12 @@ msgstr ""
 "\n"
 "Disc %s (etiqueta de disc Sun): %d capçals, %d sectors, %d r.p.m.\n"
 "%d cilindres, %d cilindres alternatius, %d cilindres físics\n"
-"%d sectors per cilindre addicionals, inter-fullatge %d:1\n"
+"%d sectors per cilindre addicionals, entrellaçat %d:1\n"
 "%s\n"
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4082,16 +4030,16 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Etiqu.  Comença   Acaba    Blocs  Id  Sistema\n"
+msgstr "%*s Senyal.  Inici      Final   Blocs   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Nombre de cilindres físics"
 
@@ -4101,7 +4049,7 @@ msgstr "FAT12"
 
 #: fdisk/i386_sys_types.c:8
 msgid "XENIX root"
-msgstr "XENIX root"
+msgstr "XENIX arrel"
 
 #: fdisk/i386_sys_types.c:9
 msgid "XENIX usr"
@@ -4115,32 +4063,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Estesa"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX arrencable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "Gestor d'arrencada OS/2"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4149,14 +4091,13 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
 msgid "W95 Ext'd (LBA)"
-msgstr "W95 estesa (LBA)"
+msgstr "W95 Estesa (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4184,7 +4125,7 @@ msgstr "HPFS/NTFS oculta"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr "SmartSleep de AST"
+msgstr "SmartSleep d'AST"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden W95 FAT32"
@@ -4208,7 +4149,7 @@ msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
-msgstr "Recuperar PartitionMagic"
+msgstr "Recuperació PartitionMagic"
 
 #: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
@@ -4242,12 +4183,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4268,8 +4207,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4279,7 +4216,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4300,33 +4236,29 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Minix antic"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / antic Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Intercanvi Linux"
+msgstr "Intercanvi Linux / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "Unitat C: oculta de OS/2"
+msgstr "Unitat C: oculta d'OS/2"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
-msgstr "Linux estes"
+msgstr "Linux estesa"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "Joc de volúmens NTFS"
+msgstr "Joc de volums NTFS"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux text"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4336,21 +4268,18 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
-msgstr "Hivernació de IBM Thinkpad"
+msgstr "Hivernació d'IBM Thinkpad"
 
 #: fdisk/i386_sys_types.c:68
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4377,7 +4306,7 @@ msgstr "S.f. BSDI"
 
 #: fdisk/i386_sys_types.c:75
 msgid "BSDI swap"
-msgstr "BSDI d'intercanvi"
+msgstr "Intercanvi de BSDI"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
@@ -4388,9 +4317,8 @@ msgid "Solaris boot"
 msgstr "Arrencada Solaris"
 
 #: fdisk/i386_sys_types.c:78
-#, fuzzy
 msgid "Solaris"
-msgstr "Arrencada Solaris"
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4416,30 +4344,22 @@ msgstr "Dades sense S.F."
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilitat Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "Accés DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "Sis. Fitx. BeOS"
@@ -4448,153 +4368,152 @@ msgstr "Sis. Fitx. BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Arrencada Linux/PA-RISC"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "Secundària DOS"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "error cercant en %s - no es pot cercar a %lu\n"
+msgstr "s'ha produït un error en cercar a %s - no es pot cercar a %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "error cercant: S'esperava 0x%08x%08x, s'ha obtingut 0x%08x%08x\n"
+msgstr ""
+"s'ha produït un error en cercar: s'esperava 0x%08x%08x, s'ha obtingut 0x%08x%"
+"08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
-msgstr "memòria esgotada - abandonant\n"
+msgstr "s'ha esgotat la memòria - s'està abandonant\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr "error de lectura en %s - no es pot llegir el sector %lu\n"
+msgstr ""
+"s'ha produït un error de lectura a %s - no s'ha pogut llegir el sector %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr "ERROR: El sector %lu no té una signatura msdos\n"
+msgstr "ERROR: el sector %lu no té cap signatura msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
-msgstr "error d'escriptura en %s - no es pot escriure el sector %lu\n"
+msgstr ""
+"s'ha produït un error d'escriptura a %s - no s'ha pogut escriure el sector %"
+"lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr "no es pot obrir el sector de la partició desat al fitxer (%s)\n"
+msgstr "no s'ha pogut obrir el sector de la partició del fitxer desat (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
-msgstr "error d'escriptura en %s\n"
+msgstr "s'ha produït un error d'escriptura a %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr "no es pot fer stat al fitxer de restaurar la partició (%s)\n"
+msgstr ""
+"no s'ha pogut executar stat al fitxer de restauració de la partició (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
-"mida incorrecte del fitxer de restitució de la partició - no es restituirà\n"
+"el fitxer de restauració de la partició té una mida incorrecta - no es "
+"restaurarà\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
-msgstr "memòria esgotada?\n"
+msgstr "s'ha esgotat la memòria?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr "no es pot obrir el fitxer de restituir la partició (%s)\n"
+msgstr "no es pot obrir el fitxer de restauració de la partició (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
-msgstr "error llegint %s\n"
+msgstr "s'ha produït un error en llegir %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "no es pot obrir per a escriptura el dispositiu %s\n"
+msgstr "no s'ha pogut obrir per a escriptura el dispositiu %s\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr "error escrivint el sector %lu en %s\n"
+msgstr "s'ha produït un error en escriure el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Disc %s: No es pot obtindre la geometria\n"
+msgstr "Disc %s: no s'ha pogut obtenir la geometria\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disc %s : No es pot obtrindre'n la mida.\n"
+msgstr "Disc %s : no s'ha pogut obtenir la mida.\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Atenció: Començament=%lu - això sembla ser una partició\n"
-"en comptes del disc sencer. Usar el fdisk amb aquesta\n"
-"probablement no tingui cap sentit.\n"
-"[Useu l'opció --force si de veres ho desitgeu.]\n"
+"Avís: inici=%lu - sembla una partició i no un disc sencer.\n"
+"No té sentit que hi executeu fdisk.[Useu l'opció --force si realment ho "
+"desitgeu.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu capçals\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu capçals\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu sectors\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu sectors\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Atenció: HDIO_GETGEO indica que hi han %lu cilindres\n"
+msgstr "Avís: HDIO_GETGEO indica que hi ha %lu cilindres\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Atenció: Improbable nombre de sectors (%lu); normalment com a molt 63\n"
-"Això donarà problemes amb el programari que usi adreces Cil./Capç./Sector\n"
+"Avís: el nombre de sectors és improbable (%lu); normalment com a molt 63\n"
+"Això donarà problemes amb el programari que usi adreces C/H/S\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4603,33 +4522,33 @@ msgstr ""
 "\n"
 "Disc %s: %lu cilindres, %lu capçals, %lu sectors/pista\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per al capçal: %lu (hauria d'estar "
+"%s de partició %s té un valor impossible per al capçal: %lu (hauria d'estar "
 "entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per al sector: %lu (hauria d'estar "
+"%s de partició %s té un valor impossible per al sector: %lu (hauria d'estar "
 "entre 1 i %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible per als cilindres: %lu (hauria "
+"%s de partició %s té un valor impossible per als cilindres: %lu (hauria "
 "d'estar entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4638,44 +4557,44 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
-msgstr "Rellegint la taula de particions...\n"
+msgstr "S'està rellegint la taula de particions...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"El comandament per a rellegir la taula de particions ha fallat\n"
-"Reinicieu el sistema ara, avans d'usar mkfs\n"
+"L'ordre per a tornar a llegir la taula de particions ha fallat\n"
+"Torneu a iniciar el sistema ara, abans d'usar mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
-msgstr "Error tancant %s\n"
+msgstr "S'ha produït un error en tancar %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
-msgstr "%s: Aquesta partició no existeix\n"
+msgstr "%s: aquesta partició no existeix\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
-msgstr "Format no reconegut; usant els sectors\n"
+msgstr "format no reconegut; s'està usant els sectors\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# taula de particions de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "format no implementat; usant %s\n"
+msgstr "format no implementat; s'està usant %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4684,12 +4603,12 @@ msgstr ""
 "Unitats = cilindres de %lu octets, blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr "   Disp. Arr.  Comença   Acaba #cil.    #blocs    Id  Sistema\n"
+msgstr "   Disp. Arr.  Inici     Final #cil.    #blocs    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4698,12 +4617,12 @@ msgstr ""
 "Unitats = sectors de 512 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Disp. Arr      Comença     Acaba #sectors  Id  Sistema\n"
+msgstr "   Disp. Arr      Inici       Final #sectors  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4712,393 +4631,388 @@ msgstr ""
 "Unitats = blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Disp. Arr.    Comença    Acaba   #blocs   Id  Sistema\n"
+msgstr "   Disp. Arr.    Inici       Final   #blocs   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unitats = MiB de 1048576 octets, blocs de 1024 octets, comptant des de %d\n"
+"Unitats = mebibytes de 1048576 octets, blocs de 1024 octets, comptant des de "
+"%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
-msgstr "   Disp. Arr.  Comen.  Acaba  MB     #blocs    Id  Sistema\n"
+msgstr "   Disp. Arr.  Inici   Final  MiB    #blocs    Id. sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tcomença: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"\t\tacaba: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
+"\t\tfinal: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
-"la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n"
+msgstr "la partició acaba en el cilindre %ld, més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "No s'han trobat particions\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Atenció: La taula de particions sembla haber-se creat\n"
-"  per a Cil./Capç./Sect.=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
+"Avís: La taula de particions sembla haver-se creat\n"
+"  per a C/H/S=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
 "Per a aquest llistat s'assumirà aquesta geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "no hi ha cap taula de particions.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "estranyament, sols hi han definides %d particions.\n"
+msgstr "és estrany, només hi ha definides %d particions.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
-"Atenció: La partició %s té una mida 0 però no està marcada com a buida\n"
+msgstr "Avís: la partició %s té una mida 0 però no està marcada com a buida\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Atenció: La partició %s té una mida 0 i és d'arrencada\n"
+msgstr "Avís: la partició %s té una mida 0 i és arrencable\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr "Atenció: La partició %s té una mida 0 i no comença en el zero\n"
+msgstr "Avís: la partició %s té una mida 0 i no comença en zero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
-msgstr "Atenció: La partició %s "
+msgstr "Avís: la partició %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no està contingut a dins de la partició %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
-msgstr "Atenció: Les particions %s "
+msgstr "Avís: les particions %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
-msgstr "i %s es solapen\n"
+msgstr "i %s encavalquen\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Atenció: La partició %s conté part de la taula de particions\n"
-"(sector %lu) i la destruirà en quant s'ompli\n"
+"Avís: la partició %s conté part de la taula de particions\n"
+"(sector %lu) i la destruirà quan s'ompli\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Atenció: La partició %s comença en el sector 0\n"
+msgstr "Avís: la partició %s comença en el sector 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr "Atenció: La partició %s acaba més enllà de l'acabament del disc\n"
+msgstr "Avís: la partició %s s'extén més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 "Entre les particions primàries, almenys una pot ser estesa\n"
-" (encara que això no és un problema sota Linux)\n"
+" (encara que això no és un problema en Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr "Atenció: La partició %s no comença en al límit d'un cilindre\n"
+msgstr "Avís: la partició %s no comença al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr "Atenció: La partició %s no acaba al límit d'un cilindre\n"
+msgstr "Avís: la partició %s no acaba al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: Hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
-"Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest "
+"Avís: hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
+"Això no és problema per al LILO, però l'MBR del DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Atenció: Usualment sols es pot arrencar des de particions primàries.\n"
-"El LILO no tindrà en compte l'etiqueta `d'arrencada'.\n"
+"Avís: normalment només es pot arrencar des de particions primàries.\n"
+"El LILO no tindrà en compte el senyalador d'«arrencada».\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: No hi ha cap partició primària marcada com d'arrencada (activa).\n"
+"Avís: no hi ha cap partició primària marcada com d'arrencada (activa).\n"
 "Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
-msgstr "començament"
+msgstr "inici"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: Començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha "
-"trobat (%ld,%ld,%ld)\n"
+"partició %s: inici: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
+"(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
-msgstr "acaba"
+msgstr "final"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: Acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat "
+"partició %s: final: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
-"La partició %s acaba en el cilindre %ld, més enllà de l'acabament del disc\n"
+"La partició %s acaba en el cilindre %ld, més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
-"Atenció: Es desplaça el començament de la partició estesa de %ld a %ld\n"
-"(Sols amb el propòsit de llistar-la. No es canviarà el seu contingut).\n"
+"Avís: s'ha desplaçat l'inici de la partició estesa de %ld a %ld\n"
+"(Només per al llistat, no en canvia el contingut.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
-"Atenció: La partició estesa no comença al límit d'un cilindre.\n"
-"El DOS i Linux interpretaran el contingut d'un mode diferent.\n"
-"\n"
+"Avís: la partició estesa no comença al límit d'un cilindre.\n"
+"El DOS i Linux interpretaran el contingut de manera diferent.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr "masses particions - s'ignoran les anteriors al núm: (%d)\n"
+msgstr "hi ha massa particions - s'ignoraran les posteriors a la: (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "l'arbre de particions?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "detectat Gestor de Disc - no es pot tractar això\n"
+msgstr "s'ha detectat el gestor de disc - no s'ha pogut gestionar\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
-msgstr "signatura DM6 trobada - abandonant\n"
+msgstr "s'ha trobat una signatura DM6 - s'està deixant còrrer\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estrany..., una partició estesa de mida 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estrany..., una partició BSD de mida 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: Partició no reconeguda\n"
+msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
-msgstr "s'ha especificat l'etiqueta -n: No s'ha canviat res\n"
+msgstr "s'ha especificat el senyalador -n: No s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Falla al desar els antics sectors - avortant\n"
+msgstr "No s'ha pogut desar els sector antics - s'està avortant\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Falla a l'escriure la partició en %s\n"
+msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
-msgstr "línia d'entrada llarga o incompleta - abandonant\n"
+msgstr "línia d'entrada llarga o incompleta - s'està sortint\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "error d'entrada: S'esperava `=' després del camp %s\n"
+msgstr ""
+"s'ha produït un error en l'entrada: s'esperava `=' després del camp %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "error d'entrada: Caràcter inesperat %c després del camp %s\n"
+msgstr ""
+"s'ha produït un error en l'entrada: no s'esperava el caràcter %c després del "
+"camp %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "entrada desconeguda: %s\n"
+msgstr "no s'ha pogut reconèixer l'entrada: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
-msgstr "número massa gran\n"
+msgstr "el nombre és massa gran\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
-msgstr "dades estranyes després del número\n"
+msgstr "dades estranyes després del nombre\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "no hi ha espai per al descriptor de partició\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
-msgstr "no es pot crear una partició estesa adjunta\n"
+msgstr "no s'ha pogut crear una partició estesa adjunta\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
-msgstr "masses camps a l'entrada\n"
+msgstr "hi ha massa camps a l'entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "No queda més espai\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
-msgstr "Tipus no permés\n"
+msgstr "Tipus no permès\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
-"Atenció: La mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
+msgstr "Avís: la mida indicada (%lu) excedeix la màxima acceptable (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
-msgstr "Atenció: Partició buida\n"
+msgstr "Avís: partició buida\n"
 
-#: fdisk/sfdisk.c:2141
+# DUBTE
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr "Atenció: Començament de la partició incorrecte (abans %lu)\n"
+msgstr "Avís: l'inici de la partició no és correcte (mínim %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "Etiqueta d'arrencada desconeguda - escolliu - o *\n"
+msgstr "no s'ha pogut reconèixer el senyalador d'arrencada - escolliu - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
-msgstr "especificació parcial de cil,capç,sect?\n"
+msgstr "especificació parcial de c,h,s?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
-msgstr "Partició estesa a on no s'esperava\n"
+msgstr "La partició estesa no és on s'esperava\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entrada dolenta\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
-msgstr "masses particions\n"
+msgstr "hi ha massa particions\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Entrada en el següent format; els camps absents tenen un valor per defecte.\n"
-"<començament> <mida> <tipus [E,S,L,X,hex]> <arrencada [-,*]> <cil,capç,sec> "
-"<cil,capç,sec>\n"
-"Normalment sols necessitarieu especificar <començament> i <mida> (i potser "
-"<tipus>).\n"
+"Entrada en el següent format; els camps absents obtenen un valor per "
+"defecte.\n"
+"<inici> <mida> <tipus [E,S,L,X,hex]> <arrencable [-,*]> <c,h,s> <c,h,s>\n"
+"Normalment només cal especificar <inici> i <mida> (i potser <tipus>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versió"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Ús: %s [opcions] dispositiu ...\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
-msgstr "dispositiu: Semblant a /dev/hda o /dev/sda"
+msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opcions útils:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Mostra la mida d'una partició"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Mostra les particions de cada dispositiu"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
-"    -d [o --dump]:       Igual, però amb un format adequat per l'entrada "
-"posterior"
+"    -d [o --dump]:       El mateix, però amb un format adequat per a una\n"
+"                         entrada posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  Nombre de cilindres, etc. des de 1 en comptes de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5106,185 +5020,185 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/"
 "cilindres/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Llista els tipus de particions conegudes"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [o --DOS]:        Per compatibilitat amb DOS: Es perd una mica d'espai"
+"    -D [o --DOS]:        Per compatibilitat amb DOS: es perd una mica d'espai"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Fa que el nucli rellegeixi la taula de particions"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
-msgstr "    -N# :                Sols canvia la partició amb el número #"
+msgstr "    -N# :                Només canvia la partició amb el número #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                 No escriu realment al disc"
+msgstr "    -n :                 No escrigues realment al disc"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fitxer :          Desa els sectors que es sobreescriuran en un fitxer"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fitxer:           Restaura aquests sectors altra vegada"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprimeix la versió"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprimeix aquest missatge"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opcions perilloses:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
-"    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
+"    -g [o --show-geometry]:  Imprimeix la idea que té el nucli de la "
+"geometria"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
+"    -G [o --show-pt-geometry]: Imprimeix la geometria que s'ha endevinat\n"
+"                               partir de la taula de particions"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [o --show-extended]:  També mostra en l'eixida les particions "
-"esteses\n"
-"                             o espera els seus descriptors en l'entrada"
+"    -x [o --show-extended]:  També llista les particions esteses a la "
+"sortida\n"
+"                             o els descriptors esperats en l'entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
-"    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per "
-"a Linux"
+"    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per\n"
+"                           a Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
-msgstr "    -q  [o --quiet]:       Suprimeix els missatges d'advertència"
+msgstr "    -q  [o --quiet]:       Suprimeix els avisos"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Podeu modificar la geometria detectada usant:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Estableix el nombre de cilindres que s'usaran"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:     Estableix el nombre de capçals que s'usaran"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:   Estableix el nombre de sectors que s'usaran"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Podeu desactivar tota comprovació de consistència amb:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Farà el que li digueu, encara que sigui estúpid"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "Ús:"
+msgstr "Forma d'ús:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositiu\t\t enumera les particions actives del dispositiu\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
-"%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n"
+msgstr "%s dispositiu n1 n2 ... activa particions n1 ..., desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -Un perifèric\t activa la partició n, desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
-msgstr "cap comandament?\n"
+msgstr "cap ordre?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "total: %d blocs\n"
+msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "ús: sfdisk --print-id dispositiu partició_número\n"
+msgstr "forma d'ús: sfdisk --print-id dispositiu número_partició\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "ús: sfdisk --change-id dispositiu número_partició Id\n"
+msgstr "forma d'ús: sfdisk --change-id dispositiu número_partició Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "ús: sfdisk --id dispositiu partició_número [Id]\n"
+msgstr "forma d'ús: sfdisk --id dispositiu partició_número [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
-msgstr "sols podeu especificar un dispositiu (excepte amb -l o -s)\n"
+msgstr "només podeu especificar un dispositiu (excepte amb -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "no es pot obrir %s per a lectura-escriptura\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "no es pot obrir %s per a lectura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s : %ld cilindres, %ld capçals, %ld sectors/pista\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "no es pot aconseguir la mida de %s"
+msgstr "No s'ha pogut obtenir la mida de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actiu incorrecte: 0x%x en comptes de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5292,44 +5206,45 @@ msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 "Teniu %d particions primàries actives. Això no és important per al LILO,\n"
-"però el MBR del DOS sols pot arrencar discs amb una partició activa.\n"
+"però l'MBR del DOS només pot arrencar discs amb una partició activa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partició %s té l'identificador %x i no està oculta\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador dolent %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Aquest disc està actualment en ús.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Error fatal: No es pot trobar %s\n"
+msgstr "S'ha produït un error fatal: no s'ha pogut trobar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Atenció: %s no és un dispositiu de blocs\n"
+msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Comprovant que en aquest moment ningú estigui usant aquest disc...\n"
+msgstr ""
+"S'està comprovant que en aquest moment ningú estigui usant aquest disc...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5338,74 +5253,75 @@ msgid ""
 msgstr ""
 "\n"
 "Aquest disc està actualment en ús; reparticionar-lo probablement sigui\n"
-"una mala idea. Desmunteu tots els sistemes de fitxers i efectueu un\n"
+"una mala idea. Desmunteu tots els sistemes de fitxers i executeu\n"
 "swapoff en totes les particions d'intercanvi del disc.\n"
-"Useu l'etiqueta --no-reread per a suprimir aquesta comprovació.\n"
+"Useu el senyalador --no-reread per a suprimir aquesta comprovació.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr "Useu l'etiqueta --force per a obviar totes les comprovacions.\n"
+msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Antiga situació:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "La partició %d no existeix; no es pot canviar\n"
+msgstr "La partició %d no existeix; no s'ha pogut canviar\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nova situació:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
-"No veig aquestes particions adequades - no he canviat res.\n"
+"Aquestes particions no em semblen bé - no s'ha canviat res.\n"
 "(Si realment desitgeu fer això, useu l'opció --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
-msgstr "No veig això adequat - probablement hagueu de respondre No\n"
+msgstr "No em sembla bé - probablement hagueu de respondre No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Esteu satisfet amb això? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Desitgeu escriure això al disc? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk: Final prematur de l'entrada\n"
+"sfdisk: final prematur de l'entrada\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
-msgstr "Sortint - no s'ha canviat res\n"
+msgstr "S'està sortint - no s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:3083
+# FIXME: 'y', 'n', 'q'. Are they translatable?
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
-msgstr "Si us plau responeu amb una: y,n,q\n"
+msgstr "Respongueu amb una: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5414,7 +5330,7 @@ msgstr ""
 "S'ha escrit correctament la nova taula de particions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5427,7 +5343,7 @@ msgstr ""
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Escolliu `getopt --help' per a obtindre més informació.\n"
+msgstr "Escolliu `getopt --help' per obtenir més informació.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
@@ -5435,31 +5351,29 @@ msgstr "opció llarga buida després de l'argument -l o --long"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr ""
-"intèrpret de comandaments desconegut després de l'argument -s o --shell"
+msgstr "intèrpret d'ordres desconegut després de l'argument -s o --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "ús: getopt cadena_d'opcions paràmetres\n"
+msgstr "Forma d'ús: getopt cadena_opcions paràmetres\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr "      getopt [opcions] [--] cadena_d'opcions paràmetres\n"
+msgstr "       getopt [opcions] [--] cadena_opcions paràmetres\n"
 
 #: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-msgstr "      getopt [opcions] -o|--options cadena_d'opcions [opcions] [--]\n"
+msgstr "       getopt [opcions] -o|--options cadena_opcions [opcions] [--]\n"
 
 #: getopt/getopt.c:327
 msgid "              parameters\n"
-msgstr "             paràmetres\n"
+msgstr "              paràmetres\n"
 
 #: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
-"  -a, --alternative            Permet opcions llargues amb un sol "
-"començament -\n"
+"  -a, --alternative            Permet opcions llargues amb només un -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
@@ -5467,42 +5381,41 @@ msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr ""
-"  -l, --longoptions=opc_llarg  Opcions llargues per a ser reconegudes\n"
+msgstr "  -l, --longoptions=opc_llarg   Opcions llargues a reconèixer\n"
 
 #: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
-"  -n, --name=nom_programa      El nom sota el qual s'informa dels errors\n"
+"  -n, --name=nom_programa      El nom amb el que s'informa dels errors\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=cadena_opcions Opcions curtes per a ser reconegudes\n"
+msgstr "  -o, --options=cadena_opcions Opcions curtes a reconèixer\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
-"  -q, --quiet                  Deshabilita els informes d'error mitjançant\n"
+"  -q, --quiet                  Inhabilita els informes d'error mitjançant\n"
 "                               getopt(3)\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr "  -Q, --quiet-output           No hi ha eixida normal\n"
+msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
-"  -s, --shell=shell            Estableix les convencions amb que es crida a\n"
-"                               l'interpret de comandaments\n"
+"  -s, --shell=intèrpret_ordres Estableix els mateixos convenis quant a les\n"
+"                               cometes que l'interpret d'ordres indicat\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
-msgstr "  -T, --test                   Provar per a la versió getopt(1)\n"
+msgstr "  -T, --test                   Prova la versió del getopt(1)\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unqote                 No posa entre cometes l'eixida\n"
+msgstr "  -u, --unqote                 No es posarà la sortida entre cometes\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5519,195 +5432,199 @@ msgstr "getopt (millorat) 1.1.3\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr "error intern; contacteu amb l'autor."
+msgstr "s'ha produït un error intern; contacteu amb l'autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
-msgstr "arrencant des de MILO\n"
+msgstr "s'ha arrencat des de MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Rellotge BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr "port del rellotge ajustat a 0x%x\n"
+msgstr "s'ha ajustat el port del rellotge a 0x%x\n"
 
-#: hwclock/cmos.c:214
+# FIXME: what the heck is this supposed to tell?
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+# FIXME: atomic what?
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: Comprovació de %s atòmic ha fallat per 1000 iteracions!"
+msgstr "%s: comprovació de %s atòmic ha fallat per 1000 iteracions!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "No es pot obrir /dev/port: %s"
+msgstr "No s'ha pogut obrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "Ha fallat l'obtenció del permís perque no s'ha intentat.\n"
+msgstr "No s'ha pogut obtenir el permís perquè no s'ha intentat.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
-"%s no pot aconseguir l'accés al port de E/S: La crida iopl(3) ha fallat.\n"
+"%s no pot aconseguir l'accés al port d'E/S: la crida iopl(3) ha fallat.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
-msgstr "Probablement necessitareu privilegis de root.\n"
+msgstr "Probablement necessiteu privilegis de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr "Assumint que el rellotge del maquinari té l'hora %s.\n"
+msgstr "S'està assumint que el rellotge del maquinari manté l'hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr "%s: Atenció: Tercera línia desconeguda al fitxer adjtime\n"
+msgstr "%s: Avís: no s'ha reconegut la tercera línia del fitxer adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(S'esperava: `UTC', `LOCAL' o res).\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Fet l'últim ajust de desfasament, %ld segons després de 1969\n"
+msgstr "L'últim ajust de desfasament es va fer %ld segons després de 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Feta la última calibració, %ld segons després de 1969\n"
+msgstr "L'última calibració es va fer %ld segons després de 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "El rellotge de maquinari té l'hora %s\n"
+msgstr "El rellotge del maquinari té l'hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconegut"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
-msgstr "Esperant la senyal del rellotge...\n"
+msgstr "S'està esperant el tic del rellotge...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
-msgstr "...rebuda la senyal del rellotge\n"
+msgstr "...s'ha rebut el tic del rellotge\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Valors incorrectes en el rellotge del maquinari: %4d/%.2d/%.2d %.2d:%.2d:"
 "%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora del maquinari : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segons després de "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr "Hora llegida des del maquinari : %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr ""
+"Hora llegida del rellotge del maquinari : %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-"Establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de 1969\n"
+"S'està establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de "
+"1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "El rellotge no s'ha modificat - sols s'ha provat.\n"
+msgstr "El rellotge no s'ha modificat - només s'ha provat.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 "El temps transcorregut des de l'hora de referència és de %.6f segons.\n"
-"Augmentant el retard fins al següent segon complet.\n"
+"S'ha endarrerit el moment en què s'arribarà al següent segon complet.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"Els registres del rellotge del maquinari conté valors no vàlids (p.e. dia 50 "
-"del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
+"Els registres del rellotge del maquinari contenen valores invàlids (p.ex. "
+"dia 50 del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segons\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "argument --date massa llarg\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 "El valor de l'opció --date no és una data vàlida.\n"
-"En concret, aquesta conté cometes.\n"
+"En concret, conté cometes.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Emetent les dades del comandament: %s\n"
+msgstr "S'està executant l'ordre date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
-"No es pot executar el programa 'date' en l'interpret de comandaments /bin/"
-"sh. popen() ha fallat"
+"No s'ha pogut executar el programa «date» en l'interpret d'ordres /bin/sh. "
+"popen() ha fallat"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr "resposta del comandament date = %s\n"
+msgstr "resposta de l'ordre date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5716,13 +5633,13 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"El comandament date executat per %s retorna resultats inesperats.\n"
-"El comandament fou:\n"
+"L'ordre date executada per %s ha retornat resultats inesperats.\n"
+"L'ordre era:\n"
 "  %s\n"
-"La resposta fou:\n"
+"La resposta ha estat:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5732,19 +5649,19 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"El comandament date executat per %s retorna quelcom altre a un valor enter "
-"quan s'esperava el valor de l'hora convertida.\n"
-"El comandament fou:\n"
+"L'ordre date executada per %s no ha tornat cap valor enter tot i que "
+"s'esperava el valor de l'hora convertida.\n"
+"L'ordre era:\n"
 "  %s\n"
-"La resposta fou:\n"
+"La resposta ha estat:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "la cadena de la data %s equival a %ld segons des de 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5753,66 +5670,66 @@ msgstr ""
 "El rellotge de maquinari no conté una hora vàlida, pel que no es pot "
 "establir l'hora del sistema a partir d'aquest valor.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Cridant a settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
-"No configuro el rellotge del sistema donat que l'execució és en mode de "
-"prova.\n"
+"No s'està configurant el rellotge del sistema perquè s'està executant en "
+"mode de prova.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
-msgstr "Heu de ser superusuari per a configurar rellotge del sistema.\n"
+msgstr "Heu de ser el superusuari per configurar rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ha fallat"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"No s'ajusta el factor de desfase donat que el rellotge del maquinari "
-"contenia prèviament desperdicis.\n"
+"No s'ha ajustat el factor de desfasament perquè el rellotge del maquinari "
+"contenia valors despreciables.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"No s'ajusta el factor de desfase degut a que la data de l'última\n"
-"calibració és cero, així que l'historial és dolent i es necessària\n"
+"No s'ha ajustat el factor de desfasament perquè la data de l'última\n"
+"calibració és zero, així que l'historial és dolent, i és necessària\n"
 "una calibració des del començament.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"No s'ajusta el factor de desfase donat que fa menys d'un dia de la la última "
+"No s'ajusta el factor de desfasament perquè fa menys d'un dia de l'última "
 "calibració.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5820,71 +5737,69 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 "El rellotje s'ha desfasat %.1f segons en els últims %d segons, tot i emprar "
-"un factor de desfase de %f segons diaris.\n"
-"Ajustan el factor de desfase en %f segons diaris\n"
+"un factor de desfasament de %f segons diaris.\n"
+"S'està ajustant el factor de desfasament a %f segons diaris\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "El temps des de l'últim ajust és de %d segons\n"
+msgstr "Han transcorregut %d segons des de l'últim ajust\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
-"Necessiteu inserir %d segons i refer la referència de l'hora tants %.6f "
-"segons enradera\n"
+"S'han d'inserir %d segons i referir el temps anterior a fa %.6f segons\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "No s'actualitza el fitxer adjtime degut al mode de prova.\n"
+msgstr ""
+"No s'actualitzarà el fitxer adjtime perquè s'executa en mode de prova.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
-"S'hauria d'escriure el següent en %s:\n"
+"S'hauria escrit el següent a %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Paràmetres d'ajustament del desfase no actualitzats.\n"
+msgstr "No s'han actualitzat els paràmetres d'ajustament del desfasament.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
-"El rellotje de maquinari no conté una hora vàlida, pel que no es pot "
-"ajustar.\n"
+"El rellotje de maquinari no conté una hora vàlida, i no es pot ajustar.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
-"L' ajustament necessari és inferior a un segon, pel que no s'estableix al "
-"rellotge.\n"
+"L'ajustament necessari és inferior a un segon, no s'ajustarà el rellotge.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Usant %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "No s'ha trobat cap interfície de rellotge usable.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "No es pot establir el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5892,41 +5807,47 @@ msgid ""
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"El nucli té un valor de època per al rellotge de maquinari sols en les "
+"El nucli només té un valor d'època per al rellotge del maquinari en les "
 "màquines Alpha.\n"
 "Aquesta còpia de hwclock es va compilar per a una màquina no Alpha (pel que\n"
-"possiblement ara no s'executa en una màquina Alpha). No es pren cap acció.\n"
+"possiblement ara no s'executi en cap màquina Alpha). No s'ha executat cap "
+"acció.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "No es pot obtindre el valor de època des del nucli.\n"
+msgstr "No es pot obtenir el valor d'època del nucli.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr "El nucli assumeix un valor de època de %lu\n"
+msgstr "El nucli assumeix un valor d'època de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
-"Per a establir el valor de època, haureu d'usar l'opció 'epoch' per a "
-"indicar a quin valor s'ha d'establir.\n"
+"Per establir el valor d'època, haureu d'usar l'opció 'epoch' per a indicar a "
+"quin valor s'ha d'establir.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
-msgstr "No s'estableix el valor de època en %d - sols es prova.\n"
+msgstr "No s'establirà el valor de l'època a  %d - només s'està provant.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "No es pot establir el valor de època en el nucli.\n"
+msgstr "No es pot establir el valor d'època en el nucli.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s des de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5959,168 +5880,169 @@ msgid ""
 msgstr ""
 "hwclock - Consulta i configura el rellotge de maquinari (RTC)\n"
 "\n"
-"Ús: hwclock [funció] [opcions...]\n"
+"Forma d'ús: hwclock [funció] [opcions...]\n"
 "\n"
 "Funcions:\n"
 "  --help        Mostra aquesta ajuda\n"
-"  --show        Llegeix el RTC i imprimeix el resultat\n"
-"  --set         Estableix el RTC en l'hora proporcionada amb --date\n"
+"  --show        Llegeix el RTC i n'imprimeix el resultat\n"
+"  --set         Estableix el RTC a l'hora proporcionada amb --date\n"
 "  --hctosys     Estableix l'hora del sistema a partir del RTC\n"
-"  --systohc     Estableix el RTC en l'hora actual del sistema\n"
-"  --adjust      Ajusta el RTC per a compensar el desfàs sistemàtic des de \n"
-"                la última vegada que s'establi o ajustà el rellotge\n"
-"  --getepoch    Imprimeix el valor de època del RTC del nucli\n"
-"  --setepoch    Estableix el valor de època del RTC del nucli \n"
-"                en el valor proporcionat en --epoch\n"
-"  --version     Imprimeix la versió de hwclock en l'eixida estàndard\n"
+"  --systohc     Estableix el RTC a l'hora actual del sistema\n"
+"  --adjust      Ajusta el RTC per a compensar el desfasament sistemàtic des "
+"de \n"
+"                la última vegada que es va establir o ajustar el rellotge\n"
+"  --getepoch    Imprimeix el valor de l'època del RTC del nucli\n"
+"  --setepoch    Estableix el valor de l'època del RTC del nucli \n"
+"                al valor proporcionat amb --epoch\n"
+"  --version     Imprimeix la versió de hwclock a la sortida estàndard\n"
 "\n"
 "Opcions: \n"
 "  --utc         El RTC està en temps universal coordinat\n"
 "  --localtime   El RTC té l'hora local\n"
-"  --directisa   Accedeix al bus ISA directament en comptes de a %s\n"
+"  --directisa   Accedeix al bus ISA directament en comptes de %s\n"
 "  --badyear     Ignora l'any del RTC ja que el BIOS no funciona\n"
-"  --date        Especifica el temps en que es desitja establir el RTC\n"
+"  --date        Especifica el temps en què es desitja establir el RTC\n"
 "  --epoch=any   Especifica l'any que correspon al començament del valor de\n"
 "                l'època del RTC\n"
-"  --noadjfile   No accedir a /etc/adjtime. Requereix l'ús de --utc o --"
-"localtime\n"
+"  --noadjfile   No accedeixis a /etc/adjtime. Requereix l'ús de --utc o bé\n"
+"                --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
-"                Indica al RTC el tipus de Alpha (veure hwclock(8))\n"
+"                Indica al RTC el tipus d'Alpha que teniu (vegeu hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admet arguments que no siguin opcions. Heu especificat %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 "Heu especificat múltiples funcions.\n"
-"Sols podeu fer-ne una cada vegada.\n"
+"Només podeu fer-ne una a la vegada.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
-"%s: Les opcions --utc i --localtime s'exclouen mutuament. Les heu "
+"%s: Les opcions --utc i --localtime s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Les opcions --adjust i --noadjfile s'exclouen mutuament. Les heu "
+"%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Amb --noadjfile, haureu d'especificar --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Hora establerta no usable. No es pot establir el rellotge.\n"
+msgstr ""
+"L'hora indicada per establir no és usable. No s'ha tocat el rellotge.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Ho sento, sols el superusuari pot canviar el rellotge de maquinari.\n"
+msgstr "Només el superusuari pot canviar el rellotge del maquinari.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Ho sento, sols el superusuari port canviar el rellotge del sistema.\n"
+msgstr "Només el superusuari port canviar el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Ho sento, sols el superusuari pot canviar el valor de època del rellotge de "
+"Només el superusuari pot canviar el valor de l'època del rellotge del "
 "maquinari en el nucli.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
-"No es pot accedir al rellotge de maquinari mitjançant un dels mètodes "
+"No s'ha pogut accedir al rellotge del maquinari mitjançant cap dels mètodes "
 "coneguts.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-"Useu l'opció --debug per a veure els detalls de la recerca d'un mètode "
+"Useu l'opció --debug per veure els detalls de la recerca d'un mètode "
 "d'accés.\n"
 
 #: hwclock/kd.c:55
 #, c-format
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr "Esperant en bucle a que canviï l'hora de KDGHWCLK\n"
+msgstr "S'està esperant en bucle a que canviï l'hora de KDGHWCLK\n"
 
 #: hwclock/kd.c:58
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "Falla de ioctl KDGHWCLK al llegir l'hora"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK per llegir l'hora"
 
 #: hwclock/kd.c:79 hwclock/rtc.c:188
 #, c-format
 msgid "Timed out waiting for time change.\n"
-msgstr "Temps excedit durant l'espera del canvi d'hora.\n"
+msgstr "S'ha excedit el temps d'espera per a què canviés l'hora.\n"
 
 #: hwclock/kd.c:83
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "Falla de ioctl KDGHWCLK al llegir l'hora en el bucle"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK per llegir l'hora en el bucle"
 
 #: hwclock/kd.c:105
 #, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr "La comprovació de ioctl() no ha llegit l'hora des de %s"
+msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
 #: hwclock/kd.c:141
 msgid "ioctl KDSHWCLK failed"
-msgstr "Falla de ioctl KDGHWCLK"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "No es pot obrir /dev/tty1 o /dev/vc/1"
+msgstr "No s'ha pogut obrir /dev/tty1 o /dev/vc/1"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
-msgstr "Falla de ioctl KDGHWCLK"
+msgstr "No s'ha pogut executar ioctl KDGHWCLK"
 
 #: hwclock/rtc.c:116 hwclock/rtc.c:209
 #, c-format
 msgid "open() of %s failed"
-msgstr "Falla de open() de %s"
+msgstr "No s'ha pogut executar open() de %s"
 
 #: hwclock/rtc.c:150
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr "La comprovació de ioctl() en %s ha fallat al llegir l'hora.\n"
+msgstr "No s'ha pogut executar ioctl() a %s per llegir l'hora.\n"
 
 #: hwclock/rtc.c:172
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr "Esperant en bucle per a canviar l'hora des de %s\n"
+msgstr "S'està esperant en bucle per a canviar l'hora de %s\n"
 
 #: hwclock/rtc.c:227
 #, c-format
@@ -6130,49 +6052,48 @@ msgstr "%s no té funcions d'interrupció.  "
 #: hwclock/rtc.c:238
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+msgstr "No s'ha pogut executar read() a %s per esperar el tic del rellotge."
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+msgstr "No s'ha pogut executar select() a %s per esperar el tic del rellotge."
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
 msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+"S'ha excedit el temps d'espera en executar select() a %s en esperar\n"
+"el tic del rellotge.\n"
 
 #: hwclock/rtc.c:268
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
-"La comprovació de ioctl() en %s ha fallat al desactivar les interrupcions "
+"No s'ha pogut executar ioctl() a %s per desactivar les interrupcions\n"
 "d'actualització"
 
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"La comprovació de ioctl() en %s ha fallat inesperadament a l'activar les "
-"interrupcions d'actualització"
+"No s'ha pogut executar ioctl() a %s per activar les interrupcions\n"
+"d'actualització, ha fallat inesperadament"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "La comprovació de ioctl() en %s ha fallat a l'establir l'hora.\n"
+msgstr "No s'ha pogut executar ioctl() a %s per establir l'hora.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr "La comprovació de ioctl(%s) ha finalitzat correctament.\n"
+msgstr "S'ha executat ioctl(%s) satisfactòriament.\n"
 
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Error obrint %s"
+msgstr "S'ha produït un error en obrir %s"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6181,8 +6102,8 @@ msgid ""
 "device driver via the device special file %s.  This file does not exist on "
 "this system.\n"
 msgstr ""
-"Per a modificar el valor de època del nucli, heu d'accedir al controlador "
-"del dispositiu 'rtc' de Linux mitjançant el fitxer especial de dispositiu %"
+"Per a modificar el valor de l'època del nucli, heu d'accedir al controlador "
+"del dispositiu «rtc» de Linux mitjançant el fitxer especial de dispositiu %"
 "s. Aquest fitxer no existeix en aquest sistema.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
@@ -6193,26 +6114,22 @@ msgstr "No es pot obrir %s"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "La comprovació de ioctl(RTC_EPOCH_READ) en %s ha fallat"
+msgstr "No s'ha pogut executar ioctl(RTC_EPOCH_READ) a %s"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"s'ha llegit el valor de època %ld des de %s amb ioctl RTC_EPOCH_READ.\n"
+msgstr "s'ha llegit el valor de l'època %ld de %s amb ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "El valor de època no pot ser inferior a 1900. Heu requerit %ld\n"
+msgstr "El valor d'època no pot ser inferior a 1900. Heu indicat %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr "establint la època a %ld amb ioctl RTC_EPOCH_SET en %s.\n"
+msgstr "s'està establint l'època a %ld amb ioctl RTC_EPOCH_SET a %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
@@ -6225,48 +6142,45 @@ msgstr ""
 #: hwclock/rtc.c:447
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "La comprovació de ioctl(RTC_EPOCH_SET) de %s ha fallat"
+msgstr "No s'ha pogut executar ioctl(RTC_EPOCH_SET) a %s"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
-msgstr "cridant open_tty\n"
+msgstr "s'està cridant open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr "cridant termio_init\n"
+msgstr "s'està cridant termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr "escrivint la cadena inicial\n"
+msgstr "s'està escrivint la cadena inicial\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "abans del mode autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr "esperant durant cr-lf\n"
+msgstr "s'està esperant cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr "llegit %c\n"
+msgstr "s'ha llegit %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr "llegint el nom d'accés\n"
+msgstr "s'està llegint el nom d'entrada\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: No pot executar %s: %m"
+msgstr "%s: no s'ha pogut executar %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr "no es pot executar malloc() per la cadena d'inicialització"
+msgstr "no s'ha pogut executar malloc() per a la cadena d'inicialització"
 
 #: login-utils/agetty.c:471
 #, c-format
@@ -6279,11 +6193,11 @@ msgstr "després del bucle getopt\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr "traient parseargs\n"
+msgstr "s'està traient parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr "entrant parse_speeds\n"
+msgstr "s'ha entrat parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
@@ -6292,11 +6206,11 @@ msgstr "velocitat incorrecta: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr "masses velocitats alternatives"
+msgstr "massa velocitats alternatives"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr "traient parsespeeds\n"
+msgstr "s'està traient parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
@@ -6306,9 +6220,8 @@ msgstr "/dev: chdir() ha fallat: %m"
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s: No és un dispositiu de caràcter"
+msgstr "/dev/%s: no és un dispositiu de caràcter"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6316,23 +6229,21 @@ msgstr "open(2)\n"
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s: No es pot obrir-lo com a entrada estàndard: %m"
+msgstr "/dev/%s: no es pot obrir com a entrada estàndard: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: No obert per a lectura/escriptura"
+msgstr "%s: no s'ha obert per a lectura/escriptura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dup() en curs\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr "%s: Problema de dup: %m"
+msgstr "%s: problema de dup: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
@@ -6351,12 +6262,12 @@ msgstr "usuaris"
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr "%s: Lectura: %m"
+msgstr "%s: lectura: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: Desbordament de l'entrada"
+msgstr "%s: desbordament de l'entrada"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6366,92 +6277,85 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Ús: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H màquina_d'accés] velocitat_baudis,... línia "
+"Forma d'ús: %s [-hiLmw] [-l programa_accés] [-t temps_espera] [-I "
+"cadena_inicialització] [-H ordinador_accés] velocitat_bauds,... línia "
 "[tipus_terminal]\n"
 "o bé\n"
-"\t  [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H màquina_d'accés] línia velocitat_baudis,... "
-"[tipus_terminal]\n"
+"\t[-hiLmw] [-l programa_accés] [-t temps_espera] [-I cadena_inicialització] "
+"[-H ordinador_accés] línia velocitat_bauds,... [tipus_terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: Poca memòria; l'accés podria fallar\n"
+msgstr "login: poca memòria; l'accés podria fallar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "no es pot executar malloc() per a ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
-msgstr "malloc per a grplist és impossible"
+msgstr "no es pot executar malloc per a grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Accés a %s des de %s denegat per defecte.\n"
+msgstr "Per defecte, s'ha denegat l'accés a %s des de %s.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Accés a %s des de %s denegat.\n"
+msgstr "S'ha denegat l'accés a %s des de %s.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s: El vostre (usuari %d) no existeix.\n"
+msgstr "%s: aquest usuari (%d) no existeix.\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: L'usuari \"%s\" no existeix.\n"
+msgstr "%s: l'usuari \"%s\" no existeix.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
-msgstr "%s: Sols put modificar entrades locals; useu yp%s.\n"
+msgstr "%s: només es poden modificar entrades locals; useu yp%s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
-#, fuzzy
 msgid "Unknown user context"
-msgstr "error desconegut en la clau"
+msgstr "Es desconeix el context de l'usuari"
 
 #: login-utils/chfn.c:152
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
-msgstr ""
+msgstr "%s: %s no està autoritzat a canviar la informació del finger de %s\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: No s'ha pogut establir el context per defecte per a /etc/passwd"
 
 #: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Canviant informació del finger per a %s.\n"
+msgstr "S'està canviant la informació del finger per a l'usuari %s.\n"
 
 #: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
 #: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
 #: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
-msgstr "Error de contrasenya."
+msgstr "S'ha produït un error en la contrasenya."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Contrasenya: "
 
 #: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
-msgstr "Contrasenya incorrecta."
+msgstr "La contrasenya no és correcta."
 
 #: login-utils/chfn.c:217
 #, c-format
@@ -6461,7 +6365,7 @@ msgstr "No s'ha canviat la informació del finger.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Ús: %s [ -f nom_complet ] [ -o oficina ] "
+msgstr "Forma d'ús: %s [ -f nom_complet ] [ -o oficina ] "
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6484,7 +6388,7 @@ msgid ""
 "Aborted.\n"
 msgstr ""
 "\n"
-"Abortada.\n"
+"S'ha avortat.\n"
 
 #: login-utils/chfn.c:425
 #, c-format
@@ -6494,7 +6398,7 @@ msgstr "el camp és massa llarg.\n"
 #: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' no està permes.\n"
+msgstr "«%c» no està permès.\n"
 
 #: login-utils/chfn.c:438
 #, c-format
@@ -6505,21 +6409,23 @@ msgstr "Els caràcters de control no estan permesos.\n"
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
-"*NO* s'ha canviat la informació del finger. Probeu-ho altra vegada després.\n"
+"*NO* s'ha canviat la informació del finger. Intenteu-ho de nou més "
+"endavant.\n"
 
 #: login-utils/chfn.c:506
 #, c-format
 msgid "Finger information changed.\n"
-msgstr "Informació del finger modificada.\n"
+msgstr "S'ha canviat la informació del finger.\n"
 
 #: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
 msgid "malloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
+msgstr ""
+"%s: %s no està autoritzat a canviar l'intèrpret d'ordres de l'usuari %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6527,37 +6433,40 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: L'UID en execució no coincideix amb l'UID de l'usuari que s'està "
+"alterant, s'ha denegat el canvi d'intèrpret d'ordres\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
-"%s: El vostre intèrpret de comandaments no està en /etc/shells; canvi de "
-"l'intèrpret de comandaments denegat\n"
+"%s: El vostre intèrpret d'ordres no està a /etc/shells; s'ha denegat el "
+"canvi d'intèrpret d'ordres\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Canviant l'intèrpret de comandaments per a %s.\n"
+msgstr "S'està canviant l'intèrpret d'ordres per %s.\n"
 
 #: login-utils/chsh.c:211
 msgid "New shell"
-msgstr "Nou intèrpret de comandaments"
+msgstr "Nou intèrpret d'ordres"
 
 #: login-utils/chsh.c:218
 #, c-format
 msgid "Shell not changed.\n"
-msgstr "L'intèrpret de comandaments no ha canviat.\n"
+msgstr "No s'ha canviat l'intèrpret d'ordres.\n"
 
 #: login-utils/chsh.c:225
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "L'intèrpret de comandaments *NO* ha canviat. Proveu-ho més endavant.\n"
+msgstr ""
+"No s'ha canviat l'intèrpret d'ordres. Intenteu-ho de nou més endavant.\n"
 
 #: login-utils/chsh.c:228
 #, c-format
 msgid "Shell changed.\n"
-msgstr "S'ha canviat l'intèrpret de comandaments.\n"
+msgstr "S'ha canviat l'intèrpret d'ordres.\n"
 
 #: login-utils/chsh.c:293
 #, c-format
@@ -6565,14 +6474,14 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"Ús: %s [ -s intèrpret_de_comandaments ] [ --list-shells ] [ --help ] [ --"
+"Forma d'ús: %s [ -s intèrpret_d'ordres ] [ --list-shells ] [ --help ] [ --"
 "version ]\n"
-"     [ nom_d'usuari ]\n"
+"\t[ nom_usuari ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr "%s: L'intèrpret de comandaments ha de ser un nom de ruta complet.\n"
+msgstr "%s: l'intèrpret d'ordres ha de ser un camí complet.\n"
 
 #: login-utils/chsh.c:340
 #, c-format
@@ -6587,7 +6496,7 @@ msgstr "%s: \"%s\" no és executable.\n"
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: '%c' no està permes.\n"
+msgstr "%s: '%c' no està permès.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
@@ -6597,75 +6506,48 @@ msgstr "%s: Els caràcters de control no estan permesos.\n"
 #: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Atenció: \"%s\" no està llistat en /etc/shells\n"
+msgstr "Avís: \"%s\" no està llistat a /etc/shells\n"
 
 #: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
+msgstr "%s: \"%s\" no està llistat a /etc/shells.\n"
 
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: useu l'opció -l per a veuren la llista\n"
+msgstr "%s: useu l'opció -l per veure'n la llista\n"
 
 #: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Atenció: \"%s\" no està llistat en /etc/shells.\n"
+msgstr "Avís: \"%s\" no està llistat a /etc/shells.\n"
 
 #: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "Useu %s -l per a veuren la llista.\n"
+msgstr "Useu %s -l per veure'n la llista.\n"
 
 #: login-utils/chsh.c:393
 #, c-format
 msgid "No known shells.\n"
-msgstr "No conec intèrprets de comandaments.\n"
-
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "no es pot obrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "no es pot llegir les dades aleatòries des de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "no es pot obrir %s per a lectura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "no es pot fer stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s no té els modes de fitxer correctes"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "no es pot llegir dades des de %s"
+msgstr "No es coneix cap intèrpret d'ordres.\n"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "no es pot llegir %s; sortint."
+msgstr "No s'ha pogut llegir %s; s'està sortint."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "ús: last [-#] [-f fitxer] [-t tty] [-h nom_màquina] [usuari ...]\n"
+msgstr ""
+"forma d'ús: last [-#] [-f fitxer] [-t tty] [-h nom_ordinador] [usuari ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  encara teniu una sessió en el sistema"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6674,15 +6556,15 @@ msgstr ""
 "\n"
 "wtmp comença %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
-msgstr "last: Falla del malloc.\n"
+msgstr "last: no ha estat possible executar malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
-msgstr "last: Obtindre el nom de la màquina"
+msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6691,486 +6573,330 @@ msgstr ""
 "\n"
 "interromput %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "Error FATAL: No es pot reobrir tty: %s"
+msgstr "S'ha produït un error fatal: no s'ha pogut reobrir tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr "ERROR FATAL: Terminal errònia"
+msgstr "S'ha produït un error fatal: terminal erroni"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
-msgstr "login: -h sols per al superusuari.\n"
+msgstr "login: només el superusuari pot fer servir -h.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "ús: login [-fp] [nom_usuari]\n"
+msgstr "forma d'ús: login [-fp] [nom_usuari]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM ha fallat; avortant: %s\n"
+msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr "No es pot inicialitzar PAM: %s"
-
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+msgstr "No s'ha pogut inicialitzar PAM: %s"
+
+#: login-utils/login.c:494
 msgid "login: "
-msgstr "accés: "
+msgstr "entrada: "
 
-#: login-utils/login.c:597
+# FIXME, please describe parameters
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "ACCÉS INFRUCTUÓS %d DES DE %s PER A %s, %s"
+msgstr "S'HA INTENTAT ACCEDIR SENSE ÈXIT %d VEGADES DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Accés incorrecte\n"
+"L'entrada no és correcta\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "MASSES INTENTS D'ACCÉS (%d) DES DE %s PER A %s, %s"
+msgstr "S'HA INTENTAT ENTRAR MASSA VEGADES (%d) DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "SESSIONS D'ACCÉS FALLIDES DES DE %s PER A %s, %s"
+msgstr "NO S'HA POGUT INICIAR LA SESSIÓ DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Accés incorrecte\n"
+"Entrada incorrecta\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 "\n"
-"Problema a l'iniciar la sessió, avortat.\n"
+"S'ha produït un problema en iniciar la sessió, s'avortarà.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr "Nom d'usuari NUL en %s:%d. Avortat."
+msgstr "Nom d'usuari NUL a %s:%d. S'avortarà."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Nom d'usuari no vàlid \"%s\" en %s:%d. Avortat."
+msgstr "Nom d'usuari invàlid \"%s\" a %s:%d. S'avortarà."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
-msgstr "login: Memòria esgotada\n"
+msgstr "login: No hi ha prou memòria\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
-msgstr "Nom d'usuari ilegal"
+msgstr "Nom d'usuari il·legal"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "Accés %s refusat en aquest terminal.\n"
+msgstr "S'ha refusat l'entrada de %s en aquest terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "ACCÉS %s REFUSAT DES DE %s EN LA TTY %s"
+msgstr "S'HA REFUSAT L'ENTRADA DE %s DES DE %s A LA TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "ACCÉS %s REFUSAT EN LA TTY %s"
+msgstr "S'HA REFUSAT L'ENTRADA DE %s A LA TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
-msgstr "Accés incorrecte\n"
+msgstr "Entrada incorrecta\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Masses usuaris en actiu en el sistema.\n"
-"Probeu-ho més tard.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Teniu masses processos en execució.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "DIALUP EN %s PER %s"
+msgstr "MARCATGE DIRECTE A %s PER %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "ACCÉS DE ROOT EN %s DES DE %s"
+msgstr "ENTRADA DEL ROOT A %s DES DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "ACCÉS DE ROOT EN %s"
+msgstr "ENTRADA DEL ROOT A %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "ACCCÉS EN %s PER %s DES DE %s"
+msgstr "ENTRADA A %s PER %s DES DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "ACCÉS EN %s PER %s"
+msgstr "ENTRADA A %s PER %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teniu correu nou.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teniu correu.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: Falla l'establiment del canvi: %s"
+msgstr "login: s'ha produït un error en bifurcar: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ha fallat: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hi ha cap directori %s\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
-msgstr "Accedint amb el directori inicial = \"/\".\n"
+msgstr "S'està entrant amb el directori inicial = «/».\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
-"login: Memòria esgotada per a l'script de l'intèrpret de comandaments.\n"
+"login: no hi ha prou memòria per a la seqüència de l'intèrpret d'ordres.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
-"login: No s'ha pogut executar l'script de l'intèrpret de comandaments: %s.\n"
+"login: no s'ha pogut executar la seqüènca de l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr "login: No hi ha intèrpret de comandaments: %s.\n"
+msgstr "login: no hi ha l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 "\n"
-"Accés de %s: "
+"Entrada a %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "nom d'accés massa llarg.\n"
+msgstr "el nom d'entrada és massa llarg.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
-msgstr "NOM massa llarg"
+msgstr "NOM és massa llarg"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
-msgstr "els noms d'accés no poden començar per '-'.\n"
+msgstr "els noms d'entrada no poden començar per «-».\n"
 
-#: login-utils/login.c:1257
+# FIXME
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
-msgstr "masses salts de pàgina solitaris.\n"
+msgstr "massa salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
-msgstr "MASSES salts de pàgina"
+msgstr "MASSA salts de pàgina"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "L'intent d'accés ha esgotat el temps d'espera després de %d segons\n"
+msgstr "S'ha excedit el temps d'espera per a l'entrada al cap de %d segons.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
-msgstr "Últim accés: %.*s "
+msgstr "Última entrada: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
-msgstr "en %.*s\n"
+msgstr "a %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ACCÉS FALLIT DES DE %s, %s"
+msgstr "HA FALLAT L'ENTRADA DE %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ACCÉS FALLIT EN %s, %s"
+msgstr "HA FALLAT L'ENTRADA A %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d FALLES EN L'ACCÉS DES DE %s, %s"
+msgstr "HA FALLAT %d VEGADES L'ENTRADA DES DE %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d FALLES EN L'ACCÉS EN %s, %s"
+msgstr "HA FALLAT %d VEGADES L'ENTRADA A %s, %s"
 
+# FIXME 'y' untranslateable?
 #: login-utils/mesg.c:89
 #, c-format
 msgid "is y\n"
 msgstr "és y\n"
 
+# FIXME 'n' untranslateable?
 #: login-utils/mesg.c:92
 #, c-format
 msgid "is n\n"
 msgstr "és n\n"
 
+# FIXME 'y', 'n' untranslateable?
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "ús: mesg [y | n]\n"
+msgstr "forma d'ús: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Qui sou?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
-msgstr "newgrp: No existeix tal grup."
+msgstr "newgrp: Aquest grup no existeix."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Permís denegat"
+msgstr "newgrp: S'ha denegat el permís"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
-msgstr "No hi ha intèrpret de comandaments"
-
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"La contrasenya ha de tindre com a mínim 6 caràcters, probeu-ho altra "
-"vegada.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"La contrasenya ha de contindre caràcters d'almenys de les següents clases:\n"
-"lletres majúscules i minúscules, dígits i no alfanumèrics.\n"
-"Per a més informació mireu passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "No podeu tornar a usar l'antiga contrasenya.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Si us plau, no useu tal com el vostre nom d'usuari com a contrasenya.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Si us plau, no useu tal com el vostre nom real com a contrasenya.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Ús: passwd [nom_usuari [contrasenya]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Sols l'usuari root pot usar les formes d'un i dos arguments.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Ús: passwd [-foqsvV] [usuari [contrasenya]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "No es pot executar %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "No es pot trobar el nom d'accés"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Sols l'usuari root pot canviar la contrasenya d'altres usuaris.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Masses arguments.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "No es pot trobar enlloc el nom d'usuari. `%s' és realment un usuari?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Ho sento, sols es poden canviar les contrasenyes locals. Useu yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "El UID i el nom d'usuari no coincideixen, impostor!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Canviant la contrasenya per a %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Entreu l'antiga contrasenya: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Contrasenya ilegal, impostor."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Entreu la nova contrasenya: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "No s'ha canviat la contrasenya."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Reescriviu la nova contrasenya: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "L'heu escrit malament. No s'ha canviat."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "contrasenya canviada, usuari %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "CONTRASENYA DEL ROOT CANVIADA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "contrasenya canviada per al root; usuari %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "cridant a setpwnam per a establir la contrasenya.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "*NO* s'ha canviat la contrasenya. Proveu-ho més tard.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Contrasenya canviada.\n"
+msgstr "No hi ha intèrpret d'ordres"
 
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Ús: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
+msgstr "Forma d'ús: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr "Procés de shutdown avortat"
+msgstr "S'ha avortat el procés d'aturada"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: Sols l'usuari root pot aturar un sistema.\n"
+msgstr "%s: Només l'usuari root pot aturar un sistema.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Això serà demà: Podeu esperar fins llavors?\n"
+msgstr "Això ha de ser demà, no us podeu esperar fins llavors?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
@@ -7183,30 +6909,29 @@ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "El sistema s'aturarà dintre de 5 minuts"
+msgstr "El sistema s'aturarà d'aquí a 5 minuts"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "Pel que l'accés està prohibit."
+msgstr "Per tant no es permet l'entrada."
 
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr "reiniciat per %s: %s"
+msgstr "%s ha arrencat de nou: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr "aturat per %s: %s"
+msgstr "%s ha aturat: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"Perquè teniu el procés actiu després de l'operació de reinici?"
+"Com és que encara estic actiu després d'arrencar de nou?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7214,53 +6939,52 @@ msgid ""
 "Now you can turn off the power..."
 msgstr ""
 "\n"
-"Ara podeu desconectar la font d'alimentació..."
+"Ara podeu desconnectar la font d'alimentació..."
 
 #: login-utils/shutdown.c:447
 #, c-format
 msgid "Calling kernel power-off facility...\n"
-msgstr "Cridant a l'aturada del nucli...\n"
+msgstr "S'està cridant el sistema d'apagada del nucli...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr "Error l'aturar\t%s\n"
+msgstr "S'ha produït un error en apagar\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Executant el programa \"%s\" ...\n"
+msgstr "S'està executant el programa \"%s\" ...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Error executant \t%s\n"
+msgstr "S'ha produït un error en executar \t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENT: Missatge de difusió des de %s:"
+msgstr "URGENT: missatge de difusió de %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "El sistema s'aturarà en %d hores i %d minuts"
+msgstr "El sistema s'aturarà d'aquí a %d hores i %d minuts"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "El sistema s'aturara en 1 hora i %d minuts"
+msgstr "El sistema s'aturara d'aquí a 1 hora i %d minuts"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr "El sistema s'aturarà en %d minuts\n"
+msgstr "El sistema s'aturarà d'aquí a %d minuts\n"
 
 #: login-utils/shutdown.c:503
 #, c-format
 msgid "System going down in 1 minute\n"
-msgstr "El sistema s'aturarà en 1 minut\n"
+msgstr "El sistema s'aturarà d'aquí a 1 minut\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
@@ -7274,65 +6998,61 @@ msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "No es pot establir un canvi per a swapoff. Vaja!"
+msgstr "No s'ha pogut bifurcar swapoff."
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "No es pot executar swapoff, s'espera que umount ho faci."
+msgstr "No s'ha pogut executar swapoff, esperem que umount ho faci."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "No es pot establir un canvi per a umount, provar-ho manualment."
+msgstr "No s'ha pogut bufurcar umount, s'està provant manualment."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "No es pot executar %s, es prova umount.\n"
+msgstr "No s'ha pogut executar %s, s'està provant umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "No es pot executar executar umount, abandonant l'operació umount."
+msgstr "No s'ha pogut executar umount, s'està abandonant l'operació umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Desmuntant els sistemes de fitxers restants..."
+msgstr "S'està desmuntant els sistemes de fitxers restants..."
 
 #: login-utils/shutdown.c:659
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "shutdown: No es pot desmuntar %s: %s\n"
+msgstr "shutdown: No s'ha pogut desmuntar %s: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "Arrencant en mode d'un sol usuari.\n"
+msgstr "S'està arrencant en el mode d'un sol usuari.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr ""
-"l'execució de l'intèrpret de comandaments en mode d'usuari únic ha fallat\n"
+msgstr "l'execució de l'intèrpret d'ordres en mode d'un sol usuari ha fallat\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr ""
-"l'establiment del canvi a un sol usuari a l'intèrpret de comandaments ha "
-"fallat\n"
+msgstr "no s'ha pogut bifurcar l'intèrpret d'ordres d'un sol usuari\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
-msgstr "error obrint fifo\n"
+msgstr "s'ha produït un error en obrir fifo\n"
 
 #: login-utils/simpleinit.c:212
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr "error d'inicialització close-on-exec sobre /dev/initctl"
+msgstr "s'ha produït un error en inicialitzar close-on-exec a /dev/initctl"
 
 #: login-utils/simpleinit.c:259
 msgid "error running finalprog\n"
-msgstr "error executant finalprog\n"
+msgstr "s'ha produït un error en executar finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
-msgstr "error establint un canvi per a finalprog\n"
+msgstr "s'ha produït un error en bifurcar finalprog\n"
 
 #: login-utils/simpleinit.c:345
 msgid ""
@@ -7344,55 +7064,55 @@ msgstr ""
 
 #: login-utils/simpleinit.c:418
 msgid "lstat of path failed\n"
-msgstr "El `lstat' de la ruta ha fallat\n"
+msgstr "no s'ha pogut executar «lstat» al camí\n"
 
 #: login-utils/simpleinit.c:426
 msgid "stat of path failed\n"
-msgstr "el 'stat' de la ruta ha fallat\n"
+msgstr "no s'ha pogut executar «stat» al camí\n"
 
 #: login-utils/simpleinit.c:434
 msgid "open of directory failed\n"
-msgstr "l'obertura del directori ha fallat.\n"
+msgstr "no s'ha pogut obrir el directori\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
-msgstr "l'establiment del canvi ha fallat\n"
+msgstr "no s'ha pogut bifurcar\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
-msgstr "l'execució (exec) ha fallat\n"
+msgstr "no s'ha pogut executar exec\n"
 
 #: login-utils/simpleinit.c:563
 msgid "cannot open inittab\n"
-msgstr "no es pot obrir inittab\n"
+msgstr "no s'ha pogut obrir inittab\n"
 
 #: login-utils/simpleinit.c:630
 msgid "no TERM or cannot stat tty\n"
-msgstr "sense TERM o no es pot fer stat a la tty\n"
+msgstr "no hi ha TERM o no s'ha pogut executar stat a la tty\n"
 
 #: login-utils/simpleinit.c:936
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr "error aturant el servei: \"%s\""
+msgstr "s'ha produït un error en aturar el servei: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "masses iov (modificar el codi en wall/ttymsg.c)"
+msgstr "massa iov (modifiqueu el codi a wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr "línia d'arguments massa llarga"
+msgstr "la línia d'arguments és massa llarga"
 
 #: login-utils/ttymsg.c:139
 #, c-format
 msgid "cannot fork"
-msgstr "no es pot establir el canvi"
+msgstr "no s'ha pogut bifurcar"
 
 #: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr "canvi (fork): %s"
+msgstr "bifurcació: %s"
 
 #: login-utils/ttymsg.c:171
 #, c-format
@@ -7402,43 +7122,42 @@ msgstr "%s: ERROR DOLENT"
 #: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s: El fitxer password està ocupat.\n"
+msgstr "%s: el fitxer password està ocupat.\n"
 
 #: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: El fitxer group està ocupat.\n"
+msgstr "%s: el fitxer group està ocupat.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: El fitxer %s està ocupat (presenta %s).\n"
+msgstr "%s: el fitxer %s està ocupat (presenta %s).\n"
 
 #: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: No es pot enllaçar %s: %s\n"
+msgstr "%s: no s'ha pogut enllaçar %s: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "%s: No s'ha pogut obtenir el context per a %s"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "%s: No s'ha pogut establir el context per a %s"
 
 #: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
-"%s: No es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
+msgstr "%s: no s'ha pogut desblocar %s: %s (els canvis encara estan a %s)\n"
 
 #: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr "%s: No es pot establir el canvi\n"
+msgstr "%s: No s'ha pogut bifurcar\n"
 
 #: login-utils/vipw.c:276
 #, c-format
@@ -7448,18 +7167,20 @@ msgstr "%s: %s no s'ha modificat\n"
 #: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
-msgstr "%s: No s'ha fet cap canvi\n"
+msgstr "%s: no s'ha fet cap canvi\n"
 
+# shadow paswords -> contrasenyes ocultes (fedora)
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr "Esteu usant grups shadow en aquest sistema.\n"
+msgstr "Aquest sistema utilitza grups ocults.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr "Esteu usant contrasenyes shadow en aquest sistema.\n"
+msgstr "Aquest sistema utilitza contrasenyes ocultes.\n"
 
+# FIXME here we have 'y' and 'n' translated, is it translateable?
 #: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
@@ -7468,91 +7189,84 @@ msgstr "Desitgeu editar %s ara? [s/n] "
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "ús: %s [fitxer]\n"
+msgstr "forma d'ús: %s [fitxer]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: No es pot obrir el fitxer temporal.\n"
+msgstr "%s: no s'ha pogut obrir el fitxer temporal.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Missatge de difusió general des de %s@%s"
+msgstr "Missatge de difusió de %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: No es pot llegir %s; usant l'entrada estàndard.\n"
+msgstr "%s: no es llegirà de %s; s'utilitzarà l'entrada estàndard.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s: No es pot llegir %s.\n"
+msgstr "%s: no s'ha pogut llegir %s.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: No es pot executar stat al fitxer temporal.\n"
+msgstr "%s: no s'ha pogut executar stat al fitxer temporal.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: No es pot llegir el fitxer temporal.\n"
+msgstr "%s: no s'hapogut llegir el fitxer temporal.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "valor de més no permes: Usar 1-12"
+msgstr "el valor del mes és il·legal: utilitzeu 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "valor de més no permes: Usar 1-9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
-msgstr "%s de %d"
+msgstr "%2$d de %1$s"
 
 #: misc-utils/cal.c:780
 #, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "ús: cal [-13smjyV] [[mes] any]\n"
+msgstr "forma d'ús: cal [-13smjyV] [[mes] any]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "ús: %s [+format] [dia mes any]\n"
+msgstr "forma d'ús: %s [+format] [dia mes any]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Dia de Sant Tibb"
 
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "%s: senyal desconegut %s\n"
 
 #: misc-utils/kill.c:270
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: No es pot trobar el proces \"%s\"\n"
+msgstr "%s: no s'ha pogut trobar el procés \"%s\"\n"
 
 #: misc-utils/kill.c:314
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr "%s: Senyal desconeguda %s; senyals vàlides:\n"
+msgstr "%s: senyal desconegut %s; senyals vàlids:\n"
 
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
+msgstr "forma d'ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
@@ -7567,384 +7281,384 @@ msgstr "logger: %s: %s.\n"
 #: misc-utils/logger.c:248
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: Nom facilitat desconegut: %s.\n"
+msgstr "logger: no es coneix el nom de la facilitat: %s.\n"
 
 #: misc-utils/logger.c:260
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: Nom amb prioritat desconeguda: %s.\n"
+msgstr "logger: nom amb prioritat desconeguda: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"ús: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u connector] "
-"[ missatge ... ]\n"
+"forma d'ús: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u sòcol]\n"
+"\t[ missatge ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "ús: look [-dfa] [-t caràcter] cadena [fitxer]\n"
+msgstr "forma d'ús: look [-dfa] [-t caràcter] cadena [fitxer]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr "No es pot obrir %s\n"
+msgstr "No s'ha pogut obrir %s\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr "S'han obtingut %d octets des de %s\n"
+msgstr "S'han obtingut %d octets de %s\n"
 
 #: misc-utils/namei.c:103
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: No es pot obtindre l'actual directori - %s\n"
+msgstr "namei: no s'ha pogut obtenir el directori actual - %s\n"
 
 #: misc-utils/namei.c:116
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: No es pot executar chdir per a %s - %s (%d)\n"
+msgstr "namei: no s'ha pogut executar chdir a %s - %s (%d)\n"
 
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "ús: namei [-mx] nom_ruta [nom_ruta ...]\n"
+msgstr "forma d'ús: namei [-mx] camí [camí ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: No es pot executar chdir al directori arrel\n"
+msgstr "namei: no s'ha pogut executar chdir al directori arrel\n"
 
 #: misc-utils/namei.c:158
 #, c-format
 msgid "namei: could not stat root!\n"
-msgstr "namei: No es pot executar stat al directori arrel\n"
+msgstr "namei: no s'ha pogut executar stat al directori arrel\n"
 
 #: misc-utils/namei.c:172
 #, c-format
 msgid "namei: buf overflow\n"
-msgstr "namei: Desbordament de la memòria intermèdia\n"
+msgstr "namei: desbordament de la memòria intermèdia\n"
 
 #: misc-utils/namei.c:218
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? no es pot executar chdir a %s - %s (%d)\n"
+msgstr " ? no s'ha pogut executar chdir a %s - %s (%d)\n"
 
 #: misc-utils/namei.c:247
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? problemes llegint l'enllaç simbòlic %s - %s (%d)\n"
+msgstr " ? hi ha hagut problemes en llegir l'enllaç simbòlic %s - %s (%d)\n"
 
 #: misc-utils/namei.c:257
 #, c-format
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr "  *** EXCEDIT EL LÍMIT D'ENLLAÇOS SIMBÒLICS DE UNIX ***\n"
+msgstr "  *** S'HA EXCEDIT EL LÍMIT D'ENLLAÇOS SIMBÒLICS DE UNIX ***\n"
 
 #: misc-utils/namei.c:294
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr "namei: Tipus de fitxer desconegut 0%06o en el fitxer %s\n"
+msgstr "namei: tipus de fitxer desconegut 0%06o en el fitxer %s\n"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: Memòria esgotada\n"
+msgstr "%s: no hi ha prou memòria\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: Falla al reanomenar de %s a %s: %s\n"
+msgstr "%s: no s'ha pogut reanomenar %s a %s: %s\n"
 
+# FIXME "from to"????
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
 msgstr "crida: %s des dels fitxers...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
-"Atenció: `%s' és un enllaç.\n"
-"Useu `%s [opcions] %s' si realment desitgeu usar-lo.\n"
-"Script no executat.\n"
+"Avís: «%s» és un enllaç.\n"
+"Useu «%s [opcions] %s» si realment desitgeu usar-lo.\n"
+"No s'ha executat script.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
+msgstr "forma d'ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Script executat, el fitxer és %s\n"
+msgstr "S'ha iniciat l'execució de script, el fitxer és %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
-msgstr "Script executat sobre (%s)"
+msgstr "S'ha iniciat l'execució de script a %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 "\n"
-"Script finalitzat (%s)"
+"S'ha finalitzat l'execució de script a %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "Script finalitzat, el fitxer és %s\n"
+msgstr "S'ha fet la seqüència, el fitxer és %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
-msgstr "openpty ha fallat\n"
+msgstr "no ha estat possible executar openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No queden pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: Argument erroni, usant\n"
+msgstr "%s: Argument erroni, forma d'ús\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
-msgstr "  [ -file nom_fitxer_abocar ]\n"
+msgstr "  [ -file nom_fitxer_bolcat ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq número_freqüència ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "no es pot (des)activar el mode d'estalvi d'energia\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr "Error de klogctl: %s\n"
+msgstr "s'ha produït un error a klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
-msgstr "Error llegint %s\n"
+msgstr "s'ha produït un error en llegir %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
-msgstr "Error escrivint un abocat de pantalla\n"
+msgstr "S'ha produït un error en escriure un bolcat de pantalla\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "no es pot llegir %s, i no es pot efectuar un abocat de ioctl\n"
+msgstr "no s'ha pogut llegir %s, i no s'ha pogut efectuar un bolcat d'ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no està definit.\n"
@@ -7957,27 +7671,27 @@ msgstr "whereis [ -sbmu ] [ -SBM directori ... -f ] nom...\n"
 #: misc-utils/write.c:99
 #, c-format
 msgid "write: can't find your tty's name\n"
-msgstr "write: No es pot trobar el nom de la vostra tty\n"
+msgstr "write: no s'ha pogut trobar el nom de la vostra tty\n"
 
 #: misc-utils/write.c:110
 #, c-format
 msgid "write: you have write permission turned off.\n"
-msgstr "write: Teniu el permís d'escriptura desactivat.\n"
+msgstr "write: teniu el permís d'escriptura desactivat.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s no te una sessió iniciada en %s.\n"
+msgstr "write: %s no ha entrat a %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write: %s té els missatges deshabilitats en %s\n"
+msgstr "write: %s té els missatges inhabilitats a %s\n"
 
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "ús: write usuari [tty]\n"
+msgstr "forma d'ús: write usuari [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
@@ -7987,76 +7701,72 @@ msgstr "write: %s no està connectat\n"
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write: %s té els missatges deshabilitats\n"
+msgstr "write: %s té els missatges inhabilitats\n"
 
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr "write: %s està connectat més d'una vegada; escrivint a %s\n"
+msgstr "write: %s està connectat més d'una vegada; s'està escrivint a %s\n"
 
 #: misc-utils/write.c:313
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr "Missatge des de %s@%s (com a %s) el %s a les %s ..."
+msgstr "Missatge de %s@%s (com a %s) el %s a les %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Missatge des de %s@%s el %s a les %s ..."
+msgstr "Missatge de %s@%s el %s a les %s ..."
 
 #: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr "advertència: Error al llegir %s: %s"
+msgstr "avís: s'ha produït un error en llegir %s: %s"
 
 #: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "advertència: No es pot obrir %s: %s"
+msgstr "avís: no s'ha pogut obrir %s: %s"
 
 #: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount: No es pot obrir %s; en el seu lloc s'usarà %s\n"
+msgstr "mount: no s'ha pogut obrir %s; s'usarà %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot crear el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
+"no s'ha pogut crear el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot enllaçar el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
-"modificar aquest valor)"
+"no s'ha pogut enllaçar el fitxer de blocat %s: %s (useu el senyalador -n per "
+"a modificar aquest valor)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
-"no es pot obrir el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
+"no s'ha pogut obrir el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
 #: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "No es pot blocar al fitxer de blocat %s: %s\n"
+msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n"
 
 #: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "no es pot blocar al fitxer de blocat %s: %s"
+msgstr "no s'ha pogut blocar al fitxer de blocat %s: %s"
 
 #: mount/fstab.c:540
 msgid "timed out"
-msgstr "temps d'espera excedit"
+msgstr "s'ha exhaurit el temps d'espera"
 
 #: mount/fstab.c:547
 #, c-format
@@ -8064,33 +7774,33 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"No es pot crear l'enllaç %s\n"
-"Potser hi hagi un fitxer de blocat obsolet?\n"
+"No s'ha pogut crear l'enllaç %s\n"
+"Potser hi ha un fitxer de blocat obsolet?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "no es pot obrir %s (%s) - mtab no actualitzat"
+msgstr "no s'ha pogut obrir %s (%s) - no s'ha actualitzat mtab"
 
 #: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
-msgstr "error escrivint %s: %s"
+msgstr "s'ha produït un error en escriure %s: %s"
 
 #: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr "error al canviar el mode de %s: %s\n"
+msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
 #: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "no es pot reanomenar %s per %s: %s\n"
+msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
 #: mount/lomount.c:73
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop: No es pot obrir el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
 #: mount/lomount.c:89
 #, c-format
@@ -8100,12 +7810,12 @@ msgstr ", desplaçament %lld"
 #: mount/lomount.c:92
 #, c-format
 msgid ", sizelimit %lld"
-msgstr ", mida límit %lld"
+msgstr ", límit de mida %lld"
 
 #: mount/lomount.c:100
 #, c-format
 msgid ", encryption %s (type %d)"
-msgstr ", xifrat %s (tipus %d)"
+msgstr ", xifratge %s (tipus %d)"
 
 #: mount/lomount.c:114
 #, c-format
@@ -8115,65 +7825,65 @@ msgstr ", desplaçament %d"
 #: mount/lomount.c:117
 #, c-format
 msgid ", encryption type %d\n"
-msgstr ", tipus de xifrat %d\n"
+msgstr ", tipus de xifratge %d\n"
 
 #: mount/lomount.c:126
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: No es pot obtindre informació sobre el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: No es pot trobar cap dispositiu /dev/loop#"
+msgstr "%s: no s'ha trobat cap dispositiu /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: no teniu permisos per llegir /dev/loop#"
 
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: No es pot trobar cap dispositiu loop. Podria ser que el nucli no el\n"
-"       reconeguès?. (Si es això, recompileu o feu `modprobe loop')."
+"%s: No s'ha pogut trobar cap dispositiu loop. És possible que aquest nucli\n"
+"       no reconegui els dispositius loop? (Si es així, recompileu-lo o feu\n"
+"       «modprobe loop».)"
 
 #: mount/lomount.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: No es pot trobar cap dispositiu loop lliure"
+msgstr "%s: no s'ha trobat cap dispositiu loop lliure"
 
 #: mount/lomount.c:287
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr "No es pot blocar en memòria, sortint.\n"
+msgstr "No s'ha pogut blocar en memòria, s'està sortint.\n"
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): Correcte\n"
+msgstr "set_loop(%s,%s,%llu): èxit\n"
 
 #: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: No es pot suprimir el dispositiu %s: %s\n"
+msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 
 #: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): Correcte\n"
+msgstr "del_loop(%s): èxit\n"
 
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n"
+msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8181,10 +7891,11 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"ús:\n"
-"  %s dispositiu_loop                                 # dona informació\n"
-"  %s -d dispositiu_loop                              # elimina\n"
-"  %s [ -e xifrat ] [ -o desplaça. ] disp_loop fitxer # configura\n"
+"forma d'ús:\n"
+"  %s dispositiu_loop                                   # dona informació\n"
+"  %s -d dispositiu_loop                                # elimina\n"
+"  %s -f                                                # cerca no usats\n"
+"  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
@@ -8195,380 +7906,371 @@ msgstr "no hi ha prou memòria"
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
-"Quan es va compilar el suport loop no estava disponible. Si us plau, "
-"recompileu.\n"
+"Quan es va compilar el suport per a loop no estava disponible. Recompileu-"
+"lo.\n"
 
 #: mount/mntent.c:166
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr "[mntent]: Atenció: No hi ha cap nova línia al final de %s\n"
+msgstr "[mntent]: avís: no hi ha cap nova línia al final de %s\n"
 
 #: mount/mntent.c:217
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]: La línia %d de %s és incorrecta%s\n"
+msgstr "[mntent]: la línia %d de %s no és correcta%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
-msgstr "; la resta del fitxer s'ignorarà"
+msgstr "; s'ignorarà la resta del fitxer"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: L'etiqueta %s apareix en %s i %s\n"
+msgstr "%s: error: l'etiqueta %s apareix a %s i %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: Muntant %s per %s\n"
+msgstr "mount: es muntarà %s per UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: Muntant %s per %s\n"
+msgstr "mount: es muntarà %s per etiqueta\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount : No es pot obrir %s, donat que la conversió UUID i LABEL no s'ha "
-"fet.\n"
+"%s: no s'ha pogut obrir %s, ja que no es pot fer la conversió UUID i LABEL.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID incorrecte"
+msgstr "%s: UUID erroni"
 
 #: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: Segons mtab, %s ja està muntat en %s"
+msgstr "mount: segons mtab, %s ja està muntat a %s"
 
 #: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: Segons mtab, %s està muntat en %s"
+msgstr "mount: segons mtab, %s està muntat a %s"
 
 #: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount: No es pot obrir %s per a escriptura: %s"
+msgstr "mount: no s'ha pogut obrir %s per a escriptura: %s"
 
 #: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr "mount: Error escrivint %s: %s"
+msgstr "mount: s'ha produït un error en escriure %s: %s"
 
 #: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount: Error al canviar el mode de %s: %s"
+msgstr "mount: s'ha produït un error en canviar el mode de %s: %s"
 
 #: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s sembla espai d'intercanvi - no muntat"
+msgstr "%s sembla espai d'intercanvi - no s'ha muntat"
 
 #: mount/mount.c:570
 msgid "mount failed"
-msgstr "el muntatge ha fallat"
+msgstr "no s'ha estat possible muntar"
 
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: Sols l'usuari root pot muntar %s en %s"
+msgstr "mount: només l'usuari root pot muntar %s a %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
-msgstr "mount: El dispositiu loop està especificat dues vegades"
+msgstr "mount: el dispositiu loop està especificat dues vegades"
 
 #: mount/mount.c:605
 msgid "mount: type specified twice"
-msgstr "mount: El tipus està especificat dues vegades"
+msgstr "mount: el tipus està especificat dues vegades"
 
 #: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount: Saltant-se la configuració d'un dispositiu loop\n"
+msgstr "mount: s'està ometent la configuració d'un dispositiu loop\n"
 
 #: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: S'usarà el dispositiu loop %s\n"
+msgstr "mount: s'usarà el dispositiu loop %s\n"
 
 #: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: Falla al configurar el dispositiu loop\n"
+msgstr "mount: no ha estat possible configurar el dispositiu loop\n"
 
 #: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
-msgstr "mount: Configuració correcta del dispositiu loop\n"
+msgstr "mount: s'ha configurat el dispositiu loop amb èxit\n"
 
 #: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount: No es pot obrir %s: %s"
+msgstr "mount: no s'ha pogut obrir %s: %s"
 
 #: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
-msgstr "mount: L'argument per a -p o --pass-fd hauria de ser un número"
+msgstr "mount: l'argument a -p o --pass-fd ha de ser un nombre"
 
 #: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: No es pot obrir %s per a establir-ne la velocitat"
+msgstr "mount: no s'ha pogut obrir %s per establir-ne la velocitat"
 
 #: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: No es pot establir la velocitat de: %s"
+msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount: No es pot establir el canvi: %s"
+msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: Aquesta versió ha estat compilada sense suport per al tipus `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount : Falla al muntar la versió 4 de nfs, escolliu la 3...\n"
+msgstr ""
+"mount : no ha estat possible muntar la versió 4 de nfs, s'està intentant "
+"3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: No es pot determinar el tipus del sistema de fitxers i no n'heu "
+"mount: no s'ha pogut determinar el tipus de sistema de fitxers i no n'heu "
 "especificat cap"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: Haureu d'especificar el tipus del sistema de fitxers"
+msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
-msgstr "mount: El muntatge ha fallat"
+msgstr "mount: no ha estat possible muntar"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: El punt de muntatge %s no és un directori"
+msgstr "mount: el punt de muntatge %s no és un directori"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
-msgstr "mount: Permís denegat"
+msgstr "mount: s'ha denegat el permís"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: Haureu de ser un superusuari per a usar mount"
+msgstr "mount: haureu de ser un superusuari per a usar mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s està ocupat"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ja està muntat"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ja està muntat o %s està ocupat"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr "mount: El punt de muntatge %s no existeix"
+msgstr "mount: el punt de muntatge %s no existeix"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: El punt de muntatge %s és un enllaç simbòlic sense destí"
+msgstr "mount: el punt de muntatge %s és un enllaç simbòlic sense destí"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr "mount: El dispositiu especial %s no existeix"
+msgstr "mount: el dispositiu especial %s no existeix"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
-"mount: El dispositiu especial %s no existeix\n"
-"       (una ruta prefixada no és un directori)\n"
+"mount: el dispositiu especial %s no existeix\n"
+"       (un prefix de camí no és un directori)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s encara no està muntat o una opció és incorrecta"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
-"mount: Tipus del sistema de fitxers incorrecte, opció incorrecta,\n"
-"       superbloc incorrecte en %s o masses sistemes de fitxers muntats"
+"mount: el tipus de sistema de fitxers o és correcte, la opció no és "
+"correcta,\n"
+"       superbloc incorrecte a %s, manca la pàgina de codis o algun altre "
+"error"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"        (podria ser que aquest fos el dispositiu IDE on utilitzeu ide-scsi\n"
+"        de manera que sr0 o sda o siguin necessaris?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"        (no esteu intentant muntar una partició estesa,\n"
+"        en comptes d'alguna partició lògica de dins?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"        En alguns casos, es pot trobar informació útil a syslog,\n"
+"        proveu dmesg | tail o així\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
-msgstr "taula de dispositius muntats completa"
+msgstr "la taula de dispositius muntats està plena"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr "mount: %s: No es pot llegir el superbloc"
+msgstr "mount: %s: no s'ha pogut llegir el superbloc"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s: Dispositiu desconegut"
+msgstr "umount: %s: dispositiu desconegut"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l   Llistar els tipus de sistemes de fitxers coneguts"
+msgstr "mount: no es reconeix el sitema de fitxers «%s»"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: Probablement volíeu referir-vos a %s"
+msgstr "mount: probablement volíeu dir %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: Potser volíeu referir-vos a iso9660 ?"
+msgstr "mount: potser volíeu dir «iso9660»?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: Potser volíeu referir-vos a iso9660 ?"
+msgstr "mount: potser volíeu dir «vfat»?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: %s té un número de dispositiu incorrecte o el tipus del sistema de "
-"fitxers %s no està suportat"
+"mount: %s té un número de dispositiu incorrecte o el tipus de sistema de "
+"fitxers %s no està implementat"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s no és un dispositiu de blocs, i stat falla?"
+msgstr "mount: %s no és cap dispositiu de blocs, i stat falla?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: El nucli no reconeix %s com a un dispositiu de blocs\n"
-"       (potser fent `insmod controlador'?)"
+"mount: el nucli no reconeix %s com a dispositiu de blocs\n"
+"       (potser fent «insmod controlador»?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no és un dispositiu de blocs (proveu amb `-o loop')"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no és un dispositiu de blocs"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no és un dispositiu de blocs vàlid"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositiu de blocs "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount : No es pot muntar %s%s com a sols lectura"
+msgstr "mount : no s'ha pogut muntar %s%s com a només de lectura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount : %s%s està protegit contra escriptura però se li ha donat l'etiqueta "
-"explicita `-w'"
+"mount : %s%s està protegit contra escriptura però se li ha donat el "
+"senyalador explícit «-w»"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
-"mount: %s%s està protegit contra escriptura; es muntarà en sols lectura"
+"mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: No s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n"
+"mount: no s'ha especificat cap tipus; s'assumirà nfs per als dos punts\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: No s'ha especificat cap tipus - s'assumeix smbfs per al prefix //\n"
+"mount: no s'ha especificat cap tipus; s'assumirà smb a causa del prefix //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: Executant en segon plà \"%s\"\n"
+msgstr "mount: s'està executant «%s» en segon plà\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount: Abandonant \"%s\"\n"
+msgstr "mount: s'està abandonant «%s»\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr "mount: %s ja està muntat en %s\n"
+msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8593,74 +8295,78 @@ msgid ""
 "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"Ús: mount -V                 : mostra la versió\n"
-"    mount -h                 : mostra aquesta ajuda\n"
-"    mount                    : llista els sistemes de fitxers muntats\n"
-"    mount -l                 : ídem, incloguen les etiquetes de volumen\n"
-"Fins aquí la part informativa. Seguim amb el muntatge.\n"
-"El comandament és `mount [-t tipus_sis._fitx.] alguna_cosa lloc'.\n"
-"Els detalls en /etc/fstab es poden ometre.\n"
-"    mount -a [-t|-O]         : munta tot l'indicat en /etc/fstab\n"
-"    mount dispositiu         : munta el dispositiu en el lloc conegut\n"
-"    mount directori          : munta el dispositiu conegut aquí\n"
-"    mount -t tipus disp dir  : comandament mount ordinari\n"
+"forma d'ús: mount -V            : mostra la versió\n"
+"            mount -h            : mostra aquesta ajuda\n"
+"            mount               : llista els sistemes de fitxers muntats\n"
+"            mount -l            : ídem, incloen les etiquetes de volum\n"
+"Fins aquí la part informativa. Es continua amb el muntatge.\n"
+"L'ordre és «mount [-t tipus_sf] alguna_cosa lloc».\n"
+"Els detalls inclosos en /etc/fstab es poden ometre.\n"
+"            mount -a [-t|-O]    : munta tot el que s'ha indicat\n"
+"                                  en /etc/fstab\n"
+"            mount dispositiu    : munta el dispositiu en el lloc conegut\n"
+"            mount directori     : munta el dispositiu conegut aquí\n"
+"            mount -t tipus disp dir : ordre mount ordinaria\n"
 "Tingueu en compte que no muntareu realment un dispositiu, sinó més\n"
 "aviat el seu sistema de fitxers (el tipus donat). També es pot muntar\n"
 "un arbre de directoris ja visible en un altre lloc\n"
-"    mount --bind dir_antic dir_nou\n"
+"            mount --bind dir_antic dir_nou\n"
 "o moure un subarbre:\n"
-"    mount --move dir_antic dir_nou\n"
+"            mount --move dir_antic dir_nou\n"
 "Es pot donar un dispositiu mitjançant el nom, posem-hi /dev/hda1 o\n"
 "/dev/cdrom o mitjançant l'etiqueta, usant -L etiqueta o mitjançant uuid,\n"
-"usant -U uuid. D'altres opcions: [-nfFrsvw] [-o opcions].\n"
-"Per a més detalls, escriviu man 8 mount.\n"
+"usant -U uuid.\n"
+"Altres opcions: [-nfFrsvw] [-o opcions] [-p dfcontrasenya].\n"
+"Per a més detalls, consulteu «man 8 mount».\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: Sols l'usuari root pot fer això"
+msgstr "mount: només l'usuari root pot fer això"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: No s'ha trobat %s; s'està creant...\n"
+msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: No troba aquesta partició"
+msgstr "mount: no s'ha trobat aquesta partició"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: Muntant %s\n"
+msgstr "mount: s'està muntant %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "no s'ha muntat res"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: No es pot trobar %s en %s"
+msgstr "mount: no s'ha pogut trobar %s a %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: No es pot trobar %s en %s o %s"
+msgstr "mount: no s'ha pogut trobar %s a %s o %s"
 
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: Error a l'intentar endevinar el tipus del sistema de fitxers\n"
+msgstr ""
+"mount: s'ha produït un error en intentar endevinar el tipus de sistema de "
+"fitxers\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: No heu especificat un tipus de sistema de fitxers per a %s\n"
+msgstr "mount: no heu especificat cap tipus de sistema de fitxers per a %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       Es provarà amb tots els tipus indicats en %s o %s\n"
+msgstr "       Es provarà amb tots els tipus indicats a %s o %s\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
@@ -8675,322 +8381,317 @@ msgstr "       Provaré amb el tipus %s\n"
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
-msgstr "Provant amb %s\n"
+msgstr "S'està provant amb %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: Argument excessivament llarg màquina:dir\n"
+msgstr "mount: argument excessivament llarg host:dir\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: Atenció: Múltiples noms de màquina no suportats\n"
+msgstr "mount: avís: múltiples noms d'ordinador no està implementat\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: El directori a muntar no té el format màquina:dir\n"
+msgstr "mount: el directori a muntar no té el format ordinador:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount: No es pot obtindre l'adreça per a %s\n"
+msgstr "mount: no s'ha pogut obtenir l'adreça per a %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
-msgstr "mount: Valor incorrecte per a hp->h_length\n"
+msgstr "mount: valor incorrecte per a hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
-msgstr "mount: Argument d'opció excessivament llarg\n"
+msgstr "mount: l'argument de l'opció és excessivament llarg\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Atenció: Opció desconeguda proto=\n"
+msgstr "Avís: Opció desconeguda proto=\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Atenció: L'opció namlen no està suportada.\n"
+msgstr "Avís: L'opció namlen no està implementada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
-msgstr "paràmetre de muntatge de nfs desconegut: %s=%d\n"
+msgstr "no es reconeix el paràmetre de muntatge de nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Atenció: L'opció nolock no està suportada.\n"
+msgstr "Avís: l'opció nolock no està implementada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr "Opció de muntatge de nfs desconeguda: %s%s\n"
+msgstr "no es creconeix l'opció de muntatge de nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
-msgstr "mount: Valor incorrecte per a hp->h_length?\n"
+msgstr "mount: valor incorrecte per a hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
-msgstr "NFS sobre TCP no està suportat.\n"
+msgstr "NFS sobre TCP no està implementat.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "connector nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
-msgstr "el servidor nfs informa de que el servei no està disponible"
+msgstr "el servidor nfs informa que el servei no està disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "s'ha usat l'assignador de ports per a trobar el port NFS\n"
+msgstr "s'ha usat l'assignador de ports per trobar el port NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "usant el port %d per al dimoni de nfs\n"
+msgstr "s'està usant el port %d per al dimoni de nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "connexió nfs"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr "valor de retorn de nfs status desconegut: %d"
+msgstr "no es reconeix el valor de retorn de l'estat de nfs: %d"
 
 #: mount/sundries.c:26
 msgid "bug in xstrndup call"
-msgstr "error en la crida xstrndup"
+msgstr "s'ha produït un error en la crida xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"ús:   %s [-hV]\n"
-"      %s -a [-e] [-v]\n"
-"      %s [-v] [-p prioritat] especial ...\n"
-"      %s [-s]\n"
+"forma d'ús: %s [-hV]\n"
+"            %s -a [-e] [-v]\n"
+"            %s [-v] [-p prioritat] especial|ETIQUETA=nom_volum...\n"
+"            %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"ús:  %s [-hV]\n"
-"     %s -a [-v]\n"
-"     %s [-v] especial ...\n"
+"forma d'ús: %s [-hV]\n"
+"            %s -a [-v]\n"
+"            %s [-v] especial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
-msgstr "%s en %s\n"
+msgstr "%s a %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: No es pot trobar \"_stext\" en %s\n"
+msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: No es pot executar stat per a %s: %s\n"
+msgstr "%s: no s'ha pogut fer stat en %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: Atenció: %s teniu els permisos %04o que no son segurs, es "
-"suggereixen %04o\n"
+"%s: avís: %s té els permisos %04o que són insegurs, se suggereix %04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Saltant-se el fitxer %s - sembla que està a troços.\n"
+msgstr "%s: S'està ometent el fitxer %s - sembla que té forats.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
-msgstr "No és el superusuari.\n"
+msgstr "No sou el superusuari.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: No es pot obrir %s: %s\n"
+msgstr "%s: no s'ha pogut obrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: Està compilat sense suporte per a -f\n"
+msgstr "umount: està compilat sense suport per a -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: No es pot establir el canvi: %s"
+msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "màquina: %s, directori: %s\n"
+msgstr "host: %s, directori: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr "umount: No es pot obtindre l'adreça per a %s\n"
+msgstr "umount: no s'ha pogut obtenir l'adreça per a %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
-msgstr "umount: Valor incorrecte per a hostp->h_length\n"
+msgstr "umount: valor incorrecte per a hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr "umount: %s: Dispositiu de blocs no vàlid"
+msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s: No està muntat"
+msgstr "umount: %s: no està muntat"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: No es pot escriure el superbloc"
+msgstr "umount: %s: no s'ha pogut escriure el superbloc"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr "umount: %s: Dispositiu ocupat"
+msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount: %s: No s'ha trobat"
+msgstr "umount: %s: no s'ha trobat"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: Haureu de ser superusuari per a usar umount"
+msgstr "umount: %s: haureu de ser superusuari per poder usar umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount: %s: Dispositius de blocs no permesos en el sistema de fitxers"
+msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr "no es pot executar umount en %s - es provarà amb %s\n"
+msgstr "no s'ha pogut executar umount en %s - es provarà amb %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr "umount: %s ocupat - tornat a muntar en sols lectura\n"
+msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: No es pot tornar a muntar %s en sols lectura\n"
+msgstr "umount: no s'ha pogut tornar a muntar %s de només lectura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
-"umount: No es pot trobar la llista dels sistemes de fitxers per a desmuntar"
+"umount: no s'ha pogut trobar la llista dels sistemes de fitxers a desmuntar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Ús: umount [-hV]\n"
-"    umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals] [-O "
-"opcions]\n"
-"    umount [-f] [-r] [-n] [-v] especial | node...\n"
+"Forma d'ús: umount [-hV]\n"
+"            umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals]\n"
+"                   [-O opcions]\n"
+"            umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "No es pot obrir"
+msgstr "No s'ha pogut desmuntar «»\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "S'intenta desmuntar %s\n"
+msgstr "S'està intentant desmuntar %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "No es pot trobar a %s en mtab\n"
+msgstr "No s'ha pogut trobar %s a mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: Sembla que %s ha estat muntat diverses vegades"
+msgstr "umount: sembla que %s s'ha muntat diverses vegades"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s no està en el fstab (i no sou el root)"
+msgstr "umount: %s no està al fstab (i no sou el root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount: El muntatge de %s no concorda amb el fstab"
+msgstr "umount: el muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:637
-#, fuzzy, c-format
+#: mount/umount.c:630
+#, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: Sols el root pot desmuntar %s des de %s"
+msgstr "umount: només %s pot desmuntar %s des de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr "umount: Sols el root pot fer això"
+msgstr "umount: només el root pot fer això"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -9001,7 +8702,7 @@ msgstr ""
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Ús: ctrlaltdel maquin.|progr.\n"
+msgstr "Forma d'ús: ctrlaltdel maquin.|progr.\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -9027,27 +8728,27 @@ msgstr ""
 #: sys-utils/cytune.c:190
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Valor d'interval no vàlid: %s\n"
+msgstr "Valor d'interval invàlid: %s\n"
 
 #: sys-utils/cytune.c:198
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr "Valor establert no vàlid: %s\n"
+msgstr "Valor establert invàlid: %s\n"
 
 #: sys-utils/cytune.c:206
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr "Valor per defecte no vàlid: %s\n"
+msgstr "Valor per defecte invàlid: %s\n"
 
 #: sys-utils/cytune.c:214
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr "Valor de l'hora establerta no vàlid: %s\n"
+msgstr "Valor de l'hora establerta invàlid: %s\n"
 
 #: sys-utils/cytune.c:222
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr "Valor de l'hora per defecte no vàlid: %s\n"
+msgstr "Valor de l'hora per defecte invàlid: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
@@ -9055,34 +8756,34 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Ús: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) [-"
-"g|-G] fitxer [fitxer...]\n"
+"Forma d'ús: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T "
+"valor]) [-g|-G] fitxer [fitxer...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr "No es pot obrir %s: %s\n"
+msgstr "No s'ha pogut obrir %s: %s\n"
 
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "No es pot establir %s al llindar %d: %s\n"
+msgstr "No s'ha pogut establir %s al llindar %d: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "No es pot establir %s al llindar de l'hora %d: %s\n"
+msgstr "No s'ha pogut establir %s al llindar de l'hora %d: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr "No es pot obtindre el llindar per a %s: %s\n"
+msgstr "No s'ha pogut obtenir el llindar per a %s: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+msgstr "No s'ha pogut obtenir el temps d'espera per a %s: %s\n"
 
 #: sys-utils/cytune.c:307
 #, c-format
@@ -9096,16 +8797,16 @@ msgstr "%s: %ld el llindar i %ld el temps d'espera per defecte\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr "No es pot determinar el manegador de senyals"
+msgstr "No s'ha pogut determinar el gestor de senyals"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr "gettimeofday ha fallat"
+msgstr "no ha estat possible executar gettimeofday"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "No es pot emetre CYGETMON en %s: %s\n"
+msgstr "No s'ha pogut emetre CYGETMON a %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9136,43 +8837,45 @@ msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "Ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
+msgstr "Forma d'ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "flock: es desconeix l'opció, s'està avortant.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Forma d'ús: flock [--shared | --timeout=segons] nom_fitxer ordre {arg "
+"arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr "id no vàlid : %s\n"
+msgstr "id invàlid : %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "Impossible suprimir l'id %s (%s)\n"
+msgstr "no s'ha pogut suprimir l'id %s (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "us desaprobat: %s {shm | msg | sem} id ...\n"
+msgstr "ús desaprovat: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr "tipus de la font desconegut: %s\n"
+msgstr "no es reconeix el tipus de la font: %s\n"
 
 #: sys-utils/ipcrm.c:130
 #, c-format
 msgid "resource(s) deleted\n"
-msgstr "font(s) suprimida(es)\n"
+msgstr "fonts suprimides\n"
 
 #: sys-utils/ipcrm.c:140
 #, c-format
@@ -9180,8 +8883,8 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
-"ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
-"    [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+"forma d'ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"               [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
@@ -9195,15 +8898,15 @@ msgstr "%s: clau il·legal (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
 msgid "permission denied for key"
-msgstr "permisos denegats per a la clau"
+msgstr "s'ha denegat el permís per a la clau"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr "la clau ja ha estat treta"
+msgstr "la clau ja s'havia suprimit"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
 msgid "invalid key"
-msgstr "clau no vàlida"
+msgstr "clau invàlida"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
@@ -9215,11 +8918,11 @@ msgstr "permisos denegats per l'identificador"
 
 #: sys-utils/ipcrm.c:246
 msgid "invalid id"
-msgstr "identificador no vàlid"
+msgstr "identificador invàlid"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr "l'identificador ja ha estat tret"
+msgstr "l'identificador ja s'havia suprimit"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
@@ -9238,7 +8941,7 @@ msgstr "%s: argument desconegut: %s\n"
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "ús: %s -asmq -tclup \n"
+msgstr "forma d'ús: %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -9248,14 +8951,14 @@ msgstr "      %s [-s -m -q] -i identificador\n"
 #: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s -h for help.\n"
-msgstr "      %s -h per a l'ajuda.\n"
+msgstr "      %s -h per a ajuda.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
 msgid ""
 "%s provides information on ipc facilities for which you have read access.\n"
 msgstr ""
-"%s proveeix d'informació sobre els recursos ipc per als quals teniu accés de "
+"%s proporciona informació sobre els recursos ipc als que teniu accés de "
 "lectura.\n"
 
 #: sys-utils/ipcs.c:131
@@ -9266,8 +8969,8 @@ msgid ""
 "\t-q : messages\n"
 msgstr ""
 "Especificació dels recursos:\n"
-"\t-m : Memòria compartida\n"
-"\t-q : Missatges\n"
+"\t-m : memòria compartida\n"
+"\t-q : missatges\n"
 
 #: sys-utils/ipcs.c:132
 #, c-format
@@ -9275,8 +8978,8 @@ msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
-"\t-s : Semàfors\n"
-"\t-a : Tot (per defecte)\n"
+"\t-s : semàfors\n"
+"\t-a : tot (per defecte)\n"
 
 #: sys-utils/ipcs.c:133
 #, c-format
@@ -9287,9 +8990,9 @@ msgid ""
 "\t-c : creator\n"
 msgstr ""
 "Format de l'eixida:\n"
-"\t-t : Temps\n"
-"\t-p : Pid\n"
-"\t-c : Creador\n"
+"\t-t : temps\n"
+"\t-p : pid\n"
+"\t-c : creador\n"
 
 #: sys-utils/ipcs.c:134
 #, c-format
@@ -9297,47 +9000,45 @@ msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
-"\t-l : Límits\n"
-"\t-u : Resumen\n"
+"\t-l : límits\n"
+"\t-u : resum\n"
 
 #: sys-utils/ipcs.c:135
 #, c-format
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
-"-i id [-s -q -m] : Detalls sobre els recursos identificats per "
+"-i id [-s -q -m] : detalls sobre els recursos identificats per "
 "l'identificador\n"
 
 #: sys-utils/ipcs.c:267
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr "nucli no configurat per a memòria compartida\n"
+msgstr "el nucli no està configurat per a memòria compartida\n"
 
 #: sys-utils/ipcs.c:273
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Límits de la memòria compartida --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "màx. nombre de segments = %ld\n"
+msgstr "màx. nombre de segments = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "mida màx. del segment (koctets) = %ld\n"
+msgstr "mida màx. del segment (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "total màx. memòria compartida (koctets) = %ld\n"
+msgstr "total màx. memòria compartida (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "mida mín. segment (octets) = %ld\n"
+msgstr "mida mín. segment (octets) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9592,7 +9293,7 @@ msgstr "el nucli no està configurat per a cues de missatges\n"
 #: sys-utils/ipcs.c:504
 #, c-format
 msgid "------ Messages: Limits --------\n"
-msgstr "------ Missatges: Límits -------\n"
+msgstr "------ Missatges: límits -------\n"
 
 #: sys-utils/ipcs.c:505
 #, c-format
@@ -9612,7 +9313,7 @@ msgstr "mida màx. per defecte de la cua (octets) = %d\n"
 #: sys-utils/ipcs.c:511
 #, c-format
 msgid "------ Messages: Status --------\n"
-msgstr "------ Missatges: Estat --------\n"
+msgstr "------ Missatges: estat --------\n"
 
 #: sys-utils/ipcs.c:512
 #, c-format
@@ -9632,7 +9333,7 @@ msgstr "espai emprat = %d octets\n"
 #: sys-utils/ipcs.c:518
 #, c-format
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr "--- Cues de missatges: Creadors/propietaris ---\n"
+msgstr "--- Cues de missatges: creadors/propietaris ---\n"
 
 #: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
 #: sys-utils/ipcs.c:538
@@ -9649,17 +9350,20 @@ msgstr "--- Temps tramesa./recep./modific. cues de missatges ---\n"
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
 msgstr "%-8s %-10s  %-20s %-20s %-20s\n"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "send"
-msgstr "tramesa"
+msgstr "envia"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "recv"
-msgstr "recepció"
+msgstr "rep"
 
+# FIXME
 #: sys-utils/ipcs.c:526
 msgid "change"
-msgstr "modificació"
+msgstr "modifica"
 
 #: sys-utils/ipcs.c:530
 #, c-format
@@ -9817,22 +9521,23 @@ msgstr "pid"
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
-"ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR [ DESPLAÇAMENT ] ] ]"
+"forma d'ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR "
+"[ DESPLAÇAMENT ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, etc.) mostra a l'actual dispositiu ROOT"
+"  rdev /dev/fd0  (o rdev /linux, etc.) mostra el dispositiu ROOT actual"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT en /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT a /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
-"  rdev -R /dev/fd0 1              estableix el ROOTFLAGS (estat de sols "
+"  rdev -R /dev/fd0 1              estableix els ROOTFLAGS (estat de només "
 "lectura)"
 
 #: sys-utils/rdev.c:73
@@ -9864,13 +9569,13 @@ msgstr "  vidmode ...                     el mateix que rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Nota: Els modes de vídeo són: -3=Ask, -2=Extended, -1=NormalVga,\n"
+"Nota: els modes de vídeo són: -3=Pregunta, -2=Estès, -1=NormalVga,\n"
 "                              1=tecla1, 2=tecla2, ... "
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
-"      usar -R 1 per a muntar l'arrel a sols lectura; -R 0 a lectura/"
+"      useu -R 1 per muntar l'arrel de només lectura; -R 0 per a lectura/"
 "escriptura."
 
 #: sys-utils/rdev.c:247
@@ -9880,10 +9585,10 @@ msgstr "falta una coma"
 #: sys-utils/readprofile.c:72
 #, c-format
 msgid "out of memory"
-msgstr "memòria esgotada"
+msgstr "no hi ha prou memòria"
 
 #: sys-utils/readprofile.c:118
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9899,17 +9604,18 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Ús: \"%s [opcions]\n"
-"\t -m <fitxer_mapa> (Valor predeterminat = \"%s\" i \t\t\t\t  \"%s\")\n"
-"\t -p <fitxer>  (Valor predeterminat = \"%s\")\n"
-"\t -M <mult>    Estableix el multiplicador del perfil en <mult>\n"
-"\t -i           Sols mostra la informació sobre el pas de mostreig\n"
-"\t -v           Mostra dades detallades\n"
-"\t -a           Mostra tots els símbols, fins i tot si el nombre és 0\n"
-"\t -b           Mostra els histogrames individuals dels comptadors\n"
-"\t -r           Restableix tots els comptadors (sols el root)\n"
-"\t -n           Desactiva la detecció auto. de l'ordre dels octets\n"
-"\t -V           Mostra la versió i surt\n"
+"%s: Forma d'ús: \"%s [opcions]\n"
+"\t -m <fitxer_mapa> (valors predeterminats = «%s» i\n"
+"\t\t\t\t  «%s»)\n"
+"\t -p <fitxer>  (valor predeterminat = «%s»)\n"
+"\t -M <mult>    estableix el multiplicador del perfil en <mult>\n"
+"\t -i           només mostra la informació sobre el pas de mostreig\n"
+"\t -v           mostra dades detallades\n"
+"\t -a           mostra tots els símbols, fins i tot si el compte és 0\n"
+"\t -b           mostra els histogrames individuals dels comptadors\n"
+"\t -r           restableix tots els comptadors (només el root)\n"
+"\t -n           inhabilita la detecció automàtica de l'ordre dels octets\n"
+"\t -V           mostra la versió i surt\n"
 
 #: sys-utils/readprofile.c:197
 #, c-format
@@ -9924,12 +9630,12 @@ msgstr "Passa de probes: %i\n"
 #: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): Línia del mapa incorrecta\n"
+msgstr "%s: %s(%i): línia del mapa incorrecta\n"
 
 #: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: No es pot trobar \"_stext\" en %s\n"
+msgstr "%s: no s'ha pogut trobar \"_stext\" a %s\n"
 
 #: sys-utils/readprofile.c:343
 #, c-format
@@ -9945,17 +9651,18 @@ msgstr "total"
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"ús: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
+"forma d'ús: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"usuaris ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice: %s: Usuari desconegut\n"
+msgstr "renice: %s: usuari desconegut\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr "renice: %s: Valor incorrecte\n"
+msgstr "renice: %s: valor incorrecte\n"
 
 #: sys-utils/renice.c:123 sys-utils/renice.c:135
 msgid "getpriority"
@@ -9968,12 +9675,12 @@ msgstr "setpriority"
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d: Prioritat antiga %d, nova prioritat %d\n"
+msgstr "%d: prioritat antiga %d, nova prioritat %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "ús: %s programa [arg ...]\n"
+msgstr "forma d'ús: %s programa [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9982,9 +9689,11 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"ús: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w <ESPERA> |\n"
-"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-"          -T [on|off] ]\n"
+"Forma d'ús: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w "
+"<ESPERA> |\n"
+"               -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s "
+"| \n"
+"               -T [on|off] ]\n"
 
 #: sys-utils/tunelp.c:91
 msgid "malloc error"
@@ -9993,7 +9702,7 @@ msgstr "error en l'assignació de memòria"
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr "%s: Valor incorrecte\n"
+msgstr "%s: valor incorrecte\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
@@ -10013,7 +9722,7 @@ msgstr ", ocupat"
 #: sys-utils/tunelp.c:265
 #, c-format
 msgid ", ready"
-msgstr ", llest"
+msgstr ", a punt"
 
 #: sys-utils/tunelp.c:266
 #, c-format
@@ -10037,32 +9746,32 @@ msgstr "error de LPGETIRQ"
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s usant la IRQ %d\n"
+msgstr "%s està usant la IRQ %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s usant l'escrutini\n"
+msgstr "%s està usant escrutini\n"
 
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: Argument -l incorrecte %s.\n"
+msgstr "col: argument -l incorrecte %s.\n"
 
 #: text-utils/col.c:535
 #, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "ús : col [-bfpx] [-l nline]\n"
+msgstr "forma d'ús: col [-bfpx] [-l nline]\n"
 
 #: text-utils/col.c:541
 #, c-format
 msgid "col: write error.\n"
-msgstr "col: Error d'escriptura.\n"
+msgstr "col: error d'escriptura.\n"
 
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col: Atenció: No es pot fer la còpia de seguretat de %s.\n"
+msgstr "col: avís: no s'ha pogut fer la còpia de seguretat de %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
@@ -10075,7 +9784,7 @@ msgstr "-- línia ja està buida"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "ús: %s [ - ] [ -2 ] [ fitxer ... ]\n"
+msgstr "forma d'ús: %s [ - ] [ -2 ] [ fitxer ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -10084,7 +9793,7 @@ msgstr "línia massa llarga"
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "ús: column [-tx] [-c columnes] [fitxer ...]\n"
+msgstr "forma d'ús: column [-tx] [-c columnes] [fitxer ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10101,20 +9810,20 @@ msgstr "hexdump: valor del salt incorrecte.\n"
 msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] "
+"hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s omet] "
 "[fitxer ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
+msgstr "forma d'ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: Senyal desconeguda %s\n"
+msgstr "%s: opció desconeguda «-%c»\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10125,8 +9834,7 @@ msgstr ""
 "*** %s: directori ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10137,45 +9845,45 @@ msgstr ""
 "**** %s: No és un fitxer de text ****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[Usar q o Q per a sortir]"
+msgstr "[Useu q o Q per a sortir]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Més--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
-msgstr "(Següent fitxer: %s)"
+msgstr "(Fitxer següent: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Pressionar la barra espaiadora per a continuar; 'q' per a sortir.]"
+msgstr "[Premeu la barra espaiadora per continuar; «q» per a sortir.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
-msgstr "...retrocedir %d pàgines"
+msgstr "...retrocedeix %d pàgines"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...retrocedir 1 pàgina"
+msgstr "...retrocedeix 1 pàgina"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
-msgstr "...ometent una línia"
+msgstr "...s'està ometent una línia"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
-msgstr "...ometent %d línies"
+msgstr "...s'està ometent %d línies"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10185,7 +9893,7 @@ msgstr ""
 "***Endarrera***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10193,12 +9901,12 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"La majoria de comandaments són precedits opcionalment per un argument k "
-"enter. Per omissió entre parèntesis.\n"
-"L'asterisc (*) indica que l'argument esdevé el nou per omissió.\n"
+"La majoria de les ordres són precedides opcionalment per un argument k "
+"enter. Els valors per defecte estan entre parèntesi.\n"
+"L'asterisc (*) indica que l'argument esdevé el nou valor per defecte.\n"
 
 # a.b: Falta arranjar això de "kth"
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10230,85 +9938,85 @@ msgstr ""
 "s                       Salta endavant k línies de text [1]\n"
 "f                       Salta endavant k pantalles de text [1]\n"
 "b o ctrl-B              Salta endarrera k pantalles de text [1]\n"
-"'                       Vés a on va començar l'anterior recerca\n"
+"'                       Va a on va començar l'anterior recerca\n"
 "=                       Mostra el número de la línia actual\n"
 "/<expressió regular>    Cerca l'ocurrència k-enèssima de l'exp.reg. [1]\n"
 "n                       Cerca l'ocurrència k-enèssima de l'última exp.reg. "
 "[1]\n"
-"!<cmd> o :!<cmd>        Executa <cmd> en una subshell\n"
+"!<cmd> o :!<cmd>        Executa <cmd> en un altre intèrpret d'ordres\n"
 "v                       Engega /usr/bin/vi a la línia actual\n"
 "ctrl-L                  Redibuixa la pantalla\n"
 ":n                      Vés al k-enèssim fitxer següent [1]\n"
 ":p                      Vés al k-enèssim fitxer anterior [1]\n"
 ":f                      Mostra el nom del fitxer i el número de línia\n"
-".                       Repeteix el comandament anterior\n"
+".                       Repeteix l'ordre anterior\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
-msgstr "[Prémer 'h' per a les instruccions.]"
+msgstr "[Premeu «h» per a les instruccions.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" línia %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No és un fitxer] línia %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Desbordament\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
-msgstr "...ometent\n"
+msgstr "...s'està ometent\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
-msgstr "Error en l'expressió regular"
+msgstr "S'ha produït un error en l'expressió regular"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Patró no trobat\n"
+"No s'ha trobat el patró\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
-msgstr "Patró no trobat"
+msgstr "No s'ha trobat el patró"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
-msgstr "no es pot establir el canvi\n"
+msgstr "no s'ha pogut bifurcar\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 "\n"
-"...Saltant "
+"...S'està ometent"
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
-msgstr "...Saltant al fitxer "
+msgstr "...s'està saltant al fitxer "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
-msgstr "...Retrocedint al fitxer "
+msgstr "...S'està retrocedint al fitxer "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Línia massa llarga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
-msgstr "No hi ha cap comandament previ a substituir"
+msgstr "No hi ha cap ordre prèvia a substituir"
 
 #: text-utils/odsyntax.c:130
 #, c-format
@@ -10318,32 +10026,32 @@ msgstr "od: od(1) ha quedat obsolet per a hexdump(1).\n"
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: La compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
+msgstr "od: la compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr "; veure strings(1)."
+msgstr "; vegeu strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump: No es pot llegir %s.\n"
+msgstr "hexdump: no s'ha pogut llegir %s.\n"
 
 #: text-utils/parse.c:68
 #, c-format
 msgid "hexdump: line too long.\n"
-msgstr "hexdump: Línia massa llarga.\n"
+msgstr "hexdump: línia massa llarga.\n"
 
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: Nombre total d'octets amb diversos caràcters de conversió.\n"
+msgstr "hexdump: nombre total d'octets amb diversos caràcters de conversió.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr ""
-"hexdump: Nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
+"hexdump: nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
@@ -10354,140 +10062,138 @@ msgstr ""
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr "hexdump: Format incorrecte {%s}\n"
+msgstr "hexdump: format incorrecte {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr "hexdump: Caràcter de conversió %%%s incorrecte.\n"
+msgstr "hexdump: caràcter de conversió %%%s incorrecte.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: Ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] [fitxers]\n"
+"%s: Forma d'ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] "
+"[fitxers]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "%s: L'opció requereix un argument -- %s\n"
+msgstr "%s: l'opció requereix un argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "%s: Opció ilegal -- %s\n"
+msgstr "%s: opció il·legal -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...saltant endavant\n"
+msgstr "...s'està saltant endavant\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...saltant enradera\n"
+msgstr "...s'està saltant endarrera\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
-msgstr "No hi ha fitxer següent"
+msgstr "No hi ha cap fitxer següent"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "No hi ha fitxer anterior"
+msgstr "No hi ha cap fitxer anterior"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "%s: Error de lectura del fitxer %s\n"
+msgstr "%s: S'ha produït un error de lectura en el fitxer %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr "%s: EOF inesperat en el fitxer %s\n"
+msgstr "%s: No s'esperava EOF en el fitxer %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr "%s: Error desconegut en el fitxer %s\n"
+msgstr "%s: S'ha produït un error desconegut en el fitxer %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No es pot cerar el fitxer temporal\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Error RE:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
-msgstr "No es recorda la cadena de recerca"
+msgstr "No es recorda la cadena de cerca"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
-msgstr "No es pot obrir"
+msgstr "No s'ha pogut obrir"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
-msgstr "desat"
+msgstr "s'ha desat"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ": No es permet !comandament en el mode rflag.\n"
+msgstr ": no es permet !ordre en el mode rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "la crida del sistema fork() ha fallat, proveu-ho després\n"
+msgstr "no ha estat possible executar fork(), proveu-ho més endavant\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
-msgstr "(Següent fitxer: "
+msgstr "(Fitxer següent: "
 
 #: text-utils/rev.c:113
 #, c-format
 msgid "Unable to allocate bufferspace\n"
-msgstr "No es pot assignar espai de memòria temporal\n"
+msgstr "No s'ha pogut assignar espai de memòria intermèdia\n"
 
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "ús: rev [fitxer ...]\n"
+msgstr "forma d'ús: rev [fitxer ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "no es pot obrir %s per a lectura\n"
+msgstr "No s'ha pogut obrir «%s» per a lectura\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "ús: %s [fitxer]\n"
+msgstr "Forma d'ús: tailf fitxer_registre\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "ús: %s [ -i ] [ -tTerminal ] fitxer...\n"
+msgstr "forma d'ús: %s [ -i ] [ -tTerminal ] fitxer...\n"
 
 #: text-utils/ul.c:152
 #, c-format
 msgid "trouble reading terminfo"
-msgstr "problema llegint terminfo"
+msgstr "hi ha hagut un problema en llegir terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Seqüència d'eixida desconeguda en l'entrada: %o, %o\n"
+msgstr "Seqüència d'escapament desconeguda en l'entrada: %o, %o\n"
 
 #: text-utils/ul.c:425
 #, c-format
 msgid "Unable to allocate buffer.\n"
-msgstr "No es pot assignar la memòria temporal.\n"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
 #: text-utils/ul.c:586
 #, c-format
@@ -10497,21 +10203,207 @@ msgstr "Línia d'entrada massa llarga.\n"
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
-msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
+msgstr ""
+"S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
-#, fuzzy
-#~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Atenció: S'estan suprimint les particions després de %d\n"
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Nombre invàlid: %s\n"
 
-#~ msgid "mount: fs type %s not supported by kernel"
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Error de sintaxi: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "No s'ha especificat aquet paràmetre: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] nom del dispositiu\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dispositiu mida sectors capçals pistes stretch gap rate "
+#~ "spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dispositiu\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dispositiu\n"
+
+#~ msgid "version"
+#~ msgstr "versió"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "no es pot obrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "no s'ha pogut llegir les dades aleatòries de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "no s'ha pogut obrir %s per a lectura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "no s'ha pogut executar stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s no té els modes de fitxer correctes"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "no s'ha pogut llegir dades de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Hi ha massa usuaris en actiu en el sistema.\n"
+#~ "Proveu-ho més endavant.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Esteu executant massa processos.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "La contrasenya ha de tenir com a mínim 6 caràcters, intenteu-ho de nou.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "La contrasenya ha de contenir caràcters d'alguna de les següents clases:\n"
+#~ "lletres majúscules i minúscules, dígits i caràcters no alfanumèrics.\n"
+#~ "Per a més informació consulteu passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "No podeu tornar a usar una contrasenya antiga.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "No useu res similar al vostre nom d'usuari per contrasenya.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "No useu res similar al vostre nom real per contrasenya.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Forma d'ús: passwd [nom_usuari [contrasenya]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Només l'usuari root pot usar les formes d'un i dos arguments.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Forma d'ús: passwd [-foqsvV] [usuari [contrasenya]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "No s'ha pogut executar %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "No s'ha pogut trobar el nom d'entrada"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Només l'usuari root pot canviar la contrasenya d'altres usuaris.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Massa arguments.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "No s'ha pogut trobar enlloc el nom d'usuari. `%s' és realment un usuari?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Només es poden canviar les contrasenyes locals. Useu yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "El UID i el nom d'usuari no coincideixen, sou un impostor."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "S'està canviant la contrasenya per a %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Entreu l'antiga contrasenya: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Contrasenya il·legal, impostor."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Entreu la nova contrasenya: "
+
+#~ msgid "Password not changed."
+#~ msgstr "No s'ha canviat la contrasenya."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Reescriviu la nova contrasenya: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "L'heu escrit malament. No s'ha canviat."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "s'ha canviat la contrasenya, usuari %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "S'HA CANVIAT LA CONTRASENYA DEL SUPERUSUARI (ROOT)"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "el superusuari (root) ha canviat la contrasenya; usuari %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "s'està cridant setpwnam per establir la contrasenya.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "*NO* s'ha canviat la contrasenya. Intenteu-ho més endavant.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "S'ha canviat la contrasenya.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
 #~ msgstr ""
-#~ "mount: El tipus del sistema de fitxers %s no està suportat pel nucli"
+#~ "mount: aquesta versió ha estat compilada sense suport per al tipus `nfs'"
+
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: no s'ha compilat amb suport per a minix v2\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Arren.(%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Cap (%02X)"
+
+#~ msgid "Warning: deleting partitions after %d\n"
+#~ msgstr "Atenció: s'estan suprimint les particions després de %d\n"
 
 #~ msgid "BLKGETSIZE ioctl failed for %s\n"
 #~ msgstr "Falla del ioctl BLKGETSIZE per a %s\n"
 
-#~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: No s'ha compilat amb suport per a minix v2\n"
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) desplaçament %d, %s encriptació\n"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
+#~ msgstr ""
+#~ "mount: No es pot trobar cap dispositiu loop.\n"
+#~ "       Podria ser que /dev/loop# tingui un número major incorrecte?"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
+#~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
+#~ "       maybe /dev/loop# has the wrong major number?"
+#~ msgstr ""
+#~ "mount: No es pot trobar cap dispositiu loop. Potser aquest nucli no\n"
+#~ "       el reconegui (si es això, recompileu o feu `insmod loop.o')\n"
+#~ "       o també podria ser que /dev/loop# tingui un número major "
+#~ "incorrecte."
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Inicialització (fins a 16 dígits hexadecimals): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Dígit no hexadecimal '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "No conec com obtindre la clau per al sistema d'encriptació %d\n"
+
+#~ msgid "mount: fs type %s not supported by kernel"
+#~ msgstr ""
+#~ "mount: el tipus del sistema de fitxers %s no està suportat pel nucli"
 
 #~ msgid "mount: %s duplicate - not mounted"
 #~ msgstr "mount: %s duplicada; no es muntarà"
@@ -10520,4 +10412,4 @@ msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
 #~ msgstr "UUID"
 
 #~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-#~ msgstr "mount: L'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
+#~ msgstr "mount: l'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 000000000..158b50bbf
--- /dev/null
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 01be4df2b..2f35f97e1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.11d\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-05-30 15:11+0200\n"
 "Last-Translator: Ji�� Pavlovsk� <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "%s: chyba z�pisu na %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Pou�it�:\n"
@@ -158,13 +158,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Pou�it�: %s [ -n ] za��zen�\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s na %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +188,7 @@ msgstr "2"
 msgid "Single"
 msgstr "1"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -199,97 +198,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: chyba z�pisu na %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "m�lo by b�t (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "p�i p�ekladu %s nebyla zvolena podpora minix v2\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s nen� za��zen�m pru�n�ho disku\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: chyba p�i anal�ze p�ep�na��\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -763,7 +762,7 @@ msgstr "p��li� mnoho iuzl� - maximum je 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "nedostatek m�sta, minim�ln� pot�ebn� po�et blok�: %lu"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Za��zen�: %s\n"
@@ -832,18 +831,18 @@ msgstr "chyba p�i z�pisu .. polo�ky"
 msgid "error closing %s"
 msgstr "Chyba p�i zav�r�n� %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Pou�it�: mkfs [-V] [-t sstyp] [ss-volby] za��zen� [velikost]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Nedostatek pam�ti!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs verze %s (%s)\n"
@@ -886,7 +885,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -939,10 +937,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1015,7 +1009,6 @@ msgstr "i-uzly nelze zapsat"
 msgid "write failed in write_block"
 msgstr "chyba p�i z�pisu ve write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1051,7 +1044,7 @@ msgstr "chyba p�i posunu ukazov�tka v pr�b�hu kontroly blok�"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nespr�vn� hodnoty v do_check: pravd�podobn� chyby\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "chyba p�i posunu ukazov�tka v check_blocks"
 
@@ -1093,106 +1086,106 @@ msgstr "o %s nelze z�skat informace"
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokou�et vytvo�it syst�m soubor� na '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Zadadan� velikost str�nky (%d) je chybn�.\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Pou��v�m zadanou velikost str�nky (%d) m�sto implicitn�ch hodnot (%d/%d).\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "P�edpokl�d�m velikost str�nek %d (nikoliv %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "popis"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Pou�it�: %s [-c] [-v0|-v1] [-pVELIKOST STR�NKY] /dev/n�zev [bloky]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "p��li� mnoho chybn�ch str�nek"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Nedostatek pam�ti"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "chybn�ch str�nek: 1\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "chybn�ch str�nek: %d\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: chyba: Kde m�m vytvo�it odkl�dac� prostor?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: chyba: zadan� velikost (%ld) je v�t�� ne� velikost za��zen� (%d)\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: chyba: nezn�m� verze %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: chyba: minim�ln� velikost odkl�dac�ho prostoru je %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varov�n�: odkl�dac� prostor useknut na %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: chyba: Kde m�m vytvo�it odkl�dac� prostor?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "nebudu se pokou�et vytvo�it odkl�dac� za��zen� '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "osudov� chyba: prvn� str�nka je ne�iteln�"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1206,126 +1199,88 @@ msgstr ""
 "opravdu\n"
 "chcete vytvo�it odkl�dac� prostor v0, pou�ijte p�ep�na� -f pro vynucen�.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkl�dac� prostor nelze nastavit: ne�iteln�"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Vytv���m odkl�dac� prostor verze %d, velikost (v bajtech) = %ld\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "odkl�dac� prostor nelze p�evinout"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "str�nku signatur nelze zapsat"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "vol�n� fsync selhalo"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Chybn� ��slo: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaktick� chyba: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Chybn� argument: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "Pou�it�: %s [ -p ] n�zev za��zen�\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"         %s [ -p ] za��zen� velikost sekt hlavy stopy stretch gap rychlost\n"
-"         spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "         %s [ -c | -y | -n | -d ] za��zen�\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "         %s [ -c | -y | -n ] za��zen�\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Nepou�iteln�"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Voln� prostor"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny zm�ny.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Restartujte syst�m, aby byla jistota, �e tabulka rozd�len� disku byla\n"
 "korektn� zm�n�na.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1338,331 +1293,312 @@ msgstr ""
 "DOS 6.x diskov� odd�ly, p�e�t�te si pros�m manu�l\n"
 "programu cfdisk, abyste z�skal dodate�n� informace.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "OSUDOV� CHYBA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Stiskn�te jakoukoliv kl�vesu pro ukon�en� programu cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazov�tko na disku"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze ��st"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "p��li� mnoho diskov�ch odd�l�"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Diskov� odd�l za��n� p�ed sektorem 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Diskov� odd�l kon�� p�ed sektorem 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Diskov� odd�l za��n� za koncem disku"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Diskov� odd�l kon�� za koncem disku"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logick� diskov� odd�l jsou chybn� se�azeny"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logick� diskov� odd�ly se vz�jemn� p�ekr�vaj�"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "zv�t�en� logick� diskov� odd�ly se vz�jemn� p�ekr�vaj�"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Vnit�n� chyba p�i vytv��en� logick�ho disku bez roz���en�ch diskov�ch "
 "odd�l� !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Zde nelze vytvo�it logick� disk -- vznikly by dva roz���en� diskov� odd�ly"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Polo�ka nab�dky je p��li� dlouh�. Nab�dka m��e vypadat podivn�."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Nab�dka nem� zadan� sm�r. Pou��v�m horizont�ln�."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Chybn� kl�vesa"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Stiskn�te kl�vesu pro pokra�ov�n�"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Prim�rn�"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Vytvo�it nov� prim�rn� diskov� odd�l"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logick�"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Vytvo�it nov� logick� diskov� odd�l"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Nevytv��et diskov� odd�l"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Vnit�n� chyba !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Za��tek"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Vytvo�it diskov� odd�l na za��tku voln�ho prostoru"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Vytvo�it diskov� odd�l na konci voln�ho prostoru"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pro roz���en� diskov� odd�l nen� dostatek m�sta"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Nebyla nalezena ��dn� tabulka rozd�len� disku.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Chybn� podpis na tabulce rozd�len� disku"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Vytisknout pouze tabulku rozd�len� disku"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Nebyla nalezena ��dn� tabulka rozd�len� disku.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Zadal jste v�t�� po�et cylindr�, ne� se vejde na disk."
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otev��t"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk byl otev�en pouze pro �ten� - nem�te pr�va pro z�pis"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Chybn� prim�rn� diskov� odd�l"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Chybn� logick� diskov� odd�l"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varov�n�!! Toto m��e v�st ke zni�en� dat na Va�em disku!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Jste si jist, �e chcete ulo�it tabulku rozd�len� disku na disk? (ano �i ne):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Tabulka rozd�len� disku nebyla ulo�ena"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Zadejte `ano' �i `ne'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Ukl�d�m tabulku rozd�len� disku na disk"
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozd�len� disku byla ulo�ena na disk"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabulka byla ulo�ena, ale nepoda�ilo se ji znovu na��st. Restartujte syst�m."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "��dn� prim�rn� diskov� odd�l nen� startovac�. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "V�ce ne� 1 prim�rn� diskov� odd�l je startovac�. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Zadejte n�zev souboru �i stiskn�te RETURN pro zobrazen�: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor '%s' nelze otev��t"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "  ��dn�  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Prim�rn�"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "  Logick�"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Nezn�m�"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Startovac�"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozd�len� disku pro %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Prvn�    Posledn�\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1671,7 +1607,7 @@ msgstr ""
 " # Typ      Sektor   Sektor   Posun   D�lka    ID syst�mu soubor�     "
 "P��znaky\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1680,473 +1616,470 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "        ---Po��tek---       ----Konec----   Po��te�n�\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # P��z Hlav Sekt Cyl    ID  Hlav Sekt Cyl  sektor    Sektor�\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "P��m�"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v p��m�m datov�m form�tu"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku se�azenou dle sektor�"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozd�len� disku"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "N�pov�da pro cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Toto je cfdisk, program pro vytv��en� diskov�ch odd�l� zalo�en�"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "na knihovn� curses. Umo��uje vytv��en�, maz�n� a modifikaci"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "diskov�ch odd�l� na Va�em pevn�m disku."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "P��kaz      V�znam"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          P�epne aktu�ln�mu odd�lu p��znak startovatelnosti"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Sma�e aktu�ln� odd�l"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zm�n� geometrii"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROV�N�: Tato volba by m�la b�t pou��v�na pouze lidmi,"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             kte�� v�d�, co �in�."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Vyp��e tuto n�pov�du"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maxim�ln� zv�t�� aktu�ln� diskov� odd�l "
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Pozn�mka: Toto m��e u�init odd�l nekompatibiln� s"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvo�it na voln�m m�st� nov� odd�l"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Vyp��e tabulku rozd�len� disku na obrazovku �i do souboru"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             P�i v�pisu tabulky rozd�len� disku si m��ete zvolit"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             z n�kolika form�t�:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - P��m� (p�esn� to, co by bylo zaps�no na disk)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka se�azen� dle sektor�"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v p��m�m form�tu"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukon�� program bez ulo�en� tabulky rozd�len� disku"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zm�n� typ syst�mu soubor�"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zm�n� jednotky pro zobrazen� velikosti odd�lu"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Ulo�� tabulku rozd�len� disku (pouze velk� W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Jeliko� to m��e zni�it na disku, mus�te to potvrdit"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odm�tnout naps�n�m `yes' nebo"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       P�esune kurzor na p�edch�zej�c� odd�l."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dol�         P�esune kurzor na dal�� odd�l."
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       P�ekresl� obrazovku"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Vyp��e tuto n�pov�du"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Pozn�mka: V�echny p��kazy mohou b�t zad�ny mal�mi i velk�mi p�smeny"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(s vyj�mkou z�pisu - W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Zm�n� geometrii cylindr�"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Zm�n� geometrii hlav"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Zm�n� geometrii sektor�"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometrie zm�n�na"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte po�et cylindr�: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Chybn� po�et cylindr�"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Zadejte po�et hlav: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Chybn� po�et hlav"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte po�et sektor� na stopu: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Chybn� po�et sektor�"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ syst�mu soubor�: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na pr�zdn�"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na roz���en�"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Nezn�m� (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hlav: %d   Sektor� na stopu: %d   Cylindr�: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "N�zev"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "P��znaky"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Typ odd�lu"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr " Sektory"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Velikost (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Velikost (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "P�epne p��znak startovatelnosti aktu�ln�mu diskov�mu odd�lu"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Sma�e aktu�ln� diskov� odd�l"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Zm�n� geometrii disku (pouze pro odborn�ky)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "N�pov�da"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Vyp��e n�pov�du"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Zv�t�en�"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Zv�t�� velikost aktu�ln�ho diskov�ho odd�lu na maximum (pouze pro odborn�ky)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nov�"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Vytvo�� nov� diskov� odd�l ve voln�m prostoru"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Vyp��e tabulku rozd�len� disku (na obrazovku �i do souboru)"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Ukon�� program bez ulo�en� tabulky rozd�len� disku"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Zm�n� typ syst�mu soubor� (DOS, Linux, OS/2 atd.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Zm�n� jednotky, ve kter�ch je ud�v�na velikost diskov�ho odd�lu"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Ulo�it"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Ulo�� tabulku rozd�len� disku na disk (m��e zni�it data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Tento odd�l nelze nastavit jako startovac�."
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Pr�zdn� diskov� odd�l nelze smazat."
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Tento diskov� odd�l nelze zv�t�it."
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Tento diskov� odd�l je nepou�iteln�."
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Tento diskov� odd�l je ji� pou��v�n."
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ pr�zdn�ho diskov�ho odd�lu nelze zm�nit."
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "��dn� dal�� diskov� odd�ly"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Chybn� p��kaz"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2218,9 +2151,9 @@ msgstr ""
 "\n"
 "BSD tabulka rozd�len� disku pro za��zen�: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "P��kazy"
 
@@ -2240,10 +2173,9 @@ msgstr "   i   instalovat zavad��"
 msgid "   l   list known filesystem types"
 msgstr "   l   vypsat zn�m� typy syst�m� soubor�"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   vyp��e tuto nab�dku"
 
@@ -2255,14 +2187,14 @@ msgstr "   n   vytvo�it nov� BSD diskov� odd�l"
 msgid "   p   print BSD partition table"
 msgstr "   p   vytisknout BSD tabulku rozd�len� disku"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   ukon�� program bez ulo�en� zm�n"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   n�vrat do hlavn� nab�dky"
 
@@ -2305,13 +2237,13 @@ msgstr "Na %s se nenach�z� ��dn� *BSD diskov� odd�l.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "P��kaz pro BSD popis disku (m pro n�pov�du): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Prvn� %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Posledn� %s �i +velikost �i +velikostM �i velikostK"
@@ -2357,8 +2289,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " chybn�sekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2461,8 +2391,8 @@ msgstr "sektor�/stopu"
 msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindry"
 
@@ -2519,7 +2449,7 @@ msgstr "Zavad�� instalov�n na %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Diskov� odd�l (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Ji� bylo vytvo�eno maxim�ln� mno�stv� diskov�ch odd�l�.\n"
@@ -2543,7 +2473,7 @@ msgstr ""
 "\n"
 "Synchronizuj� se disky.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2564,7 +2494,7 @@ msgstr ""
 "-u: zad�n� Za��tku a Konce v sektorech (m�sto cylindrech)\n"
 "-b 2048: (pro n�kter� MO jednotky) pou�ije 2048bajtov� sektory\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2580,199 +2510,185 @@ msgstr ""
 "  �i: fdisk /dev/rd/c0d0  �i: fdisk /dev/ida/c0d0  (pro RAID za��zen�)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otev��t\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze ��st\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazov�tko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze ulo�it\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "vol�n� BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat v�ce pam�ti\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fat�ln� chyba\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   p�epne p��znak \"pouze pro �ten�\""
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �prava bsd popisu disku"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   p�epne p��znak \"p�ipojiteln�\""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   sma�e diskov� odd�l"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   vyp��e zn�m� typy diskov�ch odd�l�"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   vytvo�� nov� diskov� odd�l"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvo�� pr�zdn� DOSOV� diskov� odd�l"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   vyp��e tabulku rozd�len� disku"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvo�� pr�zdn� Sun popis disku"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   zm�n� id diskov�ho odd�lu"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   zm�n� jednotky v nich� jsou vypisov�ny informace"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   ov��� tabulku rozd�len� disku"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   ulo�� tabulku rozd�len� disku a ukon�� program"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   roz�i�uj�c� funkce (pouze pro odborn�ky)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   nastav� startovac� diskov� odd�l"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   �prava polo�ky startovac�ho souboru"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastav� sgi odkl�dac� diskov� odd�l"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   p�epne p��znak \"startovac�\""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   p�epne p��znak \"DOS kompatibiln�\""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zm�n� mno�stv� alternativn�ch cylindr�"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   zm�n� mno�stv� cylindr�"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   vyp��e tabulku rozd�len� disku (tak jak je ulo�ena na disku)"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zm�n� mno�stv� extra sektor� na stopu"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   zm�n� mno�stv� hlav"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   zm�n� prokl�dac� faktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zm�n� rychlost ot��en�"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   zm�n� po�et sektor�/stopu"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zm�n� po�et fyzick�ch cylindr�"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune po��tek dat v diskov�m odd�lu"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   vyp��e roz���en� diskov� odd�ly"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   vytvo�� IRIX tabulku rozd�len� disku"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   oprav� �azen� diskov�ch odd�l�"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Mus�te nastavit"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2781,11 +2697,11 @@ msgstr ""
 "%s%s.\n"
 "M��ete tak u�init z nab�dky roz�i�uj�c�ch funkc�.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2804,29 +2720,29 @@ msgstr ""
 "2) s programy pro spr�vu diskov�ch odd�l� z jin�ch OS\n"
 "   (nap�. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Chybn� posun v prim�rn�m diskov�m odd�lu\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varov�n�: nadbyte�n� ukazatel na link v tabulce rozd�len� disku %d.\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varov�n�: nadbyte�n� data v tabulce rozd�len� disku %d ignorov�na.\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2840,24 +2756,24 @@ msgstr ""
 "data\n"
 "pochopiteln� dostupn�.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Nebudete moci ulo�it tabulku rozd�len� disku.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2867,17 +2783,17 @@ msgstr ""
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Vnit�n� chyba\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbyte�n� roz���en� diskov� odd�l %d ignorov�n.\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2886,7 +2802,7 @@ msgstr ""
 "Varov�n�: chybn� p��znak 0x%04x tabulky rozd�len� disku %d bude opraven "
 "z�pisem(w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2895,83 +2811,83 @@ msgstr ""
 "\n"
 "t�ikr�t jsem nalezl EOF - kon��m..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "�estn�ctkov� (L vyp��e k�dy):"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, implicitn� %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Pou��v�m implicitn� hodnotu %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "��slo diskov�ho odd�lu"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varov�n�: diskov� odd�l %d nem� ur�en typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Nadbyte�n� roz���en� diskov� odd�l %d ignorov�n.\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nejsou definov�ny ��dn� diskov� odd�ly\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "M�n�m jednotky v nich� jsou vypisov�ny informace na %sy\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROV�N�: diskov� odd�l %d je roz���en�m diskov�m odd�lem\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "P��znak DOSOV� kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "P��znak DOSOV� kompatibility nen� nastaven.\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskov� odd�l %d zat�m neexistuje!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2983,7 +2899,7 @@ msgstr ""
 "voln� prostor. Vytv��et diskov� odd�ly typu 0 nen� moudr�.\n"
 "Diskov� odd�l m��ete smazat pomoc� p��kazu `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2992,7 +2908,7 @@ msgstr ""
 "Nem��ete m�nit b�n� diskov� odd�ly na roz���en� a zp�t. Nejd��ve jej "
 "sma�te.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3003,7 +2919,7 @@ msgstr ""
 "nebo� SunOS/Solaris to o�ek�v� a i Linux tomu d�v� p�ednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3015,60 +2931,60 @@ msgstr ""
 "a diskov� odd�l 11 jako cel� svazek (6), nebo� IRIX to o�ek�v�.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Typ diskov�ho odd�lu %d byl zm�n�n na %x (%s).\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Diskov� odd�l %d m� rozd�ln� fyzick� a logick� za��tek (nelinuxov�?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logick�=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Diskov� odd�l %d m� rozd�ln� fyzick� a logick� konec:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Diskov� odd�l %i neza��n� na hranici cylindru:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "m�lo by b�t (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Diskov� odd�l %d nekon�� na hranici cylindru.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "m�lo by b�t (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3078,7 +2994,7 @@ msgstr ""
 "Disk %s: hlav: %d, sektor�: %d, cylindr�: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3086,19 +3002,19 @@ msgstr ""
 "Disk %s: hlav: %d, sektor�: %d, cylindr�: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3107,7 +3023,7 @@ msgstr ""
 "Diskov� odd�ly jsou ji� se�azeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3115,16 +3031,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Za��tek     Konec  Bloky    Id  Syst�m\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Za��zen�"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3133,7 +3049,7 @@ msgstr ""
 "\n"
 "Diskov� odd�ly jsou chybn� se�azeny\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3144,84 +3060,84 @@ msgstr ""
 "Disk %s: hlav: %d, sektor�: %d, cylindr�: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "�  AF  Hd Sek  Cyl  Hd Sek  Cyl    Za��tek   Vel  Id\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varov�n�: diskov� odd�l %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Diskov� odd�l %d: hlava %d m� v�t�� ��slo ne� je maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Diskov� odd�l %d: sektor %d m� v�t�� ��slo ne� je maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Diskov� odd�l %d: cylindr %d m� v�t�� ��slo ne� je maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Diskov� odd�l %d: p�edchoz� sektory %d nesouhlas� s �hrnem %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varov�n�: chybn� po��tek dat v diskov�m odd�lu %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varov�n�: diskov� odd�l %d p�esahuje do diskov�ho odd�lu %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varov�n�: diskov� odd�l %d je pr�zdn�.\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logick� diskov� odd�l %d p�esahuje mimo diskov� odd�l %d.\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Celkov� po�et alokovan�ch sektor� (%d) je v�t�� ne� maximum (%d).\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "nealokovan�ch sektor�: %d\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Diskov� odd�l %d je ji� definov�n. P�ed op�tovn�m vytvo�en�m jej mus�te\n"
 "nejprve smazat.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji� alokov�n\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Nejsou ��dn� voln� sektory.\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3230,22 +3146,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Mus�te nejprve n�kter� smazat a p�idat roz���en� diskov� odd�l.\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "logick� diskov� odd�l jsou chybn� se�azeny"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Chybn� prim�rn� diskov� odd�l"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3256,32 +3172,32 @@ msgstr ""
 "   %s\n"
 "   p   prim�rn� diskov� odd�l (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logick� diskov� odd�l (5 nebo v�ce)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   roz���en� diskov� odd�l"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybn� ��slo diskov�ho odd�lu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozd�len� disku byla zm�n�na!\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Vol�m ioctl() pro znovuna�ten� tabulky rozd�len� disku.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3290,7 +3206,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3303,75 +3219,75 @@ msgstr ""
 "DOS 6.x diskov� odd�ly, p�e�t�te si pros�m manu�lovou\n"
 "str�nku programu fdisk, abyste z�skal dodate�n� informace.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Chyba p�i zav�r�n� %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronizuj� se disky.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskov� odd�l %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nov� za��tek dat"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "P��kaz pro odborn�ky (m pro n�pov�du): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Po�et cylindr�"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Po�et hlav"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Po�et sektor�"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varov�n�: nastaven posun sektoru kv�li kompatibilit� s DOSEM\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Na disku %s nen� korektn� tabulka rozd�len� disku.\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otev��t.\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otev��t.\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "p��kaz %c nen� zn�m\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Toto j�dro detekuje velikost sektoru automaticky - p�ep�na� -b ignorov�n\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3381,19 +3297,18 @@ msgstr ""
 "jedn�m\n"
 "          zadan�m za��zen�m.\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Na %s nalezen OSF/1 popis disku. Spou�t�m re�im popisu disku.\n"
 "Pro n�vrat do re�imu DOS tabulky rozd�len� disku pou�ijte p��kaz 'r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "P��kaz (m pro n�pov�du): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3402,16 +3317,16 @@ msgstr ""
 "\n"
 "Aktu�ln� startovac� soubor: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte n�zev nov�ho startovac�ho souboru: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startovac� soubor nebyl zm�n�n.\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3478,15 +3393,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativn�"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3564,7 +3479,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u velikost%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3621,7 +3535,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Existuje v�ce ne� jedna polo�ka cel�ho disku.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nejsou definov�ny ��dn� diskov� odd�ly\n"
@@ -3706,7 +3620,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVybral jste si neobvykl� n�zev pro startovac� soubor.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3726,11 +3639,10 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, �e chcete ozna�it tento diskov� odd�l "
 "jinak.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3802,44 +3714,43 @@ msgstr "Pokou��m se zachovat parametry diskov�ho odd�lu %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZA��TEK=%d\tD�LKA=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Pr�zdn� prostor"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Cel� disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3852,12 +3763,12 @@ msgstr ""
 "cylindry a diskov� odd�ly, nebo vytvo�it novou tabulku (p��kaz s v hlavn�\n"
 "nab�dce)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatick� konfigurace nalezla %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3869,7 +3780,7 @@ msgstr ""
 "dokud se nerozhodnete je ulo�it na disk. Pot� ji� nebudou star� data\n"
 "pochopiteln� dostupn�.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3879,72 +3790,72 @@ msgstr ""
 "   ?   automatick� konfigurace\n"
 "   0   u�ivatelsk� konfigurace (s detekovan�m implicitn�m nastaven�m)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Zadejte typ (? pro auto, 0 pro u�ivatelsk�): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automatick� konfigurace selhala.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektor�/stopu"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternativn� cylindry"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fyzick� cylindry"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost ot��en� (otm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "V�echny parametry disku m��ete zm�nit z nab�dky x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" pru�n� disk"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux u�ivatelsk�"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Diskov� odd�l %d nekon�� na hranici cylindru.\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Diskov� odd�l %d p�esahuje do jin�ch v sektorech %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyu��van� prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyu��van� prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3953,7 +3864,7 @@ msgstr ""
 "Jin� diskov� odd�ly ji� zauj�m� cel� disk.\n"
 "Sma�te/zmen�ete n�jak� a zkuste to znovu.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3963,7 +3874,7 @@ msgstr ""
 "T�et� diskov� odd�l nezab�r� cel� disk, ale va�e hodnota %d %s\n"
 "zauj�m� jin� diskov� odd�ly. Va�e polo�ka byla zm�n�na na %d %s.\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3973,7 +3884,7 @@ msgstr ""
 "tohoto diskov�ho odd�lu jako Cel�ho disku (5), za��naj�c�ho na 0 o d�lce\n"
 "v sektorech %u\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3987,7 +3898,7 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, �e chcete tento diskov� odd�l ozna�it 82\n"
 "(odkl�dac� prostor pro Linux): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4006,7 +3917,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4019,16 +3930,16 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s P��znak Za��tek     Konec  Bloky    Id  Syst�m\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Po�et alternativn�ch cylindr�"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Po�et fyzick�ch cylindr�"
 
@@ -4052,32 +3963,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Roz���en�"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX startovac�"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4088,7 +3993,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4186,12 +4090,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4212,8 +4114,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4223,7 +4123,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD �i SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4244,12 +4143,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Star� Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / star� Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4280,12 +4177,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4294,7 +4189,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4360,30 +4254,22 @@ msgstr "data mimo SS"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell utilita"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS ss"
@@ -4392,117 +4278,110 @@ msgstr "BeOS ss"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekund�rn�"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "chyba posunu ukazov�tka na %s - ukazov�tko nelze posunout na %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 "chyba p�i posunu ukazov�tka: po�adavek 0x%08x%08x, v�sledek 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "nedostatek pam�ti - kon��m\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "chyba �ten� na %s - sektor %lu nelze ��st\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "CHYBA: sektor %lu nem� msdos podpis\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "chyba z�pisu na %s - sektor %lu nelze zapsat\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "soubor pro ulo�en� sektor� (%s) nelze otev��t\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "chyba z�pisu na %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "vol�n� stat pro soubor s ulo�en�mi sektory (%s) selhalo\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "soubor s ulo�en�mi sektory m� chybnou velikost - nebude obnoven\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "nedostatek pam�ti?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "soubor s ulo�en�mi sektory (%s) nelze otev��t\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "chyba p�i �ten� %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "za��zen� %s nelze otev��t pro z�pis\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "chyba p�i z�pisu sektoru %lu na %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometrii nelze zjistit\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: velikost nelze zjistit\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4513,22 +4392,22 @@ msgstr ""
 "cel� disk. Pou�it� fdisku je v tom p��pad� pravd�podobn� zbyte�n�\n"
 "[Pou�ijte p�ep�na� --force pokud to opravdu chcete.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varov�n�: dle HDIO_GETGEO je po�et hlav %lu\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varov�n�: dle HDIO_GETGEO je po�et sektor� %lu\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varov�n�: dle BLKGETSIZE/HDIO_GETGEO je po�et cylindr� %lu\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4537,7 +4416,7 @@ msgstr ""
 "Varov�n�: podivn� po�et sektor� (%lu) - obvykle neb�v� v�ce ne� 63\n"
 "To zp�sob� probl�my v�em program�m, kter� pou��vaj� CHS adresov�n�.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4546,13 +4425,13 @@ msgstr ""
 "\n"
 "Disk %s: cylindr�: %lu, hlav: %lu, sektor�/stopu: %lu\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "%s diskov�ho odd�lu %s m� chybn� po�et hlav: %lu (m�lo by b�t 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4560,7 +4439,7 @@ msgid ""
 msgstr ""
 "%s diskov�ho odd�lu %s m� chybn� po�et sektor�: %lu (m�lo by b�t 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4568,19 +4447,19 @@ msgid ""
 msgstr ""
 "%s diskov�ho odd�lu %s m� chybn� po�et cylindr�: %lu (m�lo by b�t 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr "Id  N�zev\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Na��t�m znovu tabulku rozd�len� disku ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4588,31 +4467,31 @@ msgstr ""
 "Nepoda�ilo se znovu na��st tabulku rozd�len� disku.\n"
 "Restartujte nyn�, p�ed pou�it�m mkfs, syst�m.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Chyba p�i zav�r�n� %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "diskov� odd�l %s neexistuje\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Nezn�m� form�t - pou��v�m sektory\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabulka rozd�len� disku pro %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepou��van� form�t - pou��v�m %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4621,12 +4500,12 @@ msgstr ""
 "Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Za��z  Boot Za��tek   Konec #cylind #bloky    Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4635,12 +4514,12 @@ msgstr ""
 "Jednotky = sektory po 512 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Za��z  Boot    Za��tek     Konec #sektory Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4649,12 +4528,12 @@ msgstr ""
 "Jednotky = bloky po 1024 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Za��z  Boot   Za��tek     Konec #bloky   Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4664,31 +4543,31 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Za��z  Boot Za��tek Konec   MB   #bloky    Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tza��tek: (c,h,s) p�edpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkonec: (c,h,s) p�edpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskov� odd�l kon�� na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Nebyly nalezeny ��dn� diskov� odd�ly\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4699,52 +4578,52 @@ msgstr ""
 "pro C/H/S=*/%ld/%ld (m�sto %ld/%ld/%ld).\n"
 "Zobrazuji za pou�it� t�to geometrie.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "Nebyla nalezena ��dn� tabulka rozd�len� disku.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Zvl�tn� - po�et definovan�ch diskov�ch odd�l� je pouze %d.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Varov�n�: diskov� odd�l %s m� velikost 0 a nen� ozna�en jako pr�zdn�.\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varov�n�: diskov� odd�l %s m� velikost 0 a je startovac�.\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varov�n�: diskov� odd�l %s m� velikost 0 a nenulov� za��tek.\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varov�n�: diskov� odd�l %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "nen� obsa�en v diskov�m odd�lu %s.\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varov�n�: diskov� odd�ly %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "a %s se navz�jem p�ekr�vaj�.\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4754,17 +4633,17 @@ msgstr ""
 "lu)\n"
 "a v p��pad� zapln�n� ji zni��\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varov�n�: diskov� odd�l %s za��n� na sektoru 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varov�n�: diskov� odd�l %s p�esahuje za konec disku.\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4772,17 +4651,17 @@ msgstr ""
 "Pouze jeden z prim�rn�ch diskov�ch odd�l� m��e b�t roz���en�m.\n"
 " (a�koliv v Linux to nen� probl�m)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varov�n�: diskov� odd�l %s neza��n� na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varov�n�: diskov� odd�l %s nekon�� na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4790,7 +4669,7 @@ msgstr ""
 "Varov�n�: v�ce ne� jeden prim�rn� diskov� odd�l je ozna�en jako startovac�.\n"
 "LILU to ne�in� probl�my, ale DOS MBR z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4798,7 +4677,7 @@ msgstr ""
 "Varov�n�: oby�ejn� je mo�n� startovat pouze z prim�rn�ch diskov�ch odd�l|�.\n"
 "LILO nebude br�t ohled na p��znak 'startovac�'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4806,12 +4685,12 @@ msgstr ""
 "Varov�n�: ��dn� prim�rn� diskov� odd�l nen� ozna�en jako startovac�.\n"
 "LILU to ne�in� probl�my, ale DOS z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "stav"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4819,24 +4698,24 @@ msgstr ""
 "diskov� odd�l %s: za��tek: (c,h,s) p�edpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "odesl�n�"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "diskov� odd�l %s: konec: (c,h,s) p�edpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskov� odd�l %s kon�� na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4845,7 +4724,7 @@ msgstr ""
 "Varov�n�: za��tek roz���en�ho diskov�ho odd�lu posunut z %ld na %ld.\n"
 "(Pouze pro ��ely v�pisu. Nem��te jeho obsah.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4853,134 +4732,131 @@ msgstr ""
 "Varov�n�: roz���en� diskov� odd�l neza��n� na hranici cylindru.\n"
 "DOS a Linux budou jeho obsah interpretovat rozd�ln�.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "p��li� mnoho diskov�ch odd�l� - ignoruji > %d\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "strom diskov�ch odd�l�?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s t�m neum�m pracovat\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - kon��m\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvl�tn�..., roz���en� diskov� odd�l o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvl�tn�..., BSD diskov� odd�l o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " diskov� odd�l %s nen� zn�m\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "byl zad�n p�ep�na� -n: Nic nebylo zm�n�no\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba p�i ukl�d�n� star�ch sektor� - kon��m\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Chyba p�i z�pisu na diskov� odd�l %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "p��li� dlouh� �i ne�pln� ��dek - kon��m\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "vstupn� chyba: po polo�ce %s jsem o�ek�val znak `='\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "vstupn� chyba: neo�ek�van� znak %c po polo�ce %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznan� vstup: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "��slo je p��li� velik�\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "nesmysly za ��slem\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "nen� m�sto pro popis diskov�ho odd�lu\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "okoln� roz�i�uj�c� diskov� odd�l nelze vytvo�it\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "p��li� mnoho vstupn�ch polo�ek\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Ji� nejsou voln� bloky\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Chybn� typ\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
-"Varov�n�: zadan� velikost(%ld) p�ekra�uje maxim�ln� povolenou velikost (%"
-"lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Varov�n�: pr�zdn� diskov� odd�l\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varov�n�: chybn� za��tek diskov�ho odd�lu (d��v�j�� %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznan� p��znak 'startovac�' - zvolte - �i *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "ne�pln� c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Roz���en� diskov� odd�l na neo�ek�van�m m�st�\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "chybn� vstup\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "p��li� mnoho diskov�ch odd�l�\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -4992,100 +4868,96 @@ msgstr ""
 "<za��tek> <velikost> <typ [E,S,L,X,hex]> <startovac� [-,*]> <c,h,s> <c,h,s>\n"
 "Obvykle je t�eba zadat pouze <za��tek> a <velikost> (a mo�n� <typ>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "verze"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou�it�: %s [p�ep�na�e] za��zen� ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "za��zen�: n�co jako /dev/hda �i /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "u�ite�n� p�ep�na�e:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [�i --show-size]: vyp��e velikost diskov�ho odd�lu"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [�i --id]:        vyp��e �i zm�n� Id diskov�ho odd�lu"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [�i --list]:      ke ka�d�mu za��zen� vyp��e diskov� odd�ly"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [�i --dump]:      idem, ale ve form�tu vhodn�m k dal��mu zpracov�n�"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [�i --increment]: ��sluje cylindry etc. od 1 m�sto od 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  jako jednotky pou�ije Sektory/Bloky/Cylindry �i MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [�i --list-types]:vyp��e zn�m� typy diskov�ch odd�l�"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [�i --DOS]:       pro kompatibilitu s DOSEM: ub�r� trochu m�sta"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [�i --re-read]:   donut� j�dro znovu na��st tabulku rozd�len� disku"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zm�n� pouze diskov� odd�l s ��slem #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ��dn� zm�ny nebudou ulo�eny na disk"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O SOUBOR :           ulo�� zm�n�n� sektory do SOUBORU"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnov� tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [�i --version]:   vyp��e informace o verzi"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [�i --help]:      vyp��e tuto n�pov�du"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "nebezpe�n� p�ep�na�e:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [�i --show-geometry]: vyp��e informace o geometrii, kter�\n"
 "                                    udr�uje j�dro"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5094,7 +4966,7 @@ msgstr ""
 "    -g [�i --show-geometry]: vyp��e informace o geometrii, kter�\n"
 "                                    udr�uje j�dro"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5102,116 +4974,116 @@ msgstr ""
 "    -x [�i --show-extended]: vyp��e informace o roz���en�ch diskov�ch\n"
 "                             odd�lech a na vstupu bude o�ek�vat jejich popis"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [�i --Linux]:      probl�my nepodstatn� pro Linux budou ignorov�ny"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [�i --quiet]:      nebude vypisovat varovn� hl�ky"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii m��ete p�epsat pomoc�:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [�i --cylinders #]:nastav� po�et cylindr�"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [�i --heads #]:    nastav� po�et hlav"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [�i --sectors #]:  nastav� po�et cylindr�"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Ov��ov�n� konzistence m��ete vypnout pomoc�:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [�i --force]:      akceptuje ve�ker� - i nesmysln� - po�adavky"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s za��zen�\t\t vyp��e aktivn� diskov� odd�ly na dan�m za��zen�\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s za��zen� n1 n2 ... aktivuje diskov� odd�ly n1 ..., deaktivuje ostatn�\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An za��zen�\t aktivuje diskov� odd�ly n ..., deaktivuje ostatn�\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "��dn� p��kaz?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "celkov� po�et blok�: %d\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Pou�it�: sfdisk --print-id za��zen� ��slo diskov�ho odd�lu\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Pou�it�: sfdisk --change-id za��zen� Id diskov�ho odd�lu\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Pou�it�: sfdisk --id za��zen� ��slo diskov�ho odd�lu [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "m��ete zadat pouze jedno za��zen� (vyj�mkou jsou p�ep�na�e -l a -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otev��t.\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s pro �ten� nelze otev��t"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindr�, %ld hlav, %ld sektor�/stopu\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "nelze zjistit velikost %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "chybn� aktivn� bajt: 0x%x m�sto 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5219,7 +5091,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5229,35 +5101,35 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedn�m aktivn�m diskov�m odd�lem.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "diskov� odd�l %s m� id %x a nen� skryt�\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybn�\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je pr�v� pou��v�n.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fat�ln� chyba: %s nelze nal�zt\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varov�n�: %s nen� blokov�m za��zen�m\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Ov��uji, zda tento disk nen� pr�v� pou��v�n ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5270,30 +5142,30 @@ msgstr ""
 "v�echny odkl�dac� prostory na tomto disku. K potla�en� t�to kontroly m��ete\n"
 "pou��t p�ep�na� --no-reread.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Pou�ijte p�ep�na� --force k potla�en� ve�ker�ch kontrol.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Star� situace:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Diskov� odd�l %d neexistuje. Nelze jej zm�nit.\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nov� situace:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5301,21 +5173,21 @@ msgstr ""
 "Toto rozlo�en� diskov�ch odd�l� se mi nel�b� - nic nem�n�m.\n"
 "(Pokud jej opravdu chcete pou��t, pak zadejte p�ep�na� --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Toto se mi nel�b� - m�l byste odpov�d�t NO\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje V�m to? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo�it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5324,16 +5196,16 @@ msgstr ""
 "\n"
 "sfdisk: p�ed�asn� konec vstupu\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Kon��m - nebyly u�in�ny ��dn� zm�ny\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpov�zte pros�m y,n �i q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5342,7 +5214,7 @@ msgstr ""
 "Nov� tabulka rozd�len� disku byla �sp�n� ulo�ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5444,133 +5316,133 @@ msgstr "getopt (roz���en�) 1.1.2\n"
 msgid "internal error, contact the author."
 msgstr "Vnit�n� chyba, oznamte ji autorovi."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "spu�t�n pomoc� MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "hodnoty ulo�eny v BCD tvaru\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "vstupn�/v�stupn� port pro p��stup k hodin�m nastaven na 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "pou�it p�ep�na� --funky-toy!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: 1000 ne�sp�n�ch pokus� o atomick� proveden� %s!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port nelze otev��t: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jeliko� jsem se nesna�il, nepoda�ilo se mi z�skat pr�va pro p��stup.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s: p��stup k portu nelze z�skat:  vol�n� iopl(3) selhalo.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Pravd�podobn� je t�eba m�t pr�va superu�ivatele.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "P�edpokl�d�m, �e hodiny re�ln�ho �asu jsou nastaveny na %s �as.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "greenwichsk�"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "m�stn�"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varov�n�: nezn�m� form�t t�et�ho ��dku v souboru adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(O�ek�v�no `UTC', `LOCAL' �i nic.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Posledn� oprava posunu prob�hla %ld sekund od roku 1969.\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Posledn� kalibrace prob�hla %ld sekund od roku 1969.\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hodiny re�ln�ho �asu jsou nastaveny na %s �as.\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "nezn�m�"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "�ek�m na tiknut� hodin...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...hodiny tikly\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Hodiny re�ln�ho �asu obsahuj� chybn� hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hodiny re�ln�ho �asu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hodiny re�ln�ho �asu ukazuj� %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Nastavuji hodiny re�ln�ho �asu na %.2d:%.2d:%.2d = %ld sekund od roku 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Testovac� re�im - �as nezm�n�n.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5579,7 +5451,7 @@ msgstr ""
 "Po�et sekund uplynul�ch od referen�n�ho �asu: %.6f.\n"
 "�ek�m, dokud neuplyne dal�� cel� sekunda.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5588,22 +5460,22 @@ msgstr ""
 "Registry hodin re�ln�ho �asu obsahuj� hodnoty, kter� jsou bu� chybn� (nap�.\n"
 "50t� den v m�s�ci), �i mimo p��pustn� rozsah (nap�. rok 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekundy\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "P�ep�na� --date vy�aduje argument.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, fuzzy, c-format
 msgid "--date argument too long\n"
 msgstr "n�zev ss je p��li� dlouh�"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5611,21 +5483,21 @@ msgid ""
 msgstr ""
 "Argument p�ep�na�e --date nen� platn�m datem. Konkr�tn� obsahuje uvozovky.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Spou�t�m p��kaz 'date': %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "P��kaz 'date' nelze v shellu /bin/sh spustit. Vol�n� popen() selhalo."
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "odpov�� p��kazu 'date' = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5640,7 +5512,7 @@ msgstr ""
 "Odpov��:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5657,12 +5529,12 @@ msgstr ""
 "Odpov��:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Datum %s odpov�d� %ld sekund�m od roku 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5671,36 +5543,36 @@ msgstr ""
 "Syst�mov� �as nelze podle hodin re�ln�ho �asu nastavit, proto�e neukazuj�\n"
 "platn� �as.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Vol�m settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Testovac� re�im - syst�mov� �as nezm�n�n.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Nastavit syst�mov� �as m��e pouze superu�ivatel.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "vol�n� settimeofday() selhalo"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5709,7 +5581,7 @@ msgstr ""
 "Neopravuji m�ru posunu, proto�e hodiny re�ln�ho �asu posledn� obsahovaly\n"
 "neplatn� hodnoty.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5718,7 +5590,7 @@ msgstr ""
 "Neopravuji m�ru posunu, proto�e posledn� kalibrace je�t� neuplynul cel� "
 "den.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5727,7 +5599,7 @@ msgstr ""
 "Neopravuji m�ru posunu, proto�e posledn� kalibrace je�t� neuplynul cel� "
 "den.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5739,22 +5611,22 @@ msgstr ""
 "je nastavena na %3$f sekund/den.\n"
 "Opravuji m�ru posunu o %4$f sekund.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Po�et sekund od posledn� opravy: %d\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "Pot�ebn� zm�na �asu: sekund vp�ed: %d ; sekund zp�t: %.6f\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Testovac� re�im - soubor adjtime nezm�n�n.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5763,38 +5635,38 @@ msgstr ""
 "Do %s by bylo ulo�eno n�sleduj�c�:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametry opravy posunu nezm�n�ny.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "Hodiny re�ln�ho �asu obsahuj� neplatn� �as, tud�� jej nelze opravit.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Pot�ebn� oprava je men�� ne� 1 sekunda, proto hodiny nenastavuji.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Pou��v�m %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Nebylo nalezeno ��dn� pou�iteln� rozhran� k hodin�m.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Syst�mov� �as nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5808,34 +5680,39 @@ msgstr ""
 "Tento program nebyl p�elo�en pro Alpha syst�m ( a tud�� pravd�podobn� nyn�\n"
 "neb�� na Alph�). Ignorov�no.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Po��tek epochy nelze z j�dra zjistit.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "J�dro pokl�d� za po��tek epochy %lu.\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr "Po��tek epochy nastav�te pomoc� p�ep�na�� epoch a setepoch.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Testovac� re�im - po��tek epochy na %d nem�n�m.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Hodnotu po��tku epochy v j�d�e nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s na %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5891,7 +5768,7 @@ msgstr ""
 "  --date        �as, na kter� budou nastaveny hodiny re�ln�ho �asu\n"
 "  --epoch=ROK   nastav� po��tek epochy pro hodiny re�ln�ho �asu na ROK\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5900,13 +5777,13 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                nastav� typ alpha syst�mu (viz hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s akceptuje pouze p�ep�na�e. Zad�no argument�, kter� nejsou p�ep�na�i: %d\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5915,54 +5792,54 @@ msgstr ""
 "Zadal jste v�cero funk�n�ch p�ep�na��. Program m��e prov�st maxim�ln� jednu\n"
 "funkci najednou.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr "%s: P�ep�na�e --utc a --localtime nelze pou��t z�rove�.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: P�ep�na�e --utc a --localtime nelze pou��t z�rove�.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Nebyl zad�n platn� �as, kter� m�m nastavit. Hodiny nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Hodiny re�ln�ho �asu m��e nastavit pouze superu�ivatel.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Hodiny re�ln�ho �asu m��e nastavit pouze superu�ivatel.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Hodnotu po��tku epochy v j�d�e m��e nastavit pouze superu�ivatel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "��dn�m ze zn�m�ch zp�sob� nelze z�skat p��stup k hodin�m re�ln�ho �asu.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5996,7 +5873,6 @@ msgstr "�as se pomoc� vol�n� ioctl() pro %s nepoda�ilo zjistit"
 msgid "ioctl KDSHWCLK failed"
 msgstr "vol�n� ioctl KDSHWCLK selhalo"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 ani /dev/vc/1 nelze otev��t"
@@ -6092,9 +5968,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "Z %2$s byl pomoc� RTC_EPOCH_READ ioctl zji�t�n po��tek epochy (%1$ld).\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6121,7 +5994,6 @@ msgstr "vol�n� ioctl(RTC_EPOCH_SET) pro %s selhalo"
 msgid "calling open_tty\n"
 msgstr "vol�m open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "vol�m termio_init\n"
@@ -6130,7 +6002,6 @@ msgstr "vol�m termio_init\n"
 msgid "writing init string\n"
 msgstr "zapisuji inicializa�n� �et�zec\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "p�ed autobaud\n"
@@ -6144,7 +6015,6 @@ msgstr "�ek�m na cr-lf\n"
 msgid "read %c\n"
 msgstr "p�e�teno %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "�tu p�ihla�ovac� jm�no\n"
@@ -6198,7 +6068,6 @@ msgstr "/dev: vol�n� chdir() selhalo: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s nen� znakov�m za��zen�m"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6213,12 +6082,10 @@ msgstr "/dev/%s nelze otev��t jako standardn� vstup: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: nen� otev�eno pro �ten�/z�pis"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "vol�m dup\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6261,30 +6128,25 @@ msgstr ""
 "�i\t[-hiLmw] [-l login_program] [-t �asov� limit] [-I inicializa�n� �et�zec] "
 "[-H po��ta�] linka baud_rate,... [typ termin�lu]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: nedostatek pam�ti, p�ihl�en� se nemus� zda�it\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "pam� pro ttyclass nelze alokovat"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "pam� pro grplist nelze alokovat"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "P�ihl�en� z %2$s na tty %1$s implicitn� odm�tnuto.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "P�ihl�en� z $2%s na $1%s odm�tnuto.\n"
@@ -6329,8 +6191,8 @@ msgstr "M�n�m finger informace o u�ivateli %s.\n"
 msgid "Password error."
 msgstr "Chybn� heslo."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Heslo: "
@@ -6506,34 +6368,6 @@ msgstr "Pou�ijte %s -l pro vyps�n� seznamu\n"
 msgid "No known shells.\n"
 msgstr "Nen� zn�m ��dn� shell.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom nelze otev��t"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "n�hodn� data z /dev/urandom nelze ��st"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s pro �ten� nelze otev��t"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "vol�n� stat(%s) selhalo"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s m� chybn� p��stupov� pr�va"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "data z %s nelze ��st"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6545,11 +6379,11 @@ msgstr ""
 "Pou�it�: last [-#] [-f soubor] [-t tty] [-h n�zev po��ta�e]\n"
 "                [u�ivatel ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  st�le p�ihl�en"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6558,15 +6392,15 @@ msgstr ""
 "\n"
 "wtmp za��n� %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: vol�n� malloc selhalo.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6575,51 +6409,45 @@ msgstr ""
 "\n"
 "p�eru�en %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s nelze otev��t: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: p�ep�na� -h m��e pou��t pouze superu�ivatel\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Pou�it�: login [fp] [u�ivatelsk� jm�no]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: chyba PAM, kon��m: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "P�ihla�ovac� jm�no:"
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%1$d. CHYBN� P�IHL��EN� U�IVATELE %3$s Z %2$s, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6628,17 +6456,17 @@ msgstr ""
 "Chybn� p�ihl�en�\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "P��LI� MNOHO (%1$d) POKUS� U�IVATELE %3$s O P�IHL��EN� Z %2$s, %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "NE�SP̩N� P�IHL��EN� U�IVATELE %2$s Z %1$s, %3$s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6647,142 +6475,127 @@ msgstr ""
 "\n"
 "Chybn� p�ihl�en�\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "%s: Nedostatek pam�ti!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Chybn� u�ivatelsk� jm�no"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "p�ihl�en� u�ivatele %s na tomto termin�lu odm�tnuto\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "P�IHL��EN� U�IVATELE %s Z %s NA TTY %s ODM�TNUTO"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "P�IHL��EN� U�IVATELE %s NA TTY %s ODM�TNUTO"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Chybn� p�ihl�en�\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Ji� je p�ihl�eno p��li� mnoho u�ivatel�.\n"
-"Zkuste to op�t pozd�ji.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "M�te spu�t�no p��li� mnoho proces�.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "P��STUP U�IVATELE %2$s VYT��ENOU LINKOU NA TTY %1$s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "P�IHL��EN� U�IVATELE ROOT Z %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "P�IHL��EN� U�IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "P�IHL��EN� U�IVATELE %2$s Z %3$s NA TTY %1$s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "P�IHL��EN� U�IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, fuzzy, c-format
 msgid "You have new mail.\n"
 msgstr "M�te %spo�tu.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, fuzzy, c-format
 msgid "You have mail.\n"
 msgstr "M�te %spo�tu.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vol�n� fork selhalo: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "vol�n� setuid() selhalo"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adres�� %s neexistuje!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "P�ihla�uji s dom�c�m adres��em nastaven�m na \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pam�ti pro skript shellu.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ��dn� shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6791,65 +6604,65 @@ msgstr ""
 "\n"
 "P�ihla�ovac� jm�no na %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "p�ihla�ovac� jm�no je p��li� dlouh�.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "JM�NO je p��li� dlouh�"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "p�ihla�ovac� jm�no nesm� za��nat '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "p��li� mnoho znak� LF\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "P��LI� mnoho znak� LF"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Vypr�el �asov� limit (%d sekund) pro p�ihl�en�.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Posledn� p�ihl�en�: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBN� P�IHL��EN� U�IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "CHYBN� P�IHL��EN� U�IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "PO�ET CHYBN�CH P�IHL��EN� U�IVATELE %3$s Z %2$s: %1$d"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "PO�ET CHYBN�CH P�IHL��EN� U�IVATELE %3$s NA TTY %2$s: %1$d"
@@ -6869,164 +6682,30 @@ msgstr "p��jem zpr�v je vypnut\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Pou�it�: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Kdo jste?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: ��dn� takov� skupina neexistuje."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: P��stup odm�tnut"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "��dn� shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Heslo mus� obsahovat alespo� 6 znak�, zkuste to znovu.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Nem��ete op�t pou��t star� heslo.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Nepou��vejte, jako heslo Va�e u�ivatelsk� jm�no ani nic n�co podobn�ho.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Nepou��vejte, jako heslo Va�e skute�n� jm�no ani nic n�co podobn�ho.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Pou�it�: password [u�ivatelsk� jm�no [heslo]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Pouze superu�ivatel m��e pou��t argumenty.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Pou�it�: passwd [foqsvV] [u�ivatel [heslo]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s nelze spustit: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "P�ihla�ovac� jm�no nelze nal�zt"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Pouze superu�ivatel m��e zm�nit hesla jin�m u�ivatel�m.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "P��li� mnoho argument�.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "U�ivatelsk� jm�no nelze nal�zt. Je `%s' opravdu u�ivatelem?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Lituji, ale mohu zm�nit pouze m�stn� hesla. Pou�ijte yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID a u�ivatelsk� jm�no se neshoduj�!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "M�n�m heslo u�ivatele %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Zadejte star� heslo: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Nepovolen� heslo."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Zadejte nov� heslo: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Heslo nebylo zm�n�no."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Potvr�te nov� heslo: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "P�epsal jste se. Heslo nebylo zm�n�no."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "heslo bylo zm�n�no, u�ivatel %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "HESLO U�IVATELE ROOT BYLO ZM�N�NO"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "heslo zm�n�no u�ivatelem root, u�ivatel %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "Vol�m setpwnam pro nastaven� hesla.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Heslo *NEBYLO* zm�n�no. Zkuste to pozd�ji.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Heslo bylo zm�n�no.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7073,7 +6752,6 @@ msgstr "%s u�ivatelem %s: %s"
 msgid "halted by %s: %s"
 msgstr "%s u�ivatelem %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7110,7 +6788,6 @@ msgstr "Spou�t�m program \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Chyba p�i spu�t�n�\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7203,7 +6880,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "chyba p�i b�hu z�v�re�n�ho programu\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "vol�n� fork pro z�v�re�n� program selhalo\n"
@@ -7232,7 +6908,7 @@ msgstr "adres�� nelze otev��t\n"
 msgid "fork failed\n"
 msgstr "vol�n� fork selhalo\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "vol�n� exec selhalo\n"
 
@@ -7381,12 +7057,6 @@ msgstr "chybn� hodnota pro m�s�c: pou�ijte 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "chybn� hodnota pro rok: pou�ijte 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7397,13 +7067,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Pou�it�: cal [mjyV] [[m�s�c] rok]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Pou�it�: %s [+form�t] [den m�s�c rok]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Den svat�ho Tiba"
 
@@ -7536,7 +7205,7 @@ msgstr "%s: %s nelze p�ejmenovat na %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Pou�it�: %s z na soubory...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7547,22 +7216,22 @@ msgstr ""
 "Pokud jej opravdu chcete pou��t, tak zadejte `%s [p�ep�na�e] %s'.\n"
 "Script nebyl spu�t�n.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, fuzzy, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Pou�it�: script [-a] [-f] [-q] [soubor]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spu�t�n. Soubor je %s.\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu�t�n %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7571,254 +7240,253 @@ msgstr ""
 "\n"
 "Script ukon�en %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "vol�n� openpty selhalo\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Nejsou ��dn� dal�� voln� pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Chybn� p�ep�na�, pou�it�\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term n�zev termin�lu]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ atribut ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file soubor pro ulo�en� ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvence ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "�et��c� re�im nelze vypnout/zapnout\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "chyba klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Chyba p�i �ten� %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Chyba p�i ukl�d�n� obrazu obrazovky\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "nelze ��st %s a nelze prov�st dump pomoc� vol�n� ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: prom�nn� TERM nen� nastavena.\n"
@@ -7893,10 +7561,6 @@ msgstr "varov�n�: %s nelze otev��t: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s nelze otev��t - pou��v�m %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8196,81 +7860,72 @@ msgstr "mount: %s nelze pro nastaven� rychlosti otev��t"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: vol�n� fork selhalo: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: tato verze byla p�elo�ena bez podpory pro typ `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: chyba s nfs mount verze 4, zkou��m verzi 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: typ syst�mu soubor� nebyl zad�n a ani jej nelze zjistit"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: mus�te zadat typ syst�mu soubor�"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: p�ipojen� se nezda�ilo"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: p��pojn� bod %s nen� adres��em"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: p��stup odm�tnut"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount m��e pou��vat pouze superu�ivatel"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji� p�ipojeno"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji� p�ipojeno"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s je ji� p�ipojeno, �i je %s ji� pou��v�no"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: p��pojn� bod %s neexistuje"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: p��pojn� bod %s je symbolick�m odkazem, jen� nikam neukazuje"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speci�ln� za��zen� %s neexistuje"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8279,12 +7934,12 @@ msgstr ""
 "mount: speci�ln� za��zen� %s neexistuje\n"
 "              (n�zev cesty neza��n� adres��em)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s je�t� nen� p�ipojeno �i chybn� p�ep�na�"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8293,70 +7948,69 @@ msgstr ""
 "mount: chybn� typ ss, chybn� p�ep�na�, chybn� superblok na %s\n"
 "       nebo p��li� mnoho p�ipojen�ch syst�m� soubor�"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabulka p�ipojen� je pln�"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze p�e��st"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: blokov� za��zen� %s je nezn�m�"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   vypsat zn�m� typy syst�m� soubor�"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravd�podobn� jste myslel %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mo�n� jste myslel iso9660 ?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mo�n� jste myslel iso9660 ?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s m� chybn� ��slo za��zen�, �i ss typ %s nen� podporov�n"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s nen� blokov�m za��zen�m a vol�n� stat selhalo?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8364,71 +8018,66 @@ msgid ""
 msgstr ""
 "mount: j�dro nerozpoznalo %s jako blokov� za��zen� (mo�n� `insmod ovlada�'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s nen� blokov�m za��zen�m (mo�n� pom��e `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s nen� blokov�m za��zen�m"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s nen� platn�m blokov�m za��zen�m"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blokov� za��zen�"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: %s%s nelze p�ipojit v re�imu pouze pro �ten�"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s je chr�n�no proti z�pisu, p�ipojuji pouze pro �ten�"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je chr�n�no proti z�pisu, p�ipojuji pouze pro �ten�"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: nebyl zad�n typ - budu pou��vat nfs kv�li dvojte�ce\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nebyl zad�n typ - budu pou��vat smbfs kv�li dvojte�ce\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozad� \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: kon��m \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji� p�ipojeno na %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8477,34 +8126,34 @@ msgstr ""
 "Dal�� p�ep�na�e: [-nfFrsvw] [-o volby].\n"
 "Dal�� informace viz man(8).\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: toto m��e prov�st pouze superu�ivatel"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytv���m jej..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ��dn� odpov�daj�c� diskov� odd�l nebyl nalezen"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: p�ipojuji %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "nebyl p�ipojen ��dn� diskov� odd�l"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nal�zt"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s nelze nal�zt v %s ani %s"
@@ -8539,98 +8188,98 @@ msgstr "       Vyzkou��m typ %s\n"
 msgid "Trying %s\n"
 msgstr "Pou��v�m %s.\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: p��li� dlouh� argument pro po��ta�:adres��\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: varov�n�: v�cen�sobn� n�zvy po��ta�� nejsou podporov�ny\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: adres�� pro p�ipojen� nen� ve tvaru po��ta�:adres��\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount:  adresu %s nelze zjistit\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: �patn� hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: p��li� dlouh� argument pro volbu\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varov�n�: nezn�m� volba pro proto=.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varov�n�: volba namlen nen� podporov�na.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametr %s=%d pro p�ipojen� nfs nen� zn�m\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varov�n�: volba nolock nen� podporov�na.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "volba %s%s pro p�ipojen� nfs je nezn�m�\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: �patn� hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS p�es TCP nen� podporov�no.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs soket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "tato slu�ba je na tomto nfs serveru nedostupn�"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "pro nalezen� NFS portu jsem pou�il portmapper\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "pou��v�m port %d pro nfs server\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "n�vratov� hodnota nfs status %d je nezn�m�"
@@ -8639,7 +8288,7 @@ msgstr "n�vratov� hodnota nfs status %d je nezn�m�"
 msgid "bug in xstrndup call"
 msgstr "chyba ve vol�n� xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8652,7 +8301,7 @@ msgstr ""
 "         %s [-v] [-p priorita] zvl�tn� soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8664,141 +8313,139 @@ msgstr ""
 "         %s [-v] [-p priorita] zvl�tn� soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: \"_stext\" nelze v %s nal�zt\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: vol�n� stat pro %s selhalo: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: varov�n�: p��stupov� pr�va pro %s (%04o) nejsou bezpe�n�, pou�ijte %"
 "04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: soubor %s vynech�v�m - zd� se, �e v n�m jsou d�ry.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s nelze otev��t: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl p�elo�en bez podpory pro -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: vol�n� fork selhalo: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "po��ta�: %s, adres��: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: adresu %s nelze zjistit\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: chybn� hodnota hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokov� za��zen� %s je chybn�"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s nen� p�ipojeno"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: za��zen� %s je ji� pou��v�no"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze naj�t"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: mus�te b�t superu�ivatelem, abyste mohl odpojit %s"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokov� za��zen� nejsou na syst�mu soubor� povolena"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkou��m umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s nelze odpojit - zkou��m %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je ji� pou��v�no - znovu p�ipojeno v re�imu pro pouze �ten�\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s nelze znovu p�ipojit v re�imu pouze pro �ten�\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam syst�m� soubor� na odpojen� nelze nal�zt"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8809,48 +8456,47 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
 "         umount [-f] [-r] [-n] [-v] speci�ln� soubor | uzel...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "%s nelze otev��t.\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkou��m odpojit %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab naj�t\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab nen� %s p�ipojeno"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: zd� se, �e %s je p�ipojeno v�ce ne� jednou"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s nen� ve fstab (a Vy nejste root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: p�ipojen� %s neodpov�d� fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze u�ivatel %s m��e odpojit %s ze %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: toto m��e prov�st pouze u�ivatel root"
 
@@ -9006,7 +8652,7 @@ msgstr "%s: nezn�m� sign�l %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9175,8 +8821,6 @@ msgstr "j�dro nepodporuje sd�lenou pam�\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Omezen� pro sd�lenou pam� --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -9953,17 +9597,17 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_soubor] [-n d�lka] [-s vzd�lenost] "
 "[soubor ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Pou�it�: %s [-dflpcsu] [+��slo ��dku | +/vzorek] n�zev1 n�zev2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: nezn�m� sign�l %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9974,8 +9618,7 @@ msgstr ""
 "*** %s je adres�� ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9986,47 +9629,47 @@ msgstr ""
 "***** %s nen� textov�m souborem *****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Stiskn�te q �i Q pro ukon�en�]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Pokra�ov�n�--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Dal�� soubor: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Stiskn�te mezern�k pro pokra�ov�n�, 'q' pro ukon�en�.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, fuzzy, c-format
 msgid "...back %d pages"
 msgstr "...p�eskakuji zp�t o po�et stran: %d"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 #, fuzzy
 msgid "...back 1 page"
 msgstr "...p�eskakuji zp�t o po�et stran: %d"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...p�eskakuji o po�et ��dk�: %d"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...p�eskakuji o po�et ��dk�: %d"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10035,7 +9678,7 @@ msgstr ""
 "\n"
 "***Zp�t***\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10048,7 +9691,7 @@ msgstr ""
 "jsou v hranat�ch z�vork�ch. Hv�zdi�ka (*) znamen�, �e hodnota argumentu se\n"
 "stane implicitn�.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 #, fuzzy
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
@@ -10094,34 +9737,34 @@ msgstr ""
 ":f\t\t\tVyp��e jm�no aktu�ln�ho souboru a ��slo aktu�ln�ho ��dku\n"
 ".\t\t\tZopakuje p�edch�zej�c� p��kaz\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Stiskn�te 'h' pro n�pov�du.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" ��dek %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Nejedn� se o soubor] ��dek %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  P�ete�en�\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...vynech�v�m\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Chyba v regul�rn�m v�razu"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10129,15 +9772,15 @@ msgstr ""
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "vol�n� fork selhalo\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10145,21 +9788,21 @@ msgstr ""
 "\n"
 "...Vynech�v�m "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...P�ech�z�m "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "zp�t na soubor "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Neexistuje ��dn� p��kaz, jen� by bylo mo�no nahradit"
 
@@ -10212,98 +9855,95 @@ msgstr "hexdump: chybn� form�t {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: chybn� znak v konverzi %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "p�ep�na� `%s' vy�aduje argument\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Chybn� kl�vesa"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...vynech�v�m\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...vynech�v�m\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(Dal�� soubor: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Nejsou definov�ny ��dn� diskov� odd�ly\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: chyba z�pisu na %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: chyba z�pisu na %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: do�asn� soubor nelze ��st.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", chyba"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s nelze otev��t.\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "odesl�n�"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Heslo *NEBYLO* zm�n�no. Zkuste to pozd�ji.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Dal�� soubor: %s)"
@@ -10358,6 +9998,152 @@ msgstr "Vstupn� ��dka je p��li� dlouh�.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Nedostatek pam�ti pro rostouc� buffer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Chybn� ��slo: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaktick� chyba: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Chybn� argument: '%s'\n"
+
+#, fuzzy
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "Pou�it�: %s [ -p ] n�zev za��zen�\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "         %s [ -p ] za��zen� velikost sekt hlavy stopy stretch gap "
+#~ "rychlost\n"
+#~ "         spec1 fmt_gap\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "         %s [ -c | -y | -n | -d ] za��zen�\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "         %s [ -c | -y | -n ] za��zen�\n"
+
+#~ msgid "version"
+#~ msgstr "verze"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom nelze otev��t"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "n�hodn� data z /dev/urandom nelze ��st"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s pro �ten� nelze otev��t"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "vol�n� stat(%s) selhalo"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s m� chybn� p��stupov� pr�va"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "data z %s nelze ��st"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Ji� je p�ihl�eno p��li� mnoho u�ivatel�.\n"
+#~ "Zkuste to op�t pozd�ji.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "M�te spu�t�no p��li� mnoho proces�.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Heslo mus� obsahovat alespo� 6 znak�, zkuste to znovu.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Nem��ete op�t pou��t star� heslo.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Nepou��vejte, jako heslo Va�e u�ivatelsk� jm�no ani nic n�co podobn�ho.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Nepou��vejte, jako heslo Va�e skute�n� jm�no ani nic n�co podobn�ho.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Pou�it�: password [u�ivatelsk� jm�no [heslo]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Pouze superu�ivatel m��e pou��t argumenty.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Pou�it�: passwd [foqsvV] [u�ivatel [heslo]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s nelze spustit: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "P�ihla�ovac� jm�no nelze nal�zt"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Pouze superu�ivatel m��e zm�nit hesla jin�m u�ivatel�m.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "P��li� mnoho argument�.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "U�ivatelsk� jm�no nelze nal�zt. Je `%s' opravdu u�ivatelem?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Lituji, ale mohu zm�nit pouze m�stn� hesla. Pou�ijte yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID a u�ivatelsk� jm�no se neshoduj�!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "M�n�m heslo u�ivatele %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Zadejte star� heslo: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Nepovolen� heslo."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Zadejte nov� heslo: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Heslo nebylo zm�n�no."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Potvr�te nov� heslo: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "P�epsal jste se. Heslo nebylo zm�n�no."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "heslo bylo zm�n�no, u�ivatel %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "HESLO U�IVATELE ROOT BYLO ZM�N�NO"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "heslo zm�n�no u�ivatelem root, u�ivatel %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "Vol�m setpwnam pro nastaven� hesla.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Heslo *NEBYLO* zm�n�no. Zkuste to pozd�ji.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Heslo bylo zm�n�no.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: tato verze byla p�elo�ena bez podpory pro typ `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Varov�n�: ma�u diskov� odd�l za %d\n"
diff --git a/po/da.gmo b/po/da.gmo
new file mode 100644
index 000000000..ffa5756ad
--- /dev/null
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index fc3d47963..4c6a74cc4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-04 01:16+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -120,7 +120,7 @@ msgstr "%s: ioctl-fejl p� %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SST   BST   StartSekt    St�rr.  Enhed\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "brug:\n"
@@ -164,13 +164,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "brug: %s [ -n ] enhed\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s fra %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -195,7 +194,7 @@ msgstr "Dobbelt"
 msgid "Single"
 msgstr "Enkelt"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -210,98 +209,98 @@ msgstr ""
 " -v         vis flere meddelelser\n"
 " file       fil der skal tjekkes\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fejl %d under udpakning! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: st�rrelsesfejl i symbolsk l�nke '%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  udpakker blok fra %ld til %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: ugyldig tilstand p� '%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  hul ved %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Ikke-blok (%ld) byte\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Ikke-st�rrelse (%ld mod %ld) byte\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ugyldigt cramfs--forkert stil�ngde\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: ikke oversat med underst�ttelse for -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: advarsel--kunne ikke bestemme filsystemets st�rrelse \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s er hverken en blokenhed eller fil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ugyldigt cramfs--fill�ngde for kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ugyldigt cramfs--forkert magisk nummer\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: advarsel--fill�ngde for lang, er det et efterfyldt aftryk?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ugyldigt cramfs--crc-fejl\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: advarsel--gammelt cramfs-aftryk, ingen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ugyldigt cramfs--ugyldig superblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: ugyldigt cramfs--mappedata-afslutning (%ld) != fildatabegyndelse (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ugyldigt cramfs--ugyldig fildataforskydning\n"
@@ -777,7 +776,7 @@ msgstr "for mange inodes - �vre gr�nse er 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "ikke plads nok, kr�ver mindst %lu blokke"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -846,18 +845,18 @@ msgstr "fejl under skrivning af '..'-indgang"
 msgid "error closing %s"
 msgstr "Fejl under lukning af %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Brug: mkfs [-V] [-t fstype] [fs-tilvalg] enhed [st�rrelse]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Hukommelse opbrugt!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -917,7 +916,6 @@ msgstr ""
 "Overskrider MAXENTRIES.  For�g denne v�rdi i mkcramfs.c og genovers�t  "
 "Afslutter.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -973,10 +971,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "skrivning af ROM-aftryk mislykkedes (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1054,7 +1048,6 @@ msgstr "kunne ikke skrive inodes"
 msgid "write failed in write_block"
 msgstr "mislykket skrivning i write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1090,7 +1083,7 @@ msgstr "s�gning fejlede under test af blokke"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Mystiske v�rdier i do_check: sandsynligvis programfejl\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "s�gning mislykkedes i check_blocks"
 
@@ -1132,106 +1125,106 @@ msgstr "kunne ikke finde %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "vil ikke fors�ge at oprette filsystem p� '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ugyldig sidest�rrelse '%d' angivet af bruger\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Benytter bruger-bestemt sidest�rrelse %d i stedet for systemv�rdierne %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Antager sider med st�rrelsen %d (ikke %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "m�rke"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Brug: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/navn [blokke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "for mange ugyldige sider"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "en ugyldig side\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ugyldige sider\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fejl: Ingen steder at ops�tte swap?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fejl: st�rrelsen %lu er st�rre end enhedsst�rrelsen %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fejl: ukendt version %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fejl: swap-omr�de skal mindst v�re p� %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: fejl: afkorter swap-omr�det til %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: fejl: Ingen steder at ops�tte swap?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Vil ikke fors�ge at oprette swap-enhed p� '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatalt: f�rste side kan ikke l�ses"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1244,120 +1237,84 @@ msgstr ""
 "opretter en v0 swap. Ingen swap oprettet. Hvis du virkelig vil oprette en\n"
 "v0 swap p� denne enhed, kan du gennemtvinge det med tilvalget -f.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kunne ikke klarg�re swap-omr�de: ul�seligt"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Klarg�rer swap-omr�de version %d, st�rrelse = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kunne ikke spole tilbage p� swap-enheden"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kunne ikke skrive signatur-side"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync mislykkedes"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ugyldigt tal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaksfejl: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ingen s�dan parameter sat: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] enh navn\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] enh str sekt hoveder spor str�k gab rate spec1 fmt_gab\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] enh\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] enh\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Ubrugelig"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Frit omr�de"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken er blevet udskiftet.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Genstart systemet for at sikre, at partitionstabellen er opdateret korrekt.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1370,327 +1327,308 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "�ndret DOS 6.x partitioner.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATAL FEJL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Tryk en tast for at afslutte cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Kan ikke s�ge p� drev"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Kan ikke l�se drev"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Kan ikke skrive p� drev"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "For mange partitioner"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partition starter f�r sektor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partition slutter f�r sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partition starter efter slut-p�-disk"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partition slutter efter slut-p�-disk"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutter i den sidste partialcylinder"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logiske partitioner ikke i disk-r�kkef�lge"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logisk partitions-overlap"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "forst�rret logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Intern fejl under oprettelse af logisk drev uden udvidet partition !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan ikke oprette logisk drev her -- ville resultere i to udvidede partitioner"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menupunkt for langt. Menu ser muligvis m�rkeligt ud."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu uden retning. V�lger standarden horisontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Ugyldig tast"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Tryk en tast for at forts�tte"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Prim�r"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Opret en ny prim�r partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Opret en ny logisk partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Opret ikke partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Intern fejl !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "St�rrelse (i MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Begyndelse"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Tilf�j partition i starten af det frie omr�de"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Slut"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Tilf�j partition i slutningen af det frie omr�de"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ikke plads til at oprette udvidet partition"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabel.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabel. Starter med nulstillet tabel."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Ugyldig signatur i partitionstabel"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Ukendt partitionstabel-type"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vil du starte med nulstillet tabel [j/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav flere cylindre end der kan v�re p� disken"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan ikke �bne drev"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "�bnede drev skrivebeskyttet - du har ikke adgang til at skrive"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan ikke f� diskst�rrelsen"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Ugyldig prim�rpartition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Ugyldig logisk partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Advarsel!! Dette �del�gger muligvis data p� din disk!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Er du sikke p�, at du vil skrive partitionstabellen til disken? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Skrev ikke partitionstabellen til disken"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Skriv venligst 'ja' eller 'nej'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabel til disken..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabel til disken"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabel, men genindl�sning mislykkedes. Genstart for at "
 "opdatere tabellen."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ingen prim�rpartitioner er markeret opstartbar. DOS MBR vil ikke kunne "
 "starte op."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Da flere prim�rpartitioner er opstartbare, vil DOS MBR ikke kunne starte op."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Angiv filnavn eller tryk RETUR for at vise p� sk�rmen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan ikke �bne filen '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Drev: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ingen  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Prim�r"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisk "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Opstart"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabel for %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               F�rste      Sidst\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1698,7 +1636,7 @@ msgstr ""
 " # Type       Sektor      Sektor   forskydn. L�ngde   Filsystem  Type (ID) "
 "Flag\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1706,465 +1644,462 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Starter---       ----Ender----     Start     Antal\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flag  Hovd Sekt Cyl   ID  Hovd Sekt Cyl     Sektor    Sektorer\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "R�"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Vis tabellen i r�tdata format"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Vis tabellen ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Vis kun partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Vis ikke tabellen"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hj�lpesk�rm for cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dette er cfdisk, et curses-baseret diskpartitionerings-program, som"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "lader dig oprette, slette eller modificere partitioner p� din"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "harddisk."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Kommando     Betydning"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Slet partitionen"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Ret cylinder, hoved, sektorer-per-spor parametre"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ADVARSEL: Denne kommando b�r kun bruges af folk, der"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             er klar over, hvad de g�r."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Vis denne sk�rm"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksim�r partitionens diskforbrug"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bem�rk: Dette kan g�re partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Opret ny partition i frit omr�de"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Udl�s partitionstabellen til sk�rmen eller en fil"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Der er flere forskellige formater p� partitionen,"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             som du kan v�lge mellem:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - R�data (n�jagtig de, som ville skrives p� disken)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel i r�data format"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Afslut program uden at skrive partitionstabellen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Skift filsystem type"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Skift enhed for visning af partitionsst�rrelser"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Skifter mellem MB, sektorer og cylindre"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Skriv partitionstabellen til disk (skal v�re stort W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Siden dette kan �del�gge data p� disken, skal du enten"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             bekr�fte eller afvise ved at skrive henholdsvis 'ja'"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             eller 'nej'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pil op       Flyt mark�ren til forrige partition"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pil ned      Flyt mark�ren til n�ste partition"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Gentegner sk�rmen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Vis denne sk�rm"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bem�rk: Alle kommandoerne kan angives med enten store eller sm�"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "bogstaver (undtagen W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindre"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Skift cylindergeometri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Hoveder"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Skift hovedgeometri"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Skift sektorgeometri"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "F�rdig"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "F�rdig med geometri�ndring"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Angiv antallet af cylindre: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ugyldigt cylinderantal"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Angiv antallet af hoveder: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ugyldig hovedantal"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Angiv antallet af sektorer per spor: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ugyldig sektorantal"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Angiv filsystemtype: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan ikke �ndre filsystemtype til tom"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan ikke �ndre filsystemtype til udvidet"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ukendt (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Drev: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "St�rrelse: %lld byte, %lld Mb"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "St�rrelse: %lld byte, %lld.%lld Gb"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Navn"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part-type"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Fs-type"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[M�rkat]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindre"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  St�rrelse (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  St�rrelse (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Opstartbar"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Slet"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Slet partitionen"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Skift diskgeometri (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hj�lp"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Vis hj�lpesk�rm"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksim�r"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksim�r diskforbruget for partitionen (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Opret ny partition i frit omr�de"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Udl�s"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Udl�s partitionstabellen til sk�rmen eller til en fil"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Afslut"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Afslut program uden at �ndre partitionstabellen"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enheder"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen til disk (dette kan �del�gge data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan ikke g�re denne partition opstartbar"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan ikke slette en tom partition"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan ikke maksimere denne partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Denne partition er ubrugelig"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Denne partition er allerede i brug"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan ikke �ndre en tom partitions type"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Ikke flere partitioner"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Ugyldig kommando"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2235,9 +2170,9 @@ msgstr ""
 "\n"
 "BSD-m�rkat for enhed: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Kommando beskrivelse"
 
@@ -2257,10 +2192,9 @@ msgstr "   i    installer opstarts-igangs�tter ('bootstrap')"
 msgid "   l   list known filesystem types"
 msgstr "   l    vis liste over filsystemtyper"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m    vis denne menu"
 
@@ -2272,14 +2206,14 @@ msgstr "   n    tilf�j en ny BSD-partition"
 msgid "   p   print BSD partition table"
 msgstr "   p    vis BSD-partitionstabel"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q    afslut uden at gemme �ndringerne"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r    return�r til hovedmenuen"
 
@@ -2322,13 +2256,13 @@ msgstr "Der er ingen *BSD-partitioner p� %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-diskm�rkat kommando (m for hj�lp): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "F�rste %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sidste %s eller +st�rrelse eller +st�rrelseM eller +st�rrelseK"
@@ -2373,8 +2307,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " fjlsekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2475,8 +2407,8 @@ msgstr "sektorer/spor"
 msgid "tracks/cylinder"
 msgstr "spor/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindre"
 
@@ -2533,7 +2465,7 @@ msgstr "Opstarts-igangs�tter installeret p� %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maksimale antal partitioner er blevet oprettet\n"
@@ -2557,7 +2489,7 @@ msgstr ""
 "\n"
 "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2577,7 +2509,7 @@ msgstr ""
 "-u: angiv start og slut som sektornumre (i stedet for cylindernumre)\n"
 "-b 2048: (for visse MO-drev) brug sektorer p� 2048 byte\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2593,198 +2525,184 @@ msgstr ""
 " eller: fdisk /dev/rd/c0d0  eller: fdisk /dev/ida/c0d0  (for RAID-enheder)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kunne ikke l�se %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kunne ikke s�ge til %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kunne ikke skrive %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislykkedes p� %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kunne ikke allokere mere hukommelse\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fatal fejl\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a    skift et skrivebeskyttelses-flag"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b    skift bsd-diskm�rkat"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c    skift mont�rbart-flag"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d    slet en partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l    vis liste over kendte partitionstyper"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n    tilf�j en ny partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    opret en ny, tom DOS-partitionstabel"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p    vis partitionstabellen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    opret en ny, tom Sun-diskm�rkat"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t    skift system-id for en partition"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u    skift enheder for visning/indtastning"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v    verific�r partitionstabellen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w    skriv partitionstabel til disk og afslut"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    ekstra funktionalitet (kun for eksperter)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a    v�lg en opstartbar partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b    redig�r indgang i opstartsfil"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c    v�lg sgi swap-partition"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a    skift opstartbar-flaget"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    skift DOS-kompatilitets-flaget"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    �ndr antallet af alternative cylindre"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c    �ndr antallet af cylindre"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    vis r�dataene fra partitionstabellen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    �ndr antallet af ekstra sektorer per cylinder"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h    �ndr antallet af hoveder"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   �ndr interleavefaktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    �ndr rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s    �ndr antallet af sektorer/spor"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   �ndr antallet af fysiske cylindre"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    flyt starten p� data i en partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e    vis udvidede partitioner"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    opret en IRIX (SGI) partitionstabel"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f    ordn partitionsr�kkef�lgen"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Du skal angive"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2793,11 +2711,11 @@ msgstr ""
 "%s%s.\n"
 "Dette kan du g�re fra menuen 'Ekstra funktioner'.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " og "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2816,29 +2734,29 @@ msgstr ""
 "2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
 "   (Bl.a. DOS FDISK og OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ugyldig forskydning i prim�r udvidet partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Advarsel: ekstra l�nkepeger (link pointer) i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2851,17 +2769,17 @@ msgstr ""
 "indhold naturligvis ikke genskabes\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bem�rk: sektorst�rrelsen er %d (ikke %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2870,7 +2788,7 @@ msgstr ""
 "Denne disk har b�de magiske numre for DOS \n"
 "BSD. Brug 'b'-kommandoen for at g� i BSD-tilstand.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2879,17 +2797,17 @@ msgstr ""
 "Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
 "eller OSF-diskm�rkat.\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Intern fejl\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerer ekstra udvidet partition %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2898,7 +2816,7 @@ msgstr ""
 "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
 "'w' (skriv)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2907,83 +2825,83 @@ msgstr ""
 "\n"
 "fik filslut (EOF) tre gange - afslutter..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-kode (tryk L for en liste over koderne): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standard %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Bruger standardv�rdi %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "V�rdi udenfor omr�det.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advarsel: partition %d er af typen 'tom'\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d er valgt\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partitioner defineret!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle prim�re partitioner er allerede definerede!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Skifter enheder for visning/indtastning til %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatilitetsflag er sat\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatilitetsflag er ikke sat\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d eksisterer ikke endnu!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2996,7 +2914,7 @@ msgstr ""
 "er nok uklogt. Du kan slette en partition med\n"
 "'d'-kommandoen.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3005,7 +2923,7 @@ msgstr ""
 "Du kan ikke �ndre en partition mellem at v�re udvidet eller ikke-udvidet\n"
 "Slet den f�rst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3016,7 +2934,7 @@ msgstr ""
 "SunOS/Solaris forventer det og selv Linux foretr�kker det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3027,52 +2945,52 @@ msgstr ""
 "og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "�ndrede systemtypen for partition %d til %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d har forskellig fysisk/logisk begyndelse (ikke-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i starter ikke p� en cylinder-gr�nse:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "burde v�re (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutter ikke p� en cylindergr�nse.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "burde v�re (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3081,7 +2999,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld Mb, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3090,17 +3008,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld Gb, %lld byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d hoveder, %d sektorer/spor, %d cylindre"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", i alt %llu sektorer"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3109,7 +3027,7 @@ msgstr ""
 "Enheder = %s af %d * %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3118,7 +3036,7 @@ msgstr ""
 "Intet at g�re. R�kkef�lgen er allerede korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3126,16 +3044,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Start         Slut     Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Enhed"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3144,7 +3062,7 @@ msgstr ""
 "\n"
 "Partitionstabellens indgange er ikke i disk-r�kkef�lge\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3155,84 +3073,84 @@ msgstr ""
 "Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF Hvd Sek  Cyl Hvd Sek  Cyl     Start      Str. ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advarsel: partition %d indeholder sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: hovedet %d er st�rre end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: sektor %d er st�rre end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitionerne %d: cylinder %d st�rre end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partition %d: forrige sektorer %d stemmer ikke med totalen %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Advarsel: ugyldig start-p�-data i partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advarsel: partition %d overlapper med partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logisk partition %d ikke fuldst�ndigt indenfor partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Det totale antal allokerede sektorer %d er st�rre end de maksimale %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld ikke-allokerede sektorer\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partition %d er allerede defineret. Slet den f�r du tilf�jer den igen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Ingen tilg�ngelige frie sektorer\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3245,22 +3163,22 @@ msgstr ""
 "\ttilf�je DOS-partitioner. (Brug o.)\n"
 "\tADVARSEL: Dette vil �del�gge diskens nuv�rende indhold.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Du m� f�rst slette en partition og tilf�je en udvidet partition\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Samtlige logiske partitioner er i brug\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Tilf�jer en prim�rpartition\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3271,20 +3189,20 @@ msgstr ""
 "   %s\n"
 "   p    prim�r partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l    logisk (5 eller derover)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e    udvidet"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ugyldigt partitionsnummer for type '%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3293,12 +3211,12 @@ msgstr ""
 "Partitionstabellen er �ndret!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kalder ioctl() for at genindl�se partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3311,7 +3229,7 @@ msgstr ""
 "Denne kerne bruger stadig den gamle tabel.\n"
 "Den nye tabel vil blive brugt fra n�ste genstart.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3324,74 +3242,74 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "�ndret DOS 6.x partitioner.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataomr�de\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Ny begyndelse p� data"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Ekspert kommando (m for hj�lp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: s�tter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denne kerne finder selv sektorst�rrelser - tilvalget -b ignoreres\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3400,17 +3318,16 @@ msgstr ""
 "Advarsel: tilvalget -b (angiv sektorst�rrelse) kr�ver angivelse af disk-"
 "enhed\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Detekterede et OSF/1 diskm�rkat p� %s. G�r i diskm�rkat-tilstand.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Kommando (m for hj�lp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3419,16 +3336,16 @@ msgstr ""
 "\n"
 "Den nuv�rende opstartfil er: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet p� den ny opstartsfil: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil u�ndret\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3495,15 +3412,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux' egen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3581,7 +3498,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u st�rrelse%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3638,7 +3554,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Der er mere end �n fuldst�ndig diskindgang.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ingen partitioner defineret\n"
@@ -3723,7 +3639,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valgt et ikke-standard navn p� opstartsfilen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3743,11 +3658,10 @@ msgstr ""
 "Kun \"SGI volume\" hele-disk-sektionen kan bryde dette.\n"
 "Skriv JA, hvis du er sikker p�, at du vil m�rke partitionen anderledes.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3821,44 +3735,43 @@ msgstr "Fors�ger at bibeholde parametrene for partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tL�NGDE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Tom"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekt"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3872,12 +3785,12 @@ msgstr ""
 "eller gennemtvinge et helt nyt m�rkat.\n"
 "(s-kommandoen i hovedmenuen\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Autokonfigurering fandt en %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3890,7 +3803,7 @@ msgstr ""
 "naturligvis ikke kunne genskabes.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3900,72 +3813,72 @@ msgstr ""
 "   ?   autokonfigurering\n"
 "   0   brugerangivet (med maskinens fundne standardv�rdier)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "V�lg type (? for auto.�0 for brugerangivet): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Autokonfigurering mislykkedes.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektorer/spor"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysiske cylindre"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Interleavefaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Ekstra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Du kan �ndre alle diskparametrene fra x-menuen"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux' egen"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d slutter ikke p� en cylinder-gr�nse\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d overlapper med andre i sektorerne %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ubenyttet hul - sektorerne 0�%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ubenyttet hul - sektorerne %d�%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3974,7 +3887,7 @@ msgstr ""
 "Disken er allerede helt udfyldt med andre partitioner.\n"
 "Slet eller formindsk nogen af dem, f�r du pr�ver igen.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3985,7 +3898,7 @@ msgstr ""
 "%d %s d�kker en anden partition. Din indgang er blevet �ndret til\n"
 "%d %s \n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3994,7 +3907,7 @@ msgstr ""
 "Hvis du vil beholde SunOS/Solaris-kompatilitet, b�r du beholde denne\n"
 "partition som 'Whole disk' (5), der begynder p� 0, med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4008,7 +3921,7 @@ msgstr ""
 "og opstartsblok. Skriv JA hvis du er helt sikker p�, at du vil\n"
 "markere den partition som Linux swap (82): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4027,7 +3940,7 @@ msgstr ""
 "Enheder = %s � %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4040,16 +3953,16 @@ msgstr ""
 "Enheder = %s � %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Antal alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Antal fysiske cylindre"
 
@@ -4073,32 +3986,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Udvidet"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX opstartbar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Opstartsh�ndtering"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4107,7 +4014,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4200,12 +4106,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4226,8 +4130,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4237,7 +4139,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD eller SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4258,12 +4159,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Gammel Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / gammel Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4293,12 +4192,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad dvale"
@@ -4307,7 +4204,6 @@ msgstr "IBM Thinkpad dvale"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4373,30 +4269,22 @@ msgstr "Ikke-filsystemdata"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell V�rkt�j"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4405,116 +4293,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC opstart"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekund�r"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "s�gefejl p� %s - kunne ikke s�ge til %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "s�gefejl: �nskede 0x%08x%08x, fik 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "l�bet t�r for hukommelse - opgiver\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "l�sefejl p� %s - kunne ikke l�se sektor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEJL: sektor %lu har ikke en MSDOS-signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivefejl p� %s - kan ikke skrive sektor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kunne ikke �bne partitionssektor-redningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivefejl p� %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kunne ikke finde partitions-genskabelsesfil (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitions-genskabelsesfil har forkert st�rrelse - genskaber ikke\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "l�bet t�r for hukommelse?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan ikke �bne partitions-genskabelsesfilen (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fejl under l�sning af %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan ikke �bne enheden %s for skrivning\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fejl ved skrivning af sektor %lu p� %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan ikke bestemme geometrien\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan ikke bestemme st�rrelsen\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4525,22 +4406,22 @@ msgstr ""
 "hel disk. Brug af fdisk p� den er sikkert meningsl�st.\n"
 "[Brug tilvalget --force hvis du virkelig gerne vil]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Advarsel: HDIO_GETGEO siger,at der er %lu hoveder\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Advarsel: HDIO_GETGEO siger, at der er %lu sektorer\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Advarsel: BLKGETSIZE/HDIO_GETGEO siger, at der er  %lu cylindre\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4549,7 +4430,7 @@ msgstr ""
 "Advarsel: usandsynligt antal sektorer (%lu) - normalt h�jst 63\n"
 "Dette vil give problemer med al programmel, der bruger C/H/S-adressering.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4558,14 +4439,14 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s for partition %s har umulig hoved-v�rdi: %lu (burde v�re mellem 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4573,7 +4454,7 @@ msgid ""
 msgstr ""
 "%s for partition %s har umulig sektor-v�rdi: %lu (burde v�re mellem 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4582,7 +4463,7 @@ msgstr ""
 "%s for partition %s har umulig cylinder-v�rdi: %lu (burde v�re mellem 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4591,12 +4472,12 @@ msgstr ""
 "Id  Navn\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Genindl�ser partitionstabel ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4604,31 +4485,31 @@ msgstr ""
 "Kommandoen for genindl�sning af partitionstabellen mislykkedes\n"
 "Genstart dit system nu, f�r du formatterer med mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ingen s�dan partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ukendt format - benyttet sektorer\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabel for %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "ikke-implementeret format - benytter %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4637,12 +4518,12 @@ msgstr ""
 "Enheder = cylindre � %lu byte, blokke � 1024 byte, t�ller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start     Slut  #cyldr. #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4651,12 +4532,12 @@ msgstr ""
 "Enheder = sektorer � 512 byte, t�ller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhed  Opstart Start       Slut  #sektorer Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4665,12 +4546,12 @@ msgstr ""
 "Enheder = blokke � 1024 byte, t�ller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhed  Opstrt Start       Slut   #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4679,31 +4560,31 @@ msgstr ""
 "Enheder = megabyte � 1048576 byte, blokke � 1024 byte, fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start   Slut   MiB    #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutter p� cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Fandt ingen partitioner\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4714,51 +4595,51 @@ msgstr ""
 "   til C/H/S=*/%ld/%ld (i stedet for %ld/%ld/%ld).\n"
 "I denne visning vil jeg g� ud fra denne geometri.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "der er ingen partitionstabel.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "m�rkeligt, kun %d partitioner er defineret.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Advarsel: partition %s har st�rrelsen 0, men er ikke markeret tom\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Advarsel: partition %s har st�rrelsen 0, men er opstartbar\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Advarsel: partition %s har st�rrelsen 0, men starter ikke i 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Advarsel: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "indeholdes ikke i partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Advarsel: partitionerne %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "og %s overlapper hinanden\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4768,17 +4649,17 @@ msgstr ""
 "lu),\n"
 "og vil �del�gge denne, n�r der skrives til partitionen.\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Advarsel: partition %s starter i sektor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Advarsel: partition %s n�r ud over diskens slutning\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4786,17 +4667,17 @@ msgstr ""
 "Kun �n af prim�rpatitionerne m� v�re udvidet\n"
 " (dette er dog ikke noget problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Advarsel: partition %s starter ikke p� en cylindergr�nse\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Advarsel: partition %s slutter ikke p� en cylindergr�nse\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4805,7 +4686,7 @@ msgstr ""
 "Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
 "disk.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4813,7 +4694,7 @@ msgstr ""
 "Advarsel: normalt kan man kun starte op fra prim�rpartitioner\n"
 "LILO ignorerer opstartbar flaget.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4821,33 +4702,33 @@ msgstr ""
 "Advarsel: ingen prim�rpartition er markeret opstartbar (aktiv)\n"
 "Det generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: start: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: end: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutter p� cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4856,7 +4737,7 @@ msgstr ""
 "Advarsel: �ndrede starten p� udvidet partition fra %ld til %ld\n"
 "(Vedr�rer kun oplistningen. �ndrer ikke indholdet.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4864,134 +4745,133 @@ msgstr ""
 "Advarsel: udvidet partition starter ikke p� en cylindergr�nse.\n"
 "DOS og Linux vil opfatte indholdet forskelligt.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "for mange partitioner - ignorerer dem efter nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "tr� med partitioner?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "fandt Disk Manager - kan ikke h�ndtere s�dan en\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "fandt DM6 signatur - opgiver\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "m�rkeligt... en udvidet partition med st�rrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "m�rkeligt..., en BSD-partition med st�rrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ukendt partitionstabeltype\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flaget -n blev givet: Intet �ndret\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "lang eller uafsluttet inddatalinje - afbryder\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "inddatafejl: forventer '=' efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ukendt inddata: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "tal for stort\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "uvedkommende tegn efter tallet\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ikke plads til partitionsbeskrivelse\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "for mange inddatafelter\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Ikke plads til mere\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Ugyldig type\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Advarsel: den angiven st�rrelse(%lu) overstiger den maksimalt tilladte (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Advarsel: tom partition\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advarsel: ugyldigt partitionsbegyndelse (tidligst %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ukendt opstartbar-flag,  v�lg - eller *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "delvis c,h,s-specifikation?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Udvidet partition ikke hvor den forventedes\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ugyldige inddata\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "for mange partitioner\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5001,47 +4881,43 @@ msgstr ""
 "<start> <st�rr> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Du beh�ver normalt kun at angive <start> og <st�rr> (og m�ske <type>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "nyttige tilvalg:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: vis partitionens st�rrelse"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:        vis eller �ndr partitions-id"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:      vis hver enheds partitioner"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:      det samme, men i et format, der vil passe til "
 "senere inddata"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [eller --increment]: antal cylindre osv. fra 1 i stedet for fra 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5049,59 +4925,59 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:     indl�s/vis i enhederne sektorer/blokke/cylindre/"
 "MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:vis kendte partitionstyper"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:       DOS-kompatibilitet: spilder lidt plads"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [eller --re-read]:   lad kernen genindl�se partitionstabellen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                   ret kun partitionen med nummer #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                    undlad at skrive �ndringerne til disken"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O fil :                gem de sektorer, der overskrives, i en fil"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :                genskab disse sektorer"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]:   vis version"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:      vis denne besked"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "farlige tilvalg:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: vis kernens bud p� den geometri"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [eller --show-geometry]: vis kernens bud p� den geometri"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5109,114 +4985,114 @@ msgstr ""
 "    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
 "                                eller forvent beskrivelser af dem i inddata"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [eller --Linux]:      giv ikke r�d, der ikke vedr�rer Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:      undertryk advarsler"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan tilsides�tte den detekterede geometri med:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [eller --cylinders #]:angiv det cylinderantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [eller --heads #]:    angiv det hovedantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [eller --sectors #]:  angiv det sektorantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan undertrykke alle forenelighedstjek med:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:      g�r hvad jeg siger, selvom det er dumt"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Brug:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhed\t\t vis aktive partitioner p� enhed\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhed n1 n2 ... aktiv�r partitionerne p� n1 ..., deaktiv�r resten\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhed\t aktiv�r partition n, deaktiv�r de andre\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "ingen kommando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "i alt: %llu blokke\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "du kan kun angive �n enhed (undtagen med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kunne ikke �bne %s for skrivning\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kunne ikke �bne %s for l�sning\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: O.k.\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindre, %ld hoveder, %ld sektorer/spor\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan ikke f� st�rrelsen %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ugyldig aktiv-byte: 0x%x i stedet for 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5224,7 +5100,7 @@ msgstr ""
 "F�rdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5233,35 +5109,35 @@ msgstr ""
 "Du har %d aktive prim�rpartitioner. Dette generer ikke LILO,\n"
 "men DOS MBR vil kun kunne starte op fra en disk med �n aktiv partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x og er ikke skjult\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ugyldig id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Denne disk er i brug for �jeblikket.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal fejl: kunne ikke finde %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tjekker, at ingen benytter denne disk for �jeblikket...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5274,30 +5150,30 @@ msgstr ""
 "Afmonter alle filsystemer og 'swapoff' alle swappartitioner p� denne disk.\n"
 "Brug flaget --no-reread for at undertrykke dette tjek.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Gammel situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitionen %d eksisterer ikke. Kan ikke �ndre den\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5305,21 +5181,21 @@ msgstr ""
 "Jeg kan ikke lide disse partitioner - intet blev �ndret.\n"
 "(Hvis du virkelig �nsker det, kan du bruge flaget --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jeg kan ikke lide detteher - du b�r nok svare Nej\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Er du tilfreds med dette? [jna] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vil du virkelig skrive dette til disken? [jna] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5328,16 +5204,16 @@ msgstr ""
 "\n"
 "sfdisk: inddata sluttede for tidligt\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Afslutter - intet blev �ndret\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svar venligst j,n,a\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5346,7 +5222,7 @@ msgstr ""
 "Skrivning af ny partitionstabel lykkedes\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5445,129 +5321,129 @@ msgstr "getopt (udvidet) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "intern fejl, kontakt programm�ren."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "startede op med MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "'Ruffian' BCD-ur\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "urport justeret til 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "'funky TOY' (tid-p�-�ret)!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: momentan %s mislykkedes i 1000 iterationer!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan ikke �bne /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jeg kunne ikke f� adgang fordi jeg ikke fors�gte.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan ikke f� adgang til I/O-port: kaldet 'iopl(3)' mislykkedes.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Du beh�ver nok root-rettigheder.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Antager at maskinuret holdes i %s tid.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "GMT"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokal"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Advarsel: ukendt tredie linje i adjtime-fil\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Forventet: 'UTC' (GMT), 'LOCAL' eller ingenting.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Sidste hastighedsjustering blev gjort %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Sidste kalibrering blev foretaget %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Maskinuret er i %s-tid\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "ukendt"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Venter p� et ur-tik...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...fangede ur-tik\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ugyldige v�rdier i maskinur: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Maskinur-tid: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tid l�st fra maskinuret: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "S�tter maskinuret til %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Uret u�ndret - testede kun.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5576,7 +5452,7 @@ msgstr ""
 "Der er g�et %.6f sekunder siden referencetiden.\n"
 "Udskyder yderligere for at n� til n�ste hele sekund.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5585,22 +5461,22 @@ msgstr ""
 "Maskinurets registre indeholder v�rdier, der enten er ugyldige (f.eks. 50. "
 "dag i m�neden) eller udenfor det omr�de, vi kan h�ndtere (f.eks. �r 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekunder\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Intet --date tilvalg angivet.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "parametret til --date er for langt\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5609,22 +5485,22 @@ msgstr ""
 "V�rdien af --date tilvalget er ikke en gyldig dato.\n"
 "Mere specifikt, indeholder den anf�rselstegn.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Udf�rer 'date'-kommandoen: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Kunne ikke k�re 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "svar fra 'date'-kommandoen = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5639,7 +5515,7 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5656,12 +5532,12 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Datoteksten %s svarer til %ld sekunder siden 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5670,36 +5546,36 @@ msgstr ""
 "Maskinuret indeholder ikke en gyldig tid, s� vi kan ikke s�tte systemuret "
 "med det.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Kalder 'settimeofday':\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "S�tter ikke systemuret, da der k�res i testtilstand.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Skal v�re superbruger for at s�tte systemuret.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() mislykkedes"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5708,7 +5584,7 @@ msgstr ""
 "Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig "
 "v�rdi.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5718,7 +5594,7 @@ msgstr ""
 "og kan derfor ikke bruges. Det er n�dvendigt at starte \n"
 "kalibreringen forfra.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5727,7 +5603,7 @@ msgstr ""
 "Justerede ikke hastighedsfaktoren, da det er mindre en et d�gn siden sidste "
 "kalibrering.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5738,22 +5614,22 @@ msgstr ""
 "hastighedsfaktor p� %f sekunder/d�gn.\n"
 "Justerer hastighedsfaktoren med %f sekunder/d�gn\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "%d sekunder siden sidste justering\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "Skal inds�tte %d sekunder og stille uret %.6f sekunder tilbage\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Opdaterer ikke adjtime-filen, da der k�res i testtilstand.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5762,40 +5638,40 @@ msgstr ""
 "Ville have skrevet f�lgende til %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Hastighedsjusteringen blev ikke opdateret.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "Maskinuret indeholder ikke en gyldig tid, s� vi kan ikke justere det.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Den kr�vede justering er mindre end �t sekund, s� vi s�tter ikke uret.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Bruger %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Fandt ingen brugbare ur-gr�nseflader.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Kunne ikke s�tte systemuret.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5807,17 +5683,17 @@ msgstr ""
 "Denne kopi af hwclock blev kompileret til en anden maskine end Alpha\n"
 "(og k�rer derfor sandsynligvis ikke p� en Alpha nu). Intet blev gjort.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kunne ikke hente en epokev�rdi fra kernen.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernen g�r ud fra en epokev�rdi p� %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5826,17 +5702,22 @@ msgstr ""
 "For at s�tte epokev�rdien, skal du bruge tilvalget 'epoch' for at angive "
 "hvilken v�rdi, den skal s�ttes til\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "S�tter IKKE epokev�rdien til %d - tester bare.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kunne ikke s�tte epokev�rdien i kernen.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s fra %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5895,7 +5776,7 @@ msgstr ""
 "  --noadjfile   tilg� ikke /etc/adjtime. Det kr�ver, at der bruges\n"
 "                enten --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5904,12 +5785,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                angiv hvilken slags alpha du har (se hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s accepterer ingen parametre. Du angav parameteren %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5918,7 +5799,7 @@ msgstr ""
 "Du har angivet flere funktionstilvalg.\n"
 "Du kan kun udf�re �n funktion ad gangen.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5926,7 +5807,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5934,27 +5815,27 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: --noadjfile kr�ver enten --utc or --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ingen brugbar set-til-tid. Kan ikke s�tte uret.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Beklager, kun superbrugeren kan �ndre maskinuret.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Beklager, kun superbrugeren kan �ndre systemuret.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -5962,12 +5843,12 @@ msgid ""
 msgstr ""
 "Beklager, kun superbrugeren kan �ndre maskinurets epokev�rdi i kernen.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan ikke tilg� maskinuret med nogen kendt metode.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6003,7 +5884,6 @@ msgstr "ioctl() kunne ikke afl�se tiden fra %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDGHWCLK-ioctl mislykkedes"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Kunne ikke �bne /dev/tty1 eller /dev/vc/1"
@@ -6099,9 +5979,6 @@ msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har afl�st epokev�rdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6127,7 +6004,6 @@ msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
 msgid "calling open_tty\n"
 msgstr "kalder 'open_tty'\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kalder 'termio_init'\n"
@@ -6136,7 +6012,6 @@ msgstr "kalder 'termio_init'\n"
 msgid "writing init string\n"
 msgstr "skriver init-streng\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "f�r 'autobaud'\n"
@@ -6150,7 +6025,6 @@ msgstr "venter p� cr-lf\n"
 msgid "read %c\n"
 msgstr "l�s %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "l�ser loginnavn\n"
@@ -6204,7 +6078,6 @@ msgstr "/dev: chdir() mislykkedes: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ikke en tegnenhed"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6219,12 +6092,10 @@ msgstr "/dev/%s: kan ikke �bne som standard-ind: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: ikke �ben for l�sning/skrivning"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duplikerer\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6267,30 +6138,25 @@ msgstr ""
 "eller\t[-hiLmw] [-l login_program] [-t tidsudl�b] [-I initstreng] [-H "
 "login_v�rt] linje baud_rate,... [termtype]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ikke megen hukommelse, login kan mislykkes\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kunne ikke allokere hukommelse for ttyclass (malloc)"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kunne ikke allokere hukommelse for grplist (malloc)"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login p� %s fra %s afvises som standard.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login p� %s fra %s afvist.\n"
@@ -6335,8 +6201,8 @@ msgstr "�ndrer finger-information for %s.\n"
 msgid "Password error."
 msgstr "Fejl i adgangskode."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Adgangskode: "
@@ -6514,34 +6380,6 @@ msgstr "Brug %s -l for at se en liste.\n"
 msgid "No known shells.\n"
 msgstr "Ingen kendte skaller.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kunne ikke �bne /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kunne ikke l�se tilf�ldige data fra /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kunne ikke �bne for l�sning af %s"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kunne ikke stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s har ikke de korrekte filmodi"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kunne ikke l�se data fra %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6551,11 +6389,11 @@ msgstr "Kunne ikke l�se %s, afbryder."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "brug: last [-#] [-f fil] [-t tty] [-h v�rt] [bruger ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  stadig logget p�"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6564,15 +6402,15 @@ msgstr ""
 "\n"
 "wtmp starter %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: hukommelsesallokerings-fejl (malloc).\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6581,51 +6419,45 @@ msgstr ""
 "\n"
 "afbrudt %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATALT: kunne ikke gen�bne tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATALT: ugyldig tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h er kun for superbrugeren.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "brug: login [-fp] [brugernavn]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunne ikke klarg�re PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6634,17 +6466,17 @@ msgstr ""
 "Login ugyldigt\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "FOR MANGE LOGINFORS�G (%d) FRA %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6653,7 +6485,7 @@ msgstr ""
 "\n"
 "Login ugyldigt\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6662,135 +6494,120 @@ msgstr ""
 "\n"
 "Problem med sessions-ops�tning, afbryder.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "TOMT brugernavn i %s: %d. Afbryder."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ugyldigt brugernavn \"%s\" i %s:%d. Afbryder."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Hukommelse opbrugt\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ugyldigt brugernavn"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login afvist p� denne terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s AFVIST FRA %s P� TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s AFVIST P� TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login ugyldigt\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"For mange brugere er allerede logget p�.\n"
-"Pr�v igen senere.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Du har for mange processer k�rende.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "OPRINGNING KLOKKEN %s AF %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN P� %s FRA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN P� %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN P� %s AF %s FRA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN P� %s AF %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: mislykket forgrening: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislykkedes: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ingen mappe %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logger ind med hjemmemappe = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ingen hukommelse for skal-skript.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunne ikke k�re skal-skript: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ingen skal: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6799,65 +6616,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "loginnavn alt for langt.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "for langt NAVN"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "loginnavne m� ikke starte med '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "for mange tomme linjeskift,\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "VOLDSOMT MANGE linjeskift"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login udl�b efter %d sekunder\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "p� %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINFEJL FRA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINFEJL p� %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINFEJL fra %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINFEJL P� %s, %s"
@@ -6877,167 +6694,30 @@ msgstr "er n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "brug: mesg [j | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Hvem er du?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Ingen s�dan gruppe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: N�gtet adgang"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Ingen skal"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Adgangskoden skal best� af mindst 6 tegn. Pr�v igen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Adgangskoden skal indeholde tegn fra to af f�lgende klasser:\n"
-"store og sm� bogstaver, tal og ikke-alfanumeriske tegn.\n"
-"Se passwd(1) for flere oplysninger.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Du kan ikke genbruge den gamle adgangskode.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Brug venligst ikke brugernavn og lignende som adgangskode!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Brug venligst ikke dit rigtige navn og lignende som adgangskode!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Brug: passwd [brugernavn [adgangskode]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Kun root kan bruge et- og to-parameter formater.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Brug: passwd [-foqsvV] [bruger [adgangskode]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kunne ikke udf�re %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kunne ikke finde loginnavn"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Kun root kan �ndre adgangskoder for andre.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "For mange parametre.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kan ikke finde brugernavnet nogen steder. Er '%s' virkelig en bruger?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Beklager, jeg kan kun �ndre lokale adgangskoder. Brug 'yppasswd' i stedet."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID og brugernavn passer ikke sammen."
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "�ndrer adgangskode for %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Indtast gammel adgangskode: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Ugyldig adgangskode."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Indtast ny adgangskode: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Adgangskode ikke �ndret."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Gentag ny adgangskode: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Du stavede forkert. Adgangskoden blev ikke �ndret."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "adgangskode �ndret, bruger %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-ADGANGSKODE �NDRET"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "adgangskoden �ndret af root, bruger %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kalder setpwnam for at �ndre adgangskoden.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Adgangskode *IKKE* �ndret. Pr�v igen senere.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Adgangskode �ndret.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7084,7 +6764,6 @@ msgstr "genstartet af %s: %s"
 msgid "halted by %s: %s"
 msgstr "standset af %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7121,7 +6800,6 @@ msgstr "K�rer programmet \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fejl ved k�rsel af\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7211,7 +6889,6 @@ msgstr "fejl under s�tning af close-on-exec p� /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fejl ved k�rsel af finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fejl ved fors�g p� at spalte processen finalprog\n"
@@ -7240,7 +6917,7 @@ msgstr "kunne ikke �bne mappe\n"
 msgid "fork failed\n"
 msgstr "forgrening mislykkedes\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "programk�rsel mislykkedes\n"
 
@@ -7390,12 +7067,6 @@ msgstr "ugyldig m�nedsv�rdi: brug 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "ugyldig �rsv�rdi: brug 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7406,13 +7077,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "brug: cal [-13smjyV] [[m�ned] �r]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "brug: %s [+format] [dag m�ned �r]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs-dag"
 
@@ -7543,7 +7213,7 @@ msgstr "%s: kunne ikke omd�be %s til %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "kald: %s fra til filer...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7554,22 +7224,22 @@ msgstr ""
 "Brug '%s [tilvalg] %s', hvis du virkelig vil bruge den.\n"
 "Skript blev ikke startet.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "brug: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skript p�begyndt, filen er %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript p�begyndt p� %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7578,254 +7248,253 @@ msgstr ""
 "\n"
 "Skript k�rt p� %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript f�rdigt, filen er %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "L�bet t�r for pty-er\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Parameterfejl, brug\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_navn ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnavn ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan ikke �ndre str�msparetilstand\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl fejl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fejl ved l�sning af %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fejl ved skrivning af sk�rmkopi\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunne hverken l�se %s eller udf�re ioctl dump\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM er ikke defineret.\n"
@@ -7900,10 +7569,6 @@ msgstr "advarsel: kunne ikke �bne %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunne ikke �bne %s - bruger %s i stedet\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8201,81 +7866,72 @@ msgstr "mount: kunne ikke �bne %s for at s�tte hastigheden"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: denne version blev oversat uden underst�ttelse for 'nfs'-typen"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: montering af nfs version 4 mislykkedes, pr�ver version 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jeg kunne ikke bestemme filsystemtypen, og ingen var angivet"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du skal angive filsystemtypen"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montering mislykkedes"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkt %s er ikke en mappe"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: adgang n�gtet"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: skal v�re superbruger for at bruge 'mount'"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s er optaget"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc er allerede monteret"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: enten er %s allerede monteret eller %s optaget"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkt %s eksisterer ikke"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkt %s er en symbolsk l�nke ud i ingenting"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenhed %s eksisterer ikke"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8284,12 +7940,12 @@ msgstr ""
 "mount: specialenhed %s eksisterer ikke\n"
 "       (en sti er ikke en mappe)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8298,69 +7954,68 @@ msgstr ""
 "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok p� %s,\n"
 "       eller for mange monterede filsystemer"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "monteringstabellen er fuld"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kunne ikke l�se superblokken"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ukendt enhed"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ukendt filsystemtype'%s'"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du mente sikkert %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: m�ske mente du 'iso9660'?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: m�ske mente du 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s har forkert enhedsnummer eller filsystemtypen %s underst�ttes ikke"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s er ikke en blokenhed, og 'stat' fejler?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8369,73 +8024,68 @@ msgstr ""
 "mount: kernen genkender ikke %s som en blokenhed\n"
 "       (m�ske hj�lper 'insmod enheds-driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s er ikke en blokenhed (brug eventuelt '-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s er ikke en blokenhed"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s er ikke en gyldig blokenhed"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blokenhed "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s er skrivebeskyttet, men eksplicit '-w'-tilvalg blev givet"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ingen type blev angive - Jeg antager nfs p� grund af kolonnet\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen type blev angivet - Jeg antager smbfs p.g.a. det "
 "foranstillede //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: k�rer \"%s\" i baggrunden\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: opgiver \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8482,34 +8132,34 @@ msgstr ""
 "Andre tilvalg: [-nfFrsvw] [-o tilvalg] [-p adgangskodefd].\n"
 "se mange flere detaljer med 'man 8 mount'.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: dette kan kun root g�re"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: fandt ingen s�dan partition"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterer %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "intet blev monteret"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kunne ikke finde %s i %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
@@ -8544,98 +8194,98 @@ msgstr "       Jeg vil fors�ge type %s\n"
 msgid "Trying %s\n"
 msgstr "Fors�ger %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: voldsomt langt 'v�rt:mappe'-parameter\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: advarsel: angivelse af flere v�rtsnavne underst�ttes ikke\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: mappe, der monteres, er ikke i formatet 'v�rt:mappe'\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kunne ikke f� adressen p� %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: fik ugyldig hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: voldsomt langt tilvalgsparameter\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Advarsel: Ukendt proto= tilvalg.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Advarsel: Tilvalget 'namlen' underst�ttes ikke.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "ukendt NFS-montageparameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Advarsel: tilvalget 'nolock' underst�ttes ikke.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "ukendt NFS-montageparameter: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: fik ugyldig hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS via TCP underst�ttes ikke.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "NFS-sokkel"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "NFS-tjener angav, at tjenesten ikke var tilg�ngelig"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "benyttede portmapper til at finde NFS-port\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "bruger port %d til NFS-d�monen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "NFS-forbindelse"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "ukendt NFS-statusv�rdi: %d"
@@ -8644,7 +8294,7 @@ msgstr "ukendt NFS-statusv�rdi: %d"
 msgid "bug in xstrndup call"
 msgstr "programfejl i xstrndup-kald"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8657,7 +8307,7 @@ msgstr ""
 "      %s [-v] [-p prioritet] speciel ...\n"
 "      %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8668,139 +8318,137 @@ msgstr ""
 "      %s -a [-v]\n"
 "      %s [-v] speciel ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s p� %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: kan ikke finde %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Dropper filen %s - den lader til at v�re fragmenteret.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Ikke superbruger.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kunne ikke �bne %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: oversat uden underst�ttelse af tilvalget -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "v�rt: %s, mappe: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kunne ikke f� adressen p� %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: fik ugyldig hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ugyldig blokenhed"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ikke monteret"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kunne ikke skrive superblok"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: enhed optaget"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ikke fundet"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: skal v�re superbruger for at afmontere"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokenheder tillades ikke p� dette fs"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, fors�ger umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunne ikke afmontere %s med umount - fors�ger %s i stedet\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8811,48 +8459,47 @@ msgstr ""
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Kunne ikke �bne "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Fors�ger at afmontere %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (if�lge mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det lader til, at %s er monteret flere gange"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s er ikke i fstab (og du er ikke root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun %s kan afmontere %s fra %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root g�re"
 
@@ -9006,7 +8653,7 @@ msgstr "%s: ukendt signal %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9173,8 +8820,6 @@ msgstr "kernen er ikke konfigureret til brug af delt hukommelse\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Gr�nser for delt hukommelse ---\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9957,17 +9602,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_fil] [-n l�ngde] [-s overspring] "
 "[fil ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "brug: %s [-dflpcsu] [+linjeantal | +/m�nster] navn1 navn2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ukendt signal %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9978,8 +9623,7 @@ msgstr ""
 "*** %s: mappe ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9990,45 +9634,45 @@ msgstr ""
 "******** %s: Ikke en tekstfil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Brug q eller Q for at afslutte]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mere--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(N�ste fil: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Tryk mellemrum for at forts�tte, 'q' for at afslutte.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...bak %d sider"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...bak 1 side"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...overspringer en linje"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...overspringer %d linjer"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10038,7 +9682,7 @@ msgstr ""
 "***Tilbage***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10050,7 +9694,7 @@ msgstr ""
 "klammer.\n"
 "Stjerne (*) betyder at parameteren bliver den nye standardv�rdi.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10096,34 +9740,34 @@ msgstr ""
 ":f                      Vis aktuelle filnavn og linjenummer\n"
 ".                       Gentag seneste kommando\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryk 'h' for instruktioner.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linje %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ikke en fil] linje %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overl�b\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...overspringer\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Forkludret regul�rt udtryk"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10131,15 +9775,15 @@ msgstr ""
 "\n"
 "M�nster ikke fundet\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "M�nster ikke fundet"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kunne ikke forgrene (fork)\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10147,19 +9791,19 @@ msgstr ""
 "\n"
 "...Overspringer "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Springer til filen "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Springer tilbage til filen "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "For lang linje"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Ingen tidligere kommando at erstatte med"
 
@@ -10212,91 +9856,88 @@ msgstr "hexdump: ugyldigt format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Brug: %s [-tal] [-p streng] [-cefnrs] [+linje] [+/m�nster/] [filer]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: tilvalget kr�ver et parameter -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ugyldigt tilvalg -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...hopper fremad\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...springer bagud\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ingen n�ste fil"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Ingen forrige fil"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: L�sefejl fra %s-fil\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Uventet filafslutning i %s-fil\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ukendt fejl i %s-fil\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kunne ikke oprette midlertidig fil.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE fejl: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Filafslutning)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ingen gammel s�gestreng"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kunne ikke �bne "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "gemte"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando ikke tilladt i rflag-tilstand.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislykkedes, pr�v senere\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(N�ste fil: "
 
@@ -10350,6 +9991,156 @@ msgstr "For lang inddatalinje.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ugyldigt tal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaksfejl: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ingen s�dan parameter sat: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] enh navn\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] enh str sekt hoveder spor str�k gab rate spec1 fmt_gab\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] enh\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] enh\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kunne ikke �bne /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kunne ikke l�se tilf�ldige data fra /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kunne ikke �bne for l�sning af %s"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kunne ikke stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s har ikke de korrekte filmodi"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kunne ikke l�se data fra %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "For mange brugere er allerede logget p�.\n"
+#~ "Pr�v igen senere.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Du har for mange processer k�rende.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Adgangskoden skal best� af mindst 6 tegn. Pr�v igen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Adgangskoden skal indeholde tegn fra to af f�lgende klasser:\n"
+#~ "store og sm� bogstaver, tal og ikke-alfanumeriske tegn.\n"
+#~ "Se passwd(1) for flere oplysninger.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Du kan ikke genbruge den gamle adgangskode.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Brug venligst ikke brugernavn og lignende som adgangskode!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Brug venligst ikke dit rigtige navn og lignende som adgangskode!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Brug: passwd [brugernavn [adgangskode]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Kun root kan bruge et- og to-parameter formater.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Brug: passwd [-foqsvV] [bruger [adgangskode]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kunne ikke udf�re %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kunne ikke finde loginnavn"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Kun root kan �ndre adgangskoder for andre.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "For mange parametre.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kan ikke finde brugernavnet nogen steder. Er '%s' virkelig en bruger?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Beklager, jeg kan kun �ndre lokale adgangskoder. Brug 'yppasswd' i stedet."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID og brugernavn passer ikke sammen."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "�ndrer adgangskode for %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Indtast gammel adgangskode: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Ugyldig adgangskode."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Indtast ny adgangskode: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Adgangskode ikke �ndret."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Gentag ny adgangskode: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Du stavede forkert. Adgangskoden blev ikke �ndret."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "adgangskode �ndret, bruger %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-ADGANGSKODE �NDRET"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "adgangskoden �ndret af root, bruger %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kalder setpwnam for at �ndre adgangskoden.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Adgangskode *IKKE* �ndret. Pr�v igen senere.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Adgangskode �ndret.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: denne version blev oversat uden underst�ttelse for 'nfs'-typen"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Advarsel: sletter partitioner efter %d\n"
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 000000000..e775adf87
--- /dev/null
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 71ef3b83a..4a124cf68 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,48 +3,54 @@
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2002, 2004.
 # Karl Eichwalder <ke@suse.de>, 2001-2002.
 # Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
-# Adrian Bunk <bunk@kernel.org>, 2004.
 #
 # Note:
 # =====
 # Changes done by Karl Eichwalder are put into the Public Domain.
 # Mine too. MPi
+#
 # As requested here is the unmodified header:
+#
 # -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
 # German translation for util-linux.
 # Copyright (C) 1999, 2000, 2001 Elrond <Elrond@Wunder-Nett.org>.
 # Elrond <Elrond@Wunder-Nett.org>, 1999-2001.
+#
 # $Revision: 1.42 $
+#
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
 # header is not removed and modified versions are marked
 # as such.
+#
 # If you have additions/changes/other requests, please
 # send them to me (Elrond <Elrond@Wunder-Nett.org>)!
+#
 # People who helped or contributed (in historical order):
-# Martin Schulze <joey@infodrom.north.de>
-# Daniel Egger <Daniel.Egger@suse.de>
-# deliA <deliA@Wunder-Nett.org>
+#   Martin Schulze <joey@infodrom.north.de>
+#   Daniel Egger <Daniel.Egger@suse.de>
+#   deliA <deliA@Wunder-Nett.org>
+#
 # Submitted to the TP 2001-07-18 14:32:47 CEST -ke-
+#
 # -=-=-=-=-=-=-=-=-=-=-=-=-=- cut here -=-=-=-=-=-=-=-=-=-=-=-=-=-
+#
 # Hinweise zur Übersetzung:
 # =========================
 # command – Befehl
 # bad     – beschädigt (z. B. „beschädigte Blöcke“)
-# bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2004.
-# 
-# 
+#           bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12q-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2004-12-31 16:13+0100\n"
-"Last-Translator: Adrian Bunk <bunk@kernel.org>\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-06-27 16:17+0200\n"
+"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: disk-utils/blockdev.c:62
@@ -145,7 +151,7 @@ msgstr "%s: IOCTL-Fehler bei %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "NurL  RA   SGr   BGr   Startsek     Größe   Gerät\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Aufruf:\n"
@@ -194,13 +200,12 @@ msgstr "Aufruf: %s [ -n ] Gerät\n"
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s von %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -225,7 +230,7 @@ msgstr "Doppel"
 msgid "Single"
 msgstr "Einfach"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -240,99 +245,99 @@ msgstr ""
 " -v         gesprächiger sein\n"
 " Datei      zu testende Datei\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: Fehler %d beim Entpacken! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: Größenfehler bei symbolischer Verknüpfung „%s“\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  entpacke Block bei %ld nach %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: unsinniger Modus auf „%s“ (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr " Loch bei %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Nicht-Block (%ld) Bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Nicht-Größe (%ld vs %ld) Bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ungültiges cramfs – ungültige Pfadlänge\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: Die Unterstützung für -x wurde nicht mit übersetzt\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: Warnung – kann Dateisystemgröße nicht bestimmen\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s ist kein blockorientiertes Gerät oder Datei\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ungültiges cramfs – Dateilänge zu kurz\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ungültiges cramfs – falsche Magie\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: Warnung – Dateilänge zu lang, aufgefülltes Abbild?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ungültiges cramfs -- CRC-Fehler\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: Warnung – altes cramfs-Abbild, kein CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ungültiges cramfs – ungültiger Superblock\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: ungültiges cramfs – Verzeichnisdatenende (%ld) != Dateidatenanfang (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ungültiges cramfs – ungültiges Dateidatenoffset\n"
@@ -802,7 +807,6 @@ msgid "blocks argument too large, max is %lu"
 msgstr "„blocks“-Argument zu groß, max ist %lu"
 
 #: disk-utils/mkfs.bfs.c:207
-#, fuzzy
 msgid "too many inodes - max is 512"
 msgstr "zu viele Inodes – Maximum ist 512"
 
@@ -811,7 +815,7 @@ msgstr "zu viele Inodes – Maximum ist 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -880,24 +884,24 @@ msgstr "Fehler beim Schreiben des „..“-Eintrags"
 msgid "error closing %s"
 msgstr "Fehler beim Schließen von %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Aufruf: mkfs [-V] [-t FS-Typ] [FS-Optionen] Gerät [Größe]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Speicher ist aufgebraucht!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs Version %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -914,13 +918,13 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"Aufruf: %s [-v] [-b blkgr] [-e edition] [-i datei] [-n name] verzname "
+"Aufruf: %s [-h] [-v] [-b blkgr] [-e edition] [-i datei] [-n name] verzname "
 "ausdatei\n"
 " -h         diese Hilfe ausgeben\n"
 " -v         wortreich sein\n"
 " -E         alle Warnungen zu Fehlern machen (von 0 versch. Exit-Status)\n"
 " -b blkgr   diese Blockgröße verwenden, muss gleich der Seitengröße sein\n"
-" -e edition Edition-Nummber setzen (Teil von fsid)\n"
+" -e edition Edition-Nummer setzen (Teil von fsid)\n"
 " -i datei   ein Dateiabbild in das Dateisystem einfügen (benötigt >= 2.4.0)\n"
 " -n name    name des cramfs-Dateisystems setzen\n"
 " -p         mit %d Bytes für Boot-Code auffüllen\n"
@@ -953,7 +957,6 @@ msgstr ""
 "MAXENTRIES überschritten. Setzen Sie diesen Wert in mkcramfs.c hoch und\n"
 "übersetzen Sie erneut. Breche jetzt ab.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -1010,10 +1013,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Schreiben des ROM-Abbilds fehlgeschlagen (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1092,7 +1091,6 @@ msgstr "kann Inodes nicht Schreiben"
 msgid "write failed in write_block"
 msgstr "Schreiben fehlgeschlagen in write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1128,7 +1126,7 @@ msgstr "Seek fehlgeschlagen während Blocküberprüfung"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Merkwürdige Werte in do_check: wahrscheinlich Fehler\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "Seek fehlgeschlagen in check_blocks"
 
@@ -1171,110 +1169,110 @@ msgstr "kann kein „stat“ auf %s anwenden"
 msgid "will not try to make filesystem on '%s'"
 msgstr "Es wird nicht versucht, ein Dateisystem auf „%s“ zu erzeugen"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ungültige nutzerdefinierte Seitengröße %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Benutze nutzerdefinierte Seitengröße %d anstelle der Systemwerte %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Es wird eine Seitengröße von %d (nicht %d) angenommen.\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Ungültige Swap-Headergröße, kein Label geschrieben.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Label wurde abgeschnitten.\n"
 
 # dito
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "Label"
+msgstr "kein Label, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "keine UUID\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] /dev/Name [Größe in kB]\n"
+msgstr ""
+"Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] [-L Label] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "Zu viele beschädigte „Seiten“"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Speicher ist aufgebraucht"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "Eine beschädigte „Seite“\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu beschädigte Seiten\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: Fehler: Die angegebene Größe %lu ist größer als die des Gerätes: %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Fehler: Der Swapbereich muss mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr ""
-"%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
+msgstr "%s: Fehler: Label nur mit V1-Swapbereich\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Es wird nicht versucht, Swap auf ‚%s‘ anzulegen"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatal: erste Seite nicht lesbar"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1288,124 +1286,85 @@ msgstr ""
 "Es wird kein Swapbereich angelegt. Wenn Sie wirklich einen Swapbereich\n"
 "anlegen wollen, so benutzen Sie die Option -f.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Swapbereich Version %d wird angelegt, Größe %llu KBytes\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kann Signaturseite nicht schreiben"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ungültige Nummer: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfehler: „%s“\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Keine solche Parametermenge: „%s“\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] Gerät Name\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] gerät größe sekt köpfe spuren stretch lücke rate spec1 "
-"fmt_lücke\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] Gerät\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] Gerät\n"
-
 # "Unbrauchbar"
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Unbenutzbar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Freier Bereich"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Festplatte wurde verändert.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Rebooten Sie das System, um sicherzustellen, dass die Partitionstabelle neu "
 "gelesen wird.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1418,248 +1377,245 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "cfdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATALER FEHLER"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Eine Taste drücken, um cfdisk zu beenden"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Konnte nicht von der Festplatte lesen"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Konnte nicht auf die Festplatte schreiben"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Zu viele Partitionen"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partition fängt vor Sektor 0 an"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partition endet vor Sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partition fängt hinter dem Ende der Festplatte an"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partition endet hinter dem Ende der Festplatte"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition endet im letzten teilweisen Zylinder"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logische Partitionen nicht in Platten-Reihenfolge"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logische Partitionen überlappen"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "vergrößerte logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!! Interner Fehler beim Erzeugen einer log. Part. ohne eine erw. Part. !!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kann hier keine log. Part. anlegen -- eine zweite erw. müsste erzeugt werden."
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menüeintrag ist zu lang. Das Menü könnte ungewöhnlich aussehen"
 
 # "Ausrichtung" "Nehme horizontale Voreinstellung."
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü ohne Richtung, verwende horizontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Diese Taste ist hier nicht verwendbar"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primäre"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Erzeuge keine neue Partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interner Fehler !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Größe (in MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Anfang"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Ende"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Keine Partitionstabelle.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Keine Partitionstabelle. Fange mit Null-Tabelle an."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Ungültige Signatur an Partitionstabelle"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Unbekannter Partitionstabellentyp"
 
 # If rpmatch is available, ‘j’ for “ja” will do. If not, my translation
 # is wrong. Anyway, I opt for a full-featured C library.
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Möchten Sie mit einer Null-Tabelle beginnen [j/N]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Sie haben mehr Zylinder angegeben, als auf die Festplatte passen"
 
 # That's not a direct translation, but I've tried to be
 # more informative.
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Konnte nicht auf die Festplatte zugreifen"
 
 # "Nur lesender Zugriff möglich – Sie haben keine Schreibberechtigung" (joey)
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
-#, fuzzy
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "Platte wurde nur zum Lesen geöffnet – Sie haben keine Rechte zum Schreiben"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # "Ungültige primäre Partition"
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Sind Sie sicher, dass Sie die Partitionstabelle schreiben wollen? (ja/nein): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nein"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Bitte „ja“ oder „nein“ eingeben"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Die Partitionstabelle wurde auf die Festplatte geschrieben"
 
 # That's not a good translation, but I guess, I can't make it longer.
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Die Tabelle wurde geschr., aber das Neueinlesen schlug fehl.  Rebooten Sie."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Keine primäre Partition als bootfähig markiert; der DOS-MBR kann nicht "
 "booten."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
@@ -1668,90 +1624,73 @@ msgstr ""
 
 # "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
 # is too long
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Konnte „%s“ nicht öffnen"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "  Logische"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Kein"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1759,7 +1698,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Offset    Länge    Dateisystemtyp (ID)  "
 "Flags\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1767,493 +1706,487 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "-----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Anfangs----      -----End------   Anfangs-   Anzahl der\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flags Kopf Sekt Zyl.  ID  Kopf Sekt Zyl    Sektor     Sektoren\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "„Roh“"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Die „rohen“ Daten der Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabelle"
 
 # "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dies ist cfdisk, ein Programm das curses benutzt und es ihnen"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "erlaubt, auf Ihren Festplatten Partitionen anzulegen, zu löschen"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Befehl     Bedeutung"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     ---------"
 
 # "  b          Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 "  b          (De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Die Anzahl der Zylinder, Köpfe und Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Beachten Sie, dass dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             zu DOS, OS/2, ... machen kann"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Die Partitionstab. auf dem Bildschirm oder in eine Datei "
 "ausgeben"
 
 # "verschiedene"
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2290
-#, fuzzy
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r – „Rohe“ Daten (was auf die Festplatte geschrieben würde)"
 
-#: fdisk/cfdisk.c:2291
-#, fuzzy
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s – Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2292
-#, fuzzy
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t – Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Die Partitionstabelle auf die Festplatte schreiben (großes W)"
 
 # or "Da dieses ..." ?
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Da dies Daten auf der Festplatte zerstören kann, müssen"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             Sie das Schreiben mit „yes“ oder „no“ bestätigen oder"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pfeil-runter Den Cursor zur nächsten Partition bewegen"
 
 # "Baut den Bildschirm neu auf"
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "Strg-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Hinweis: Alle Befehle können mit Klein- oder Großbuchstaben "
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Der Dateisystemtyp kann nicht auf „leer“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Der Dateisystemtyp kann nicht auf „erweitert“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Unbekannt (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Größe: %lld Bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Größe: %lld Bytes, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektoren"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "   Zylinder"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Größe (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr " Größe (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr " Bootbar"
 
 # "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "(De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Den Typ des Dateisystems (DOS, Linux, OS/2, etc.) ändern"
 
 # Maybe without the dot.
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sekt., Zyl.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Diese Partition kann nicht als bootfähig markiert werden"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Unzulässiger Befehl"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2325,9 +2258,9 @@ msgstr ""
 "\n"
 "„BSD label“ für Gerät: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Befehl  Bedeutung"
 
@@ -2347,10 +2280,9 @@ msgstr "   i   Bootstrap installieren"
 msgid "   l   list known filesystem types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   Dieses Menü anzeigen"
 
@@ -2362,14 +2294,14 @@ msgstr "   n   Eine neue BSD-Partition anlegen"
 msgid "   p   print BSD partition table"
 msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   Ende ohne Speichern der Änderungen"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   Zurück zum Hauptmenü"
 
@@ -2413,13 +2345,13 @@ msgid "BSD disklabel command (m for help): "
 msgstr "„BSD disklabel“ Befehl (m für Hilfe): "
 
 # %s can be "Sektor" or "Zylinder".
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Letzter %s oder +Größe, +GrößeK oder +GrößeM"
@@ -2465,8 +2397,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2567,8 +2497,8 @@ msgstr "Sektoren/Spur"
 msgid "tracks/cylinder"
 msgstr "Spuren/Zylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "Zylinder"
 
@@ -2625,7 +2555,7 @@ msgstr "Bootstrap auf %s installiert.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
@@ -2649,7 +2579,7 @@ msgstr ""
 "\n"
 "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2671,7 +2601,7 @@ msgstr ""
 "-u: „Anfang“ und „Ende“ werden in Sektoren statt in Zylindern angegeben\n"
 "-b 2048: (für bestimmte MO-Geräte) 2048-Byte-Sektoren benutzen\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2688,202 +2618,188 @@ msgstr ""
 "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
 "        ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
 # "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Konnte in %s nicht positionieren\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Konnte %s nicht schreiben\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-IOCTL fehlgeschlagen bei %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Konnte keinen weiteren Speicher reservieren\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fataler Fehler\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   (De)Aktivieren eines Nur-Lese-Flags"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   „bsd disklabel“ bearbeiten"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition löschen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Eine neue leere DOS Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Einen neuen leeren „Sun disklabel“ anlegen"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle überprüfen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr ""
 "   w   Die Tabelle auf die Festplatte schreiben und das Programm beenden"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zusätzliche Funktionen (nur für Experten)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   Wählen der bootfähigen Partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   Bearbeiten des „bootfile“-Eintrags"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   Die sgi-swap-Partition auswählen"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   (De)Aktivieren des bootfähig-Flags"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   (De)Aktivieren des DOS Kompatibilitätsflags"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Die Anzahl der alternierenden Zylinder ändern"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder ändern"
 
 # XXX
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Die „raw“-Daten der Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Die Anzahl der Extra-Sektoren pro Zylinder ändern"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der Köpfe ändern"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   Den Interleave-Faktor ändern"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Umdrehungsgeschwindigkeit ändern (U/min)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   Die Anzahl der Sektoren/Spur ändern"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Die Anzahl der physischen Zylinder ändern"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Den Datenanfang einer Partition verschieben"
 
 # XXX – Or should this be "logical" instead of "extended" ?
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle (SGI) anlegen"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   Partitionsreihenfolge korrigieren"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Sie müssen angeben"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2892,11 +2808,11 @@ msgstr ""
 "%s%s.\n"
 "Sie können dies im Zusatzfunktionsmenü tun.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2915,29 +2831,31 @@ msgstr ""
 "2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
 "   (z. B. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ungültiges Offset in primärer erweiterter Partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Warnung: Lasse Partition hinter #%d aus.\n"
+"Sie werden gelöscht, wenn Sie diese Partitionstabelle schreiben.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Warnung: zusätzlicher Link-Pointer in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Warnung: ignoriere weitere Daten in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2952,18 +2870,18 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
 
 # XXX
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Sie werden die Partitionstabelle nicht schreiben können.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2972,7 +2890,7 @@ msgstr ""
 "Diese Platte hat sowohl DOS- als auch BSD-Magic.\n"
 "Nutzen Sie den „b“-Befehl, um in den BSD-Modus zu gehen.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2981,17 +2899,17 @@ msgstr ""
 "Das Gerät enthält weder eine gültige DOS-Partitionstabelle,\n"
 "noch einen „Sun“, „SGI“ oder „OSF disklabel“\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Die zusätzliche erweiterte Partition %d ignorieren\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3000,8 +2918,8 @@ msgstr ""
 "Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
 "korrigieren\n"
 
-#: fdisk/fdisk.c:1026
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1028
+#, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -3009,83 +2927,83 @@ msgstr ""
 "\n"
 "dreimalig EOF bekommen – beende...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (L um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, Vorgabe: %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Benutze den Standardwert %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Partition %d hat leeren Typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d ausgewählt\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noch keine Partition definiert!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primären Partitionen sind schon definiert worden!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Die Einheit für die Anzeige/Eingabe ist nun %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3098,7 +3016,7 @@ msgstr ""
 "ist wahrscheinlich unklug. Sie können eine Partition\n"
 "mit dem „d“-Kommando löschen.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3107,7 +3025,7 @@ msgstr ""
 "Es ist nicht möglich, eine Partition in eine Erweiterte zu ändern oder\n"
 "umgekehrt.  Bitte löschen Sie die Partition zuerst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3118,7 +3036,7 @@ msgstr ""
 "zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3130,52 +3048,52 @@ msgstr ""
 "als gesamte Platte zu lassen, wie es IRIX erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Der Dateisystemtyp der Partition %d ist nun %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Anfänge (nicht-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte sein (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte sein (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3184,7 +3102,7 @@ msgstr ""
 "\n"
 "Platte %s: %ld MByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3193,17 +3111,17 @@ msgstr ""
 "\n"
 "Platte %s: %ld.%ld GByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d Köpfe, %d Sektoren/Spuren, %d Zylinder"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", zusammen %llu Sektoren"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3212,7 +3130,7 @@ msgstr ""
 "Einheiten = %s von %d × %d = %d Bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3221,7 +3139,7 @@ msgstr ""
 "Keine Änderungen notwendig.  Die Anordnung ist schon korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3236,16 +3154,16 @@ msgstr ""
 # "   Device"
 # "    Gerät"
 # 2002-05-10 12:15:13 CEST -ke-
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s  boot.     Anfang        Ende     Blöcke   Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3254,7 +3172,7 @@ msgstr ""
 "\n"
 "Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3267,83 +3185,83 @@ msgstr ""
 
 # Ist "Kp" eine gute Abkürzung für "Kopf" ?
 # Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Kp Sek  Zyl  Kp Sek  Zyl     Anfang     Größe ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: Kopf %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: Sektor %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partition %d: Zylinder %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partition %d: verheriger Sektor %d widerspricht sich mit gesamt %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Warnung: ungültiger Anfang-der-Daten in Partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 "Logische Partition %d ist nicht vollständig in Partition %d enthalten\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Gesamtanzahl belegter Sektoren %d größer als Maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d ist schon festgelegt.  Vor Wiederanlegen bitte löschen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3356,23 +3274,23 @@ msgstr ""
 "\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
 "\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Sie müssen erst eine Partion löschen und eine erweiterte anlegen.\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alle logischen Partitionen sind in Benutzung\n"
 
 # "Ungültige primäre Partition"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Füge primäre Partition hinzu\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3383,20 +3301,20 @@ msgstr ""
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ungültige Partitionsnummer für den Typ „%c“\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3405,12 +3323,12 @@ msgstr ""
 "Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Rufe ioctl() um Partitionstabelle neu einzulesen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3423,7 +3341,7 @@ msgstr ""
 "Der Kernel benutzt noch die alte Tabelle.\n"
 "Die neue Tabelle wird beim nächsten Neustart verwendet.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3436,75 +3354,77 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Fehler beim Schließen von %s\n"
+msgstr ""
+"\n"
+"Fehler beim Schließen von Datei\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Warnung: setze Sektoren-Offset für DOS-Kompatibilität\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Dieser Kernel stellt Sektorengröße selbst fest – Option -b ignoriert\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3513,17 +3433,16 @@ msgstr ""
 "Warnung: Option -b (Sektorengröße setzen) sollte nur mit einem\n"
 "angegebenen Gerät benutzt werden\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Ein ODF/1-Disklabel auf %s entdeckt, gehe in Disklabel-Modus.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3532,16 +3451,16 @@ msgstr ""
 "\n"
 "Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3608,15 +3527,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux Swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3639,7 +3558,7 @@ msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "SGI-Disklabel mit falscher Prüfsumme entdeckt.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3654,11 +3573,11 @@ msgstr ""
 "%d Zylinder, %d physische Zylinder\n"
 "%d Extrasekt./Zyl, Interleave %d:1\n"
 "%s\n"
-"Einheiten = %s mit %d × 512 Bytes\n"
+"Einheiten = %s mit %d × %d Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3667,7 +3586,7 @@ msgid ""
 msgstr ""
 "\n"
 "Platte %s („SGI disklabel“): %d Köpfe, %d Sektoren, %d Zylinder\n"
-"Einheiten: %s mit %d × 512 Bytes\n"
+"Einheiten: %s mit %d × %d Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3695,7 +3614,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s Sektor%5u Größe%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3752,7 +3670,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Mehr als ein Eintrag für ‚gesamte Platte‘ vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Keine Partitionen definiert\n"
@@ -3837,7 +3755,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSie haben einen unüblichen Boot-Dateinamen gewählt.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3860,11 +3777,10 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3932,6 +3848,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Warnung:  BLKGETSIZE-Ioctl fehlgeschlagen auf %s. Benutze "
+"Geometriezylinderwert\n"
+"von %d. Dieser Wert kann für Geräte > 33,8 GB abgeschnitten sein.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
@@ -3943,44 +3862,43 @@ msgstr "Versuche, Parameter der Partition %d zu erhalten.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tANFANG=%d\tLÄNGE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Leer"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS Swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Gesamte Platte"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3993,12 +3911,12 @@ msgstr ""
 "Zylinder und Partitionen, setzen müssen oder mit einem\n"
 "frischen Label beginnen (s im Hauptmenü).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Autoconfigure gefunden bei %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4013,7 +3931,7 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -4023,79 +3941,82 @@ msgstr ""
 "   ?   Auto-Konfiguration\n"
 "   0   von Hand (mit Voreinstellungen aus der Hardwareerkennung)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
-msgstr ""
+msgstr "Typ wählen (? für Auto, 0 für von Hand): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Auto-Konfiguration fehlgeschlagen.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdisksunlabel.c:323
+# XXX Oder abwechselnde?
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
-msgstr ""
+msgstr "Alternative Zylinder"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
-msgstr ""
+msgstr "Physikalische Zylinder"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr ""
+msgstr "Rotationsgeschwindigkeit (U/min)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
-msgstr ""
+msgstr "Interleave-Faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
-msgstr ""
+msgstr "Extra-Sektoren pro Zylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr ""
+msgstr "Sie können alle Plattenparameter aus dem x-Menü heraus ändern"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5″-Diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d überlappt mit anderen in Sektoren %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich – Sektor 0–%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich – Sektor %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
+"Andere Partition überdecken bereits die ganze Platte.\n"
+"Löschen/verkleinern Sie sie vor einem erneuten Versuch.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4103,14 +4024,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4119,7 +4040,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4131,7 +4052,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4144,18 +4065,18 @@ msgstr ""
 "Einheiten: %s mit %d × 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr ""
+msgstr "%*s Flag    Start       Ende   Blöcke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
-msgstr ""
+msgstr "Anzahl der alternierenden Zylinder"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
-msgstr ""
+msgstr "Anzahl der physikalischen Zylinder"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4177,33 +4098,27 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Erweiterte"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
 # "bootfähig"
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootfähig"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Bootmanager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4212,7 +4127,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4305,12 +4219,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4331,8 +4243,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4342,7 +4252,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD / SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4363,12 +4272,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux Swap / Solaris"
@@ -4386,9 +4293,8 @@ msgid "NTFS volume set"
 msgstr "NTFS volume set"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux Plaintext"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4398,12 +4304,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4412,7 +4316,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4477,30 +4380,22 @@ msgstr "Nicht-DS-Daten"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4509,118 +4404,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundär"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Seek-Fehler auf %s – kann nicht nach %lu springen\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr ""
+msgstr "Seek-Fehler: wollte 0x%08x%08x, bekam 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "Speicher ist aufgebraucht – Abbruch\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Fehler beim Lesen von %s – Sektor %lu konnte nicht gelesen werden\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr ""
+msgstr "FEHLER: Sektor %lu hat keine MS-DOS-Signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 "Fehler beim Schreiben auf %s – der Sektor %lu konnte nicht geschrieben "
 "werden\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "Speicher aufgebraucht?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Fehler beim Schreiben des Sektors %lu auf %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Festplatte %s: Die Geometrie konnte nicht festgestellt werden\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4628,29 +4516,29 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4659,27 +4547,27 @@ msgstr ""
 "\n"
 "Festplatte %s: %lu Zylinder, %lu Köpfe, %lu Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4688,42 +4576,42 @@ msgstr ""
 "Id  Name\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schließen von %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: es gibt keine derartige Partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# Partitionstabelle von %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr ""
+msgstr "nicht implementiertes Format – benutze %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4733,12 +4621,12 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang   Ende  #Zyl.    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4747,12 +4635,12 @@ msgstr ""
 "Einheit = Sektoren von 512 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Gerät  boot.   Anfang      Ende  #Sektoren Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4761,12 +4649,12 @@ msgstr ""
 "Einheit = Blöcke von 1024 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Gerät  boot.  Anfang      Ende   #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4776,31 +4664,31 @@ msgstr ""
 "beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang Ende   MiB    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Keine Partitionen gefunden\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4808,86 +4696,86 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
 # XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
 # XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Warnung: Partition %s fängt bei Sektor 0 an\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr ""
+msgstr "Warnung: Partition %s reicht über das Ende der Platte hinaus\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4897,13 +4785,15 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird diese\n"
 "         Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
+"Warnung: Normalerweise kann man nur von primäre Partitionen booten.\n"
+"LILO ignoriert die „bootfähig“-Einstellung komplett.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4912,40 +4802,40 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird auf\n"
 "         dieser Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "Anfang"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Anfang: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "Ende"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Ende: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition %s endet am Zylinder %ld, hinter dem Ende der Platte\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4953,348 +4843,342 @@ msgstr ""
 "Warnung: erweiterte Partition beginnt nicht an einer Zylindergrenze\n"
 "DOS und Linux werden den Inhalt unterschiedlich interpretieren.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Zu viele Partitionen - ignoriere alle hinter Nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "Partitionsbaum?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager erkannt – kann das nicht handhaben\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-Signatur gefunden – gebe auf\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "merkwürdig... eine erweiterte Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "merkwürdig... eine BSD-Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nicht erkannte Partitiontabellentyp\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Die Option „-n“ wurde verwendet: Es wurde nichts verändert\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen – Abbruch\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
+msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "zusammen: %llu Blöcke\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Aufruf: sfdisk --print-id Gerät Partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Aufruf: sfdisk --change-id Gerät Partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Aufruf: sfdisk --id Gerät Partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "Man kann nur ein Gerät angeben (außer mit -l oder -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
 # And again one for show_geometry()...
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld Zylinder, %ld Köpfe, %ld Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kann die Größe von %s nicht feststellen\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ungültiges Aktiv-Byte: 0x%x anstelle von 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5302,7 +5186,7 @@ msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5311,36 +5195,36 @@ msgstr ""
 "Sie haben %d aktive primäre Partitionen.  Dies spielt bei LILO keine Rolle,\n"
 "aber der DOS-MBR bootet nur Festplatten mit einer aktiven Partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr ""
+msgstr "Partition %s hat ID %x und ist nicht versteckt\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5348,66 +5232,66 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5416,7 +5300,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5515,24 +5399,24 @@ msgstr "getopt (enhanced) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "Interner Fehler, kontaktieren Sie den Autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "von MILO gebootet\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Bösartige BCD-Uhr\n"
 
 # Egger
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "Uhrport auf 0x%x gestellt\n"
 
 # debug
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "„funky TOY“!\n"
@@ -5540,24 +5424,24 @@ msgstr "„funky TOY“!\n"
 # The second %s can be:
 # "clock read"
 # "set time"
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomares „%s“ schlug bei 1000 Iterationen fehl!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Konnte /dev/port nicht öffnen: %s"
 
 # Egger, not really nice
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ich bekam keine Erlaubnis, weil ich es nicht versucht habe.\n"
 
 # Egger
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
@@ -5565,54 +5449,54 @@ msgstr ""
 
 # This is not the correct translation, but it
 # explains the situation better.
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Sie benötigen root-Rechte.\n"
 
 # debug
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Die Hardwareuhr läuft vermutlich in %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokaler Zeit"
 
 # merge with next
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Warnung: Unbekannte dritte Zeile in der adjtime-Datei\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Erwartet: „UTC“ oder „LOCAL“ oder nichts.)\n"
 
 # XXX
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Letzte Abweichungskorrektur vorgenommen bei %ld Sekunden nach 1969\n"
 
 # XXX
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Letzte Kalibrierung vorgenommen bei %ld Sekunden nach 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hardwareuhr geht nach %s Zeit\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "unbekannter"
 
@@ -5621,45 +5505,45 @@ msgstr "unbekannter"
 #   kein sendeausfall... ich wart nur auf das anbrechen der nächsten für mich
 #   relevanten zeiteinheit.
 # Egger
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Warte auf Uhrtick...\n"
 
 # Egger
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... erhielt Uhrtick\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ungültige Werte in Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Zeit der Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
 
 # Egger
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Zeit gelesen aus Hardwareuhr: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Stelle die Hardwareuhr auf %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Die Uhrzeit der Hardwareuhr wurde nicht verstellt – Testmodus.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5669,9 +5553,9 @@ msgstr ""
 "Es wird weiter gewartet, um die nächste ganze Sekunde zu erreichen.\n"
 
 # Die Registereinträge der Hardwareuhr enthalten Werte, die ungültig
-#   sind (z.B. der 50. Tag des Monats) oder ausserhalb des unterstützen
+#   sind (z.B. der 50. Tag des Monats) oder außerhalb des unterstützen
 #   Bereiches (z.B. das Jahr 2095) liegen.
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5681,23 +5565,23 @@ msgstr ""
 "Monats), oder die Werte liegen außerhalb des Bereiches, der unterstützt\n"
 "wird (z.B. das Jahr 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f Sekunden\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date-Argument zu lang\n"
 
 # The english version is already a little misleading.
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5706,21 +5590,21 @@ msgstr ""
 "Der Wert der „--date“-Option ist kein gültiges Datum.\n"
 "Es darf kein Anführungszeichen enthalten.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Der „date“-Befehl wird aufgerufen: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Konnte „date“ nicht in der /bin/sh-Shell starten. popen() schlug fehl"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "Ausgabe des „date“-Befehls: %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5736,7 +5620,7 @@ msgstr ""
 "Die Ausgabe war:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5754,12 +5638,12 @@ msgstr ""
 "  %s\n"
 
 # Egger, fixed %s->%d
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "Die Zeichenkette %s entspricht %ld Sekunden seit 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5769,40 +5653,40 @@ msgstr ""
 "es nicht möglich, die Systemzeit zu setzen.\n"
 
 # debug
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday() wird aufgerufen:\n"
 
 # not much to translate
 # debug
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
 # not much to translate
 # debug
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Keine Änderung an der Systemuhr vorgenommen – Testmodus.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Sie müssen root sein, um die Systemuhr zu verändern.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() schlug fehl"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5811,7 +5695,7 @@ msgstr ""
 "Der Driftfaktor wird nicht verändert, da die Hardwareuhr vorher keinen "
 "sinnvollen Wert enthielt.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5822,7 +5706,7 @@ msgstr ""
 "ist, also die Aufzeichnungen beschädigt sind und die Kalibrierung von neuem\n"
 "starten muss.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5832,7 +5716,7 @@ msgstr ""
 "letzten Kalibrierung vergangen ist.\n"
 
 # Egger
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5844,13 +5728,13 @@ msgstr ""
 "Der Faktor wird um %4$f Sekunden/Tag geändert.\n"
 
 # Egger
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Es vergingen %d Sekunden seit der letzten Anpassung.\n"
 
 # Egger
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
@@ -5858,14 +5742,14 @@ msgstr ""
 "Sekunden zugegriffen werden\n"
 
 # merge with next
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Die adjtime Datei wird nicht aktualisiert – Testmodus \n"
 
 # "Hätte das folgende in die Datei %s geschrieben:\n"
 # passiv, Konjunktiv in der Umschreibungsform
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5875,13 +5759,13 @@ msgstr ""
 "%s"
 
 # "Abweichungsparameter"
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Die Abweichungsparameter wurden nicht verändert.\n"
 
 # "anpassen"
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5890,31 +5774,31 @@ msgstr ""
 "werden.\n"
 
 # "Justierung"
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Da die Anpassung weniger als eine Sekunde betragen hätte, wird sie nicht "
 "durchgeführt.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Benutze %s.\n"
 
 # "Schnittstelle"
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Keine brauchbare Uhrschnittstelle gefunden.\n"
 
 # "stellen"
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5929,19 +5813,19 @@ msgstr ""
 "gemacht.\n"
 
 # Egger
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kann den Epochenwert nicht vom Kernel bekommen.\n"
 
 # Egger
 # "Epochenwert"
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel geht von einem Epochenwert von %lu aus.\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5950,19 +5834,26 @@ msgstr ""
 "Um den Epochenwert zu ändern, müssen sie die „epoch“-Option benutzen, um "
 "anzugeben auf welchen Wert er gesetzt werden soll.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Der Epochenwert wird nicht auf %d gesetzt – Testmodus.\n"
 
 # Egger
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kann den Epochenwert im Kernel nicht ändern.\n"
 
+# "mkfs aus util-linux-2.10d"
+# "mkfs von util-linux-2.10d"
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s von %s\n"
+
 # "Universalzeit"
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6023,7 +5914,7 @@ msgstr ""
 "  --noadjfile   nicht auf /etc/adjtime zugreifen; erfordert Benutzung von\n"
 "                 entweder --utc oder --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6033,12 +5924,12 @@ msgstr ""
 "                hwclock mitteilen, um welchen Alpha-Typ es sich handelt\n"
 "                  (siehe hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s nimmt keine Nicht-Options-Argumente. Sie gaben %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6047,7 +5938,7 @@ msgstr ""
 "Sie haben mehrere Funktionen angefordert.\n"
 "Sie können immer nur eine Funktion gleichzeitig ausführen.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6056,7 +5947,7 @@ msgstr ""
 "%s: Die Optionen --utc und --localtime schließen sich aus. Sie gaben beide "
 "an.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6065,42 +5956,42 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Ohne --noadjfile müssen Sie entweder --utc oder --localtime angeben.\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Keine brauchbare Zeitangabe. Kann Uhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Sie müssen root sein, um die Hardwareuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Sie müssen root sein, um den „epoch“-Wert zu ändern.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Es wurde keine Zugriffsart gefunden, mit der auf die Hardwareuhr zugegriffen "
 "werden konnte.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6137,7 +6028,6 @@ msgstr "ioctl() konnte Zeit nicht von %s lesen."
 msgid "ioctl KDSHWCLK failed"
 msgstr "Ioctl KDSHWCLK fehlgeschlagen"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Konnte /dev/tty1 oder /dev/vc/1 nicht öffnen"
@@ -6233,9 +6123,6 @@ msgstr "ioctl(RTC_EPOCH_READ) auf %s fehlgeschlagen"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Wir haben Epoche %ld aus %s mit dem RTC_EPOCH_READ-Ioctl gelesen.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6263,7 +6150,6 @@ msgstr "ioctl(RTC_EPOCH_SET) auf %s fehlt"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6272,7 +6158,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6286,7 +6171,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6341,7 +6225,6 @@ msgid "/dev/%s: not a character device"
 msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
 
 # debug
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6356,12 +6239,10 @@ msgstr "Konnte /dev/%s nicht als Standardeingabe öffnen: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: nicht offen für Lesen/Schreiben"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6404,32 +6285,27 @@ msgstr ""
 " oder:   [-hiLmw] [-l login_programm] [-t zeitlimit] [-I initstring] [-H "
 "login_host] zeile baud_rate,... [termtype]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: wenig Speicher, Einloggen könnte fehlschlagen\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "can't malloc for ttyclass"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "can't malloc for grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login on %s from %s denied by default.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login on %s from %s denied.\n"
@@ -6457,11 +6333,12 @@ msgstr "unbekannter Nutzerkontext"
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
+"%s: %s ist nicht autorisiert, die Finger-Informationen für %s zu ändern\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: Kann keinen voreingestellten Kontext für /etc/passwd setzen"
 
 #: login-utils/chfn.c:173
 #, c-format
@@ -6474,8 +6351,8 @@ msgstr "Ändere finger-Information für %s.\n"
 msgid "Password error."
 msgstr "Passwort‐Fehler."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Passwort: "
@@ -6501,7 +6378,7 @@ msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p Bureau-Telefon ]\n"
+"[ -p Büro-Telefon ]\n"
 "\t[ -h Heim-Telefon ] "
 
 #: login-utils/chfn.c:321
@@ -6550,7 +6427,7 @@ msgstr "„malloc“ schlug fehl"
 #: login-utils/chsh.c:137
 #, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: „%s“ ist nicht authorisiert, die Shell für %s zu ändern\n"
+msgstr "%s: „%s“ ist nicht autorisiert, die Shell für %s zu ändern\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6558,11 +6435,14 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: Laufende UID stimmt nicht mit der UID des zu ändernden Nutzers überein,\n"
+"Shell-Änderung abgelehnt.\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: Ihre Shell fehlt in /etc/shells, Shell ändern ist fehlgeschlagen\n"
+msgstr ""
+"%s: Ihre Shell fehlt in /etc/shells, Shell-Änderung ist fehlgeschlagen\n"
 
 #: login-utils/chsh.c:170
 #, c-format
@@ -6653,34 +6533,6 @@ msgstr "Rufen Sie „%s -l“ auf, um die Liste zu sehen.\n"
 msgid "No known shells.\n"
 msgstr "Keine bekannten Shells.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "Konnte /dev/urandom nicht öffnen"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "konnte keine zufälligen Daten aus /dev/urandom lesen"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "Konnte %s nicht zum Lesen öffnen"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat(%s) fehlgeschlagen"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s hat nicht den korrekten Dateimodus"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kann keine Daten von %s lesen"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6690,11 +6542,11 @@ msgstr "Kann %s nicht lesen, beende."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Aufruf: last [-#] [-f datei] [-t tty] [-h hostame] [nutzer ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  noch immer eingeloggt"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6703,15 +6555,15 @@ msgstr ""
 "\n"
 "wtmp beginnt %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc-Fehlschlag.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6720,54 +6572,48 @@ msgstr ""
 "\n"
 "unterbrochen %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAL: kann TTY nicht erneut öffnen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATAL: ungültiges TTY"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h nur für den Superuser.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Aufruf: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Konnte PAM nicht initialisieren: %s"
 
 # unten nochmal mit NL
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Anmeldung: "
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
 # unten noch zwei mal mit anderen NL
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6777,17 +6623,17 @@ msgstr ""
 "\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6796,7 +6642,7 @@ msgstr ""
 "\n"
 "Login inkorrekt\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6805,137 +6651,122 @@ msgstr ""
 "\n"
 "Problem beim Aufsetzen der Sitzung, Abbruch.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Leerer Benutzername in %s:%d. Abbruch."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ungültiger Nutzername „%s“ in %s:%d. Abbruch."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Speicher ist alle!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ungültiger Nutzername"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s Login auf diesem Terminal verweigert.\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login inkorrekt\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Bereits zu viele Nutzer eingeloggt.\n"
-"Versuchen Sie es später wieder.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Sie haben zu viele Prozesse am Laufen.\n"
-
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sie haben neue E-Mail.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sie haben E-Mail.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Kann keinen neuen Prozess erzeugen: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY fehlgeschlagen: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logge ein mit Heimatverzeichnis = „/“.\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kein Speicher für Shellskipt.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: konnte Shellskipt nicht ausführen: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: keine Shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6944,69 +6775,69 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Login-Name viel zu lang.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAME zu lang"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Benutzernamen dürfen nicht mit einem „-“ anfangen.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "EXZESSIV viele Zeilenvorschübe"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7026,168 +6857,31 @@ msgstr "is n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Aufruf: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Wer sind Sie?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Keine solche Gruppe."
 
 # libc.po: "Keine Berechtigung"
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Keine Berechtigung"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Keine Shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Das Passwort muss Zeichen aus zwei der folgenden Klassen enthalten:\n"
-"Groß- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
-"Siehe auch passwd(1) für weitere Informationen.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Benutzen Sie bitte nicht etwas wie Ihren Nutzernamen als Passwort!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Benutzen Sie bitte nicht etwas wie Ihren echten Namen als Passwort!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Aufruf: passwd [nutzername [passwort]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Nur root kann die ein- und zweiargumentigen Formen benutzen.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Aufruf: passwd [-foqsvV] [nutzer [passwort]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kann %s nicht ausführen: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kann Login-namen nicht finden"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Nur root kann das Passwort für andere ändern.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Zu viele Argumente.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kann Nutzernamen nirgends finden. Ist „%s“ wirklich ein Nutzer?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Tut mir leid, ich kann nur lokale Passwörter ändern. Bitte yppasswd benutzen."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID und Nutzername stimmen nicht überein, Hochstapler!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Ändere Passwort für %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Altes Passwort: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Illegales Passwort, Hochstapler."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Neues Passwort: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Passwort nicht geändert."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Neues Passwort wiederholen: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Sie haben sich vertippt. Passwort nicht geändert."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "Passwort geändert, Nutzer %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-PASSWORT GEÄNDERT"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "Passwort durch root geändert, Nutzer %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "rufe setpwnam, um Passwort zu setzen.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Passwort *NICHT* geändert. Später erneut versuchen.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Passwort geändert.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7236,7 +6930,6 @@ msgstr "neu gestartet durch %s: %s"
 msgid "halted by %s: %s"
 msgstr "angehalten durch %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7275,7 +6968,6 @@ msgstr "Fehler beim Ausführen\t%s\n"
 
 # XXX - Have to look at other OSs translation for Broadcast
 # Message
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7366,7 +7058,6 @@ msgstr "Fehler beim Setzen von „close-on-exec“ auf /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "Fehler beim „exec“ von finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "Fehler beim „fork“ von finalprog\n"
@@ -7395,7 +7086,7 @@ msgstr "Öffnen des Verzeichnisses fehlgeschlagen\n"
 msgid "fork failed\n"
 msgstr "„fork“ fehlgeschlagen\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "„exec“ fehlgeschlagen\n"
 
@@ -7436,7 +7127,7 @@ msgstr "Prozesserzeugung (fork): %s"
 #: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: BAD ERROR"
 
 #: login-utils/vipw.c:143
 #, c-format
@@ -7550,12 +7241,6 @@ msgstr "illegaler Wert für Monat: benutzen Sie 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7566,14 +7251,13 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Aufruf: cal [-13smjyV] [[Monat] Jahr]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 
 # The rest is untranslated, leave it (MPi)
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib’s Day"
 
@@ -7708,7 +7392,7 @@ msgstr "%s: Konnte %s nicht in %s umbenennen: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Aufrug: %s von nach Dateien...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7719,25 +7403,25 @@ msgstr ""
 "Benutzen Sie „%s [optionen] %s“, wenn Sie es tatsächlich starten wollen.\n"
 "Script nicht gestartet.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Aufruf: script [-a] [-f] [-q] [-t] [Datei]\n"
 
 # Not really nice...
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script wurde gestartet, die Datei ist %s\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script wurde gestartet: %s"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7746,254 +7430,253 @@ msgstr ""
 "\n"
 "Script beendet: %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Keine ptys mehr.\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term Terminalname ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ Attribut ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabN = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabN = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file Dumpdateiname ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq Freqnummer ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kann Stromsparmodus nicht (zurück)setzen\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "„klogctl“ Fehler: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "konnte %s nicht lsesn, und kann Ioctl-Dump nicht durchführen\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
@@ -8068,10 +7751,6 @@ msgstr "Warnung: Konnte %s nicht öffnen: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: Konnte %s nicht öffnen – benutze %s stattdessen\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8184,7 +7863,7 @@ msgstr "%s: Konnte kein Gerät /dev/loop# finden"
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: Keine Zugriffsrechte, um auf /dev/loop# zu schauen"
 
 #: mount/lomount.c:184
 #, c-format
@@ -8204,7 +7883,7 @@ msgstr "%s: Konnte kein freies „loop“-Gerät finden"
 #: mount/lomount.c:287
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr ""
+msgstr "Konnte kein Lock im Speicher bekommen, beende.\n"
 
 #: mount/lomount.c:340
 #, c-format
@@ -8277,31 +7956,31 @@ msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: das Label %s gibt es sowohl auf %s als auch auf %s\n"
+msgstr "%s: Fehler: das Label %s gibt es sowohl auf %s als auch auf %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: werde %s mit %s einhängen\n"
+msgstr "mount: werde %s mittels UUID einhängen\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: werde %s mit %s einhängen\n"
+msgstr "mount: werde %s mittels Label einhängen\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: konnte %s nicht öffnen, also können UUID- und LABEL-Konvertierung\n"
-"       nicht durchgeführt werden.\n"
+"%s: konnte %s nicht öffnen, also können UUID- und Label-Konvertierung  nicht "
+"durchgeführt werden.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: ungültige UUID"
+msgstr "%s: ungültige UUID"
 
 #: mount/mount.c:382
 #, c-format
@@ -8389,84 +8068,74 @@ msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: Diese Version wurde ohne Unterstützung für den Typ „nfs“ kompiliert"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: Mit NFS Version 4 fehlgeschlagen, versuche Version 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: konnte Dateisystemtyp nicht feststellen, und es wurde keiner angegeben"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: Einhängen ist fehlgeschlagen"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: Einhängepunkt %s ist kein Verzeichnis"
 
 # "mount: Zugriff verweigert"
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: keine Berechtigung"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: muss Superuser sein, um mount zu verwenden"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s wird gerade benutzt"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits eingehängt"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ist bereits eingehängt oder %s wird gerade benutzt"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Einhängepunkt %s existiert nicht"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: Einhängepunkt %s ist eine symbolische Verknüpfung auf nirgendwo"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8475,87 +8144,92 @@ msgstr ""
 "mount: Spezialgerät %s existiert nicht\n"
 "       (ein Pfadpräfix ist kein Verzeichnis)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 "mount: %s ist noch nicht eingehängt oder es wurden\n"
 "       ungültige Optionen angegeben"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 "mount: Falscher Dateisystemtyp, ungültige Optionen, der\n"
-"       „Superblock“ von %s ist beschädigt, fehlende Kodierungsseite\n"
-"       oder es sind zu viele Dateisysteme eingehängt"
+"       Superblock von %s ist beschädigt, fehlende\n"
+"       Kodierungsseite oder ein anderer Fehler"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"       (Ist dies vielleicht das IDE-Gerät, an welchem Sie eigentlich\n"
+"       ide-scsi benutzen, so dass sr0 oder sda oder so gebraucht wird?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"       (Versuchen Sie nicht eine erweiterte Partition einzuhängen\n"
+"       statt einer der logischen Partitionen darin?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       Manchmal liefert das Syslog wertvolle Informationen – versuchen\n"
+"       Sie  dmesg | tail  oder so\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "Einhängetabelle ist voll"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: unbekannter Dateisystemtyp „%s“"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: Wahrscheinlich meinten sie „%s“"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: Vielleicht meinten Sie „iso9660“?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: Vielleicht meinten Sie „vfat“?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s hat eine falsche Geräte-Nummer oder der\n"
 "       Dateisystemtyp %s wird nicht unterstützt"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ist kein blockorientiertes Gerät und „stat“ schlägt fehl?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8565,77 +8239,73 @@ msgstr ""
 "       Gerät (Vielleicht hilft „insmod Treiber“?)"
 
 # "versuchen"
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ist kein blockorientiertes Gerät\n"
 "       (Vielleicht probieren Sie „-o loop“?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr "mount: %s%s is schreibgeschützt, doch Option „-w“ ist explizit gegeben"
+msgstr ""
+"mount: %s%s ist schreibgeschützt, doch Option „-w“ ist explizit gegeben"
 
 # That sounds somehow dumb.
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des Doppelpunkts wird NFS angenommen\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des //-Präfixes wird smbfs angenommen\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: „%s“ wird im Hintergrund fortgesetzt\n"
 
 # Not really nice
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: „%s“ schlug fehl\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8683,34 +8353,34 @@ msgstr ""
 "Weitere Optionen: [-nfFrsvw] [-o optionen] [-p passwdfd].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden – Erzeuge sie...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: keine passende Partition gefunden"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: Hänge %s ein\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: Konnte %s nicht in %s finden"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: Konnte %s nicht in %s oder %s finden"
@@ -8752,99 +8422,99 @@ msgstr "       Werde den Typ %s versuchen\n"
 msgid "Trying %s\n"
 msgstr "Versuche %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: übermäßig langes host:dir-Argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: Mehrere Rechnernamen werden nicht unterstützt\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: einzuhängendes Verzeichnis nicht im host:dir-Format\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: Konnte die Adresse von %s nicht herausfinden\n"
 
 # unten nochmal als Frage, und für umount
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ungültige hp->h_length bekommen\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: übermäßig langes Options-Argument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Warnung: unbekannte „proto=“-Option.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Warnung: Die Option „namlen“ wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Warnung: Die Option „nolock“ wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "unbekannte nfs-Mount-Option: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ungültige hp->h_length bekommen?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS über TCP wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "NFS-Socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "NFS-bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "NFS-Server meldete Service als nicht verfügbar"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "Portmapper benutzt um NFS-Port zu finden\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "benutze Port %d für NFS-Dämonen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "NFS-Verbindung"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "unbekannter NFS-Status-Rückgabewert: %d"
@@ -8853,8 +8523,8 @@ msgstr "unbekannter NFS-Status-Rückgabewert: %d"
 msgid "bug in xstrndup call"
 msgstr "Fehler im Aufruf von xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8863,10 +8533,10 @@ msgid ""
 msgstr ""
 "Aufruf: %s [-hV]\n"
 "        %s -a [-e] [-v]\n"
-"        %s [-v] [-p Priorität] Spezialdatei ...\n"
+"        %s [-v] [-p Priorität] Spezialdatei|LABEL=Volume_Name ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8878,80 +8548,80 @@ msgstr ""
 "        %s [-v] Spezialdatei ...\n"
 
 # The first %s is swapon/swapoff
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: Kann das Gerät für %s nicht finden\n"
+msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
 # stat
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: Konnte „stat“ nicht auf %s anwenden: %s\n"
+msgstr "%s: Konnte „stat“ nicht auf %s anwenden: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
 # holes
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
+msgstr "%s: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "Rechner: %s, Verzeichnis: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: Konnte die Adresse von %s nicht herausfinden\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ungültige hp->h_length bekommen\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s ist nicht eingehängt"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
@@ -8960,64 +8630,62 @@ msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: nur der Superuser kann umount durchführen"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "konnte %s nicht aushängen – versuche stattdessen %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9028,47 +8696,46 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Kann nicht öffnen \"\"\n"
+msgstr "Kann \"\" nicht aushängen\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: Nur „root“ kann dies tun"
 
@@ -9088,6 +8755,8 @@ msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Datei %s, für Schwellenwert %lu, maximale Zeichenzahl in FIFO war %d\n"
+"und die maximale Transferrate in Zeichen/Sekunde war %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -9096,6 +8765,9 @@ msgid ""
 "in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Datei %s, für Schwellenwert %lu und Auszeit-Wert %lu, maximale Zeichenzahl "
+"in FIFO war %d\n"
+"und die maximale Transferrate in Zeichen/Sekunde war %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
@@ -9140,45 +8812,45 @@ msgstr "Konnte %s nicht öffnen: %s\n"
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr ""
+msgstr "Kann %s nicht auf Schwelle %d setzen: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr ""
+msgstr "Kann %s nicht auf Zeitschwelle %d setzen: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr ""
+msgstr "Kann Schwelle für %s nicht ermitteln: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr ""
+msgstr "Kann Auszeit für %s nicht ermitteln: %s\n"
 
 #: sys-utils/cytune.c:307
 #, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr ""
+msgstr "%s: %ld aktuelle Schwelle und %ld aktuelle Auszeit\n"
 
 #: sys-utils/cytune.c:310
 #, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr ""
+msgstr "%s: %ld voreingestellte Schwelle und %ld voreingestellte Auszeit\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr ""
+msgstr "Kann Signalhandler nicht ermitteln"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "„gettimeofday“ fehlgeschlagen"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr ""
+msgstr "Kann kein CYGETMON auf %s auslösen: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9209,15 +8881,16 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: Unbekannte Option „-%c“\n"
+msgstr "flock: Unbekannte Option, breche ab.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Aufruf: flock [--shared | --timeout=Sekunden] Dateiname Befehl {Arg Arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9348,7 +9021,7 @@ msgid ""
 "\t-a : all (default)\n"
 msgstr ""
 "\t-s : Semaphoren\n"
-"\r-a : alles (Voreinstellung)\n"
+"\t-a : alles (Voreinstellung)\n"
 
 #: sys-utils/ipcs.c:133
 #, c-format
@@ -9388,8 +9061,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr "----- Gemeinsamer Speicher: Grenzen -----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9558,11 +9229,11 @@ msgstr "Nicht gesetzt"
 
 #: sys-utils/ipcs.c:374
 msgid "dest"
-msgstr ""
+msgstr "Ziel"
 
 #: sys-utils/ipcs.c:375
 msgid "locked"
-msgstr ""
+msgstr "gesperrt"
 
 #: sys-utils/ipcs.c:395
 #, c-format
@@ -9693,7 +9364,7 @@ msgstr "zugewiesene Warteschlangen = %d\n"
 #: sys-utils/ipcs.c:513
 #, c-format
 msgid "used headers = %d\n"
-msgstr ""
+msgstr "benutzte Köpfe = %d\n"
 
 #: sys-utils/ipcs.c:514
 #, c-format
@@ -10176,18 +9847,18 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_datei] [-n länge] [-s überspringen] "
 "[datei ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 "Aufruf: %s [-dflpcsu] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: Unbekannte Option „-%c“\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10198,8 +9869,7 @@ msgstr ""
 "*** %s: Verzeichnis ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10210,45 +9880,45 @@ msgstr ""
 "******** %s: Keine Textdatei ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Benutzen Sie q oder Q zum Beenden]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mehr--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Nächste Datei: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Leertaste zum Fortfahren, ›q‹ zum Beenden.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "... %d Seiten zurück"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "... eine Seite zurück"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...überspringe eine Zeile"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...überspringe %d Zeilen"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10258,7 +9928,7 @@ msgstr ""
 "***Zurück***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10271,7 +9941,7 @@ msgstr ""
 "neue\n"
 "Voreinstellung wird.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10316,34 +9986,34 @@ msgstr ""
 ":f                      momentanen Dateinamen und Zeilennummer zeigen\n"
 ".                       letzten Befehl wiederholen\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Drücken Sie ›h‹ für Hilfe.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "„%s“ Zeile %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Keine Datei] Zeile %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Überlauf\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...Überspringe\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Fehler beim Ausführen von „re_exec()“"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10351,15 +10021,15 @@ msgstr ""
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "Kann keinen neuen Prozess erzeugen\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10367,19 +10037,19 @@ msgstr ""
 "\n"
 "...Überspringe "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Springe zu Datei"
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Springe zurück zu Datei "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Kein vorheriger Befehl, der eingefügt werden könnte"
 
@@ -10432,7 +10102,7 @@ msgstr "hexdump: Ungültiges Format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ungültiges Umwandlungszeichen %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10440,84 +10110,81 @@ msgstr ""
 "%s: Aufruf: %s [-zahl] [-p zkette] [-cefnrs] [+zeile] [+/muster/] [dateien]\n"
 
 # libc: "Die Option „%s“ erfordert ein Argument\n"
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: Option erfordert ein Argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: unzulässige Option -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...springe vorwärts\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...springe rückwärts\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Keine nächste Datei"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Kein vorhergehende Datei"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Fehler beim Lesen aus %s-Datei\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: unbekannter Fehler in %s-Datei\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Konnte keine temporäre Datei anlegen.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Fehler in regulärem Ausdruck: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Dateiende)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Kein gemerkter Suchtext"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kann nicht öffnen "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "gespeichert"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !befehl im rflag-Modus nicht erlaubt.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() fehlgeschlagen, später versuchen\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Nächste Datei: "
 
@@ -10532,14 +10199,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "Aufruf: rev [Datei ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "Konnte %s nicht zum Lesen öffnen\n"
+msgstr "Konnte „%s“ nicht zum Lesen öffnen\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "Aufruf: %s [Datei]\n"
+msgstr "Aufruf: tailf Logdatei\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10571,6 +10238,156 @@ msgstr "Eingabezeile ist zu lang.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ungültige Nummer: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxfehler: „%s“\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Keine solche Parametermenge: „%s“\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] Gerät Name\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] gerät größe sekt köpfe spuren stretch lücke rate spec1 "
+#~ "fmt_lücke\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] Gerät\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] Gerät\n"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "Konnte /dev/urandom nicht öffnen"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "konnte keine zufälligen Daten aus /dev/urandom lesen"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "Konnte %s nicht zum Lesen öffnen"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat(%s) fehlgeschlagen"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s hat nicht den korrekten Dateimodus"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kann keine Daten von %s lesen"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Bereits zu viele Nutzer eingeloggt.\n"
+#~ "Versuchen Sie es später wieder.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Sie haben zu viele Prozesse am Laufen.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Das Passwort muss Zeichen aus zwei der folgenden Klassen enthalten:\n"
+#~ "Groß- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
+#~ "Siehe auch passwd(1) für weitere Informationen.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Benutzen Sie bitte nicht etwas wie Ihren Nutzernamen als Passwort!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Benutzen Sie bitte nicht etwas wie Ihren echten Namen als Passwort!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Aufruf: passwd [nutzername [passwort]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Nur root kann die ein- und zweiargumentigen Formen benutzen.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Aufruf: passwd [-foqsvV] [nutzer [passwort]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kann %s nicht ausführen: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kann Login-namen nicht finden"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Nur root kann das Passwort für andere ändern.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Zu viele Argumente.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Kann Nutzernamen nirgends finden. Ist „%s“ wirklich ein Nutzer?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Tut mir leid, ich kann nur lokale Passwörter ändern. Bitte yppasswd "
+#~ "benutzen."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID und Nutzername stimmen nicht überein, Hochstapler!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Ändere Passwort für %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Altes Passwort: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Illegales Passwort, Hochstapler."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Neues Passwort: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Passwort nicht geändert."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Neues Passwort wiederholen: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Sie haben sich vertippt. Passwort nicht geändert."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "Passwort geändert, Nutzer %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-PASSWORT GEÄNDERT"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "Passwort durch root geändert, Nutzer %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "rufe setpwnam, um Passwort zu setzen.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Passwort *NICHT* geändert. Später erneut versuchen.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Passwort geändert.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: Diese Version wurde ohne Unterstützung für den Typ „nfs“ kompiliert"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Warnung: lasse Partitionen hinter %d aus\n"
 
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
new file mode 100644
index 000000000..fedb6a06d
--- /dev/null
+++ b/po/en@boldquot.header
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff --git a/po/en@quot.header b/po/en@quot.header
new file mode 100644
index 000000000..a9647fc35
--- /dev/null
+++ b/po/en@quot.header
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 000000000..e546cfaef
--- /dev/null
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index cd4ce6a48..e0fc5ba0a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-22 01:31+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -119,7 +119,7 @@ msgstr "%s: error de ioctl en %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "uso:\n"
@@ -164,13 +164,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "uso: %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -195,7 +194,7 @@ msgstr "Doble densidad"
 msgid "Single"
 msgstr "Simple densidad"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -210,103 +209,103 @@ msgstr ""
 " -v         es m�s explicativo\n"
 " fichero    fichero que se comprueba\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: �error %d al descomprimir! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: error de tama�o en el enlace simb�lico `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  descomprimiendo bloque en %ld a %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: modo falso en `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  hueco en %ld (%d)\n"
 
 # No me gusta. Se admiten sugerencias.
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: No bloque (%ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: No tama�o (%ld vs %ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: cramfs inv�lido, longitud de ruta err�nea\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: se ha compilado sin soporte para -x\n"
 
 # FIXME: Sobra el espacio final
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 "%s: atenci�n, no se puede determinar el tama�o del sistema de ficheros\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s no es un dispositivo de bloques o un fichero\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: cramfs inv�lido, longitud de fichero demasiado corta\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: cramfs inv�lido, magia err�nea\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 "%s: atenci�n, longitud de fichero demasiado grande, �imagen desplazada?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: error de crc, cramfs inv�lido\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: atenci�n, imagen cramfs antigua, sin CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: cramfs inv�lido, supoerbloque err�neo\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: cramfs inv�lido, el final de los datos de directorios (%ld)\n"
 "es distinto del comienzo de los datos de ficheros (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -790,7 +789,7 @@ msgstr "demasiados nodos-i; el m�ximo es 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -860,18 +859,18 @@ msgstr "error al escribir la entrada `..'"
 msgid "error closing %s"
 msgstr "error al cerrar %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uso: mkfs [-V] [-t tipo_sf] [opciones_sf] dispositivo [tama�o]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: �No queda memoria!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versi�n %s (%s)\n"
@@ -935,7 +934,6 @@ msgstr ""
 "Se excedi� MAXENTRIES. Incremente este valor en mkcramfs.c y recompile.\n"
 "Saliendo.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -991,10 +989,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "fall� la escritura de la imagen ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1075,7 +1069,6 @@ msgstr "No se pueden escribir los nodos-i"
 msgid "write failed in write_block"
 msgstr "Error de escritura en write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1111,7 +1104,7 @@ msgstr "Error de b�squeda durante comprobaci�n de bloques"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores extra�os en do_check: probablemente existan errores\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "Error de b�squeda en check_blocks"
 
@@ -1155,109 +1148,109 @@ msgstr "No se puede ejecutar `stat' sobre %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "No se intentar� crear el sistema de ficheros en '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "El tama�o de p�gina %d especificado por el usuario es incorrecto\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Se utiliza el tama�o de p�gina %d especificado por el usuario,\n"
 "en lugar de los valores del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Presuponiendo p�ginas de tama�o %d (no %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etiqueta"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTAMP�G] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "Hay demasiadas p�ginas incorrectas"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "Una p�gina incorrecta\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu p�ginas incorrectas\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: error: no se ha especificado d�nde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: error: el tama�o %lu es superior al tama�o del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: error: versi�n desconocida %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: error: el �rea de intercambio debe tener como m�nimo %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: atenci�n: el �rea de intercambio se trunca a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr ""
 "%s: error: no se ha especificado d�nde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "No se intentar� crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "muy grave: no se puede leer la primera p�gina"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1272,115 +1265,77 @@ msgstr ""
 "Si realmente desea crear el espacio de intercambio swap v0 en dicho\n"
 "dispositivo, utilice la opci�n -f para forzar la operaci�n.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No se puede configurar el espacio de intercambio: no se puede leer"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espacio de intercambio versi�n %d, tama�o = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "No se puede escribir la p�gina de firma"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "N�mero inv�lido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Error de sintaxis: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Este par�metro no est� establecido: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] dispositivo nombre\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] disp. tama�o sect. cabez. pistas stretch gap rate spec1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dispositivo\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dispositivo\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilizable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espacio libre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Se ha modificado el disco.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
@@ -1388,7 +1343,7 @@ msgstr ""
 "bien\n"
 "actualizada.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1401,333 +1356,314 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina de manual de cfdisk\n"
 "para obtener m�s informaci�n.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERROR MUY GRAVE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pulse una tecla para salir de cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "No se puede leer la unidad de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "No se puede escribir en la unidad de disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Hay demasiadas particiones"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partici�n empieza antes del sector 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partici�n termina antes del sector 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partici�n empieza despu�s del fin de disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partici�n termina despu�s del fin de disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partici�n termina en el �ltimo cilindro parcial"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "Las particiones l�gicas no est�n en orden de disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "Solapamiento de particiones l�gicas"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "Solapamiento de particiones l�gicas ampliadas"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "���� Error interno al crear unidad l�gica sin partici�n extendida !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "No se puede crear una unidad l�gica aqu�; se crear�an dos particiones "
 "extendidas"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 "Elemento de men� demasiado largo; la apariencia del men� puede ser extra�a."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Men� sin direcci�n; la opci�n predeterminada es horizontal."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla no permitida"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pulse una tecla para continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Crea una nueva partici�n primaria"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "L�gica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Crea una nueva partici�n l�gica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "No crea ninguna partici�n"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "���� Error interno !!!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Tama�o (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Principio"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "A�ade la partici�n al principio del espacio libre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "A�ade la partici�n al final del espacio libre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "No hay espacio para crear la partici�n extendida"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "No hay tabla de particiones.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "No hay tabla de particiones. Se comienza con una tabla vac�a."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Firma err�nea en la tabla de particiones"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Tipo de tabla de particiones desconocido"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "�Quiere comenzar con una tabla vac�a? [y/N]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ha especificado m�s cilindros de los que caben en el disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "No se puede abrir la unidad de disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "El disco abierto es de s�lo lectura; no tiene permiso para escribir en �l"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "No se puede obtener el tama�o del disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partici�n primaria incorrecta"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partici�n l�gica incorrecta"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "�Atenci�n!: esta operaci�n puede destruir datos del disco"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "�Est� seguro de que desea escribir la tabla de particiones en el disco?\n"
 "     (s� o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "No se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "s�"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Por favor escriba `s�' (con acento) o `no'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Se est� escribiendo la tabla de particiones en el disco..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Se ha escrito la tabla de particiones, pero la nueva lectura de la tabla\n"
 "ha fallado. Reinicie para actualizar la tabla."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ninguna partici�n primaria est� marcada como iniciable.\n"
 "El MBR de DOS no podr� iniciar esto."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Hay marcada como iniciable m�s de una partici�n primaria.\n"
 "El MBR de DOS no puede iniciar esto."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Escriba el nombre de fichero o pulse Intro para visualizar en pantalla: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidad de disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
 # Masculino, porque se refiere a un tipo de partici�n.
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ninguno"
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/L�g"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primaria"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   L�gica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Inicio"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
 # Masculino, porque se refiere a "Indicadores"
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ninguno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabla de particiones para %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "              Primer     �ltimo\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1735,7 +1671,7 @@ msgstr ""
 "N� Tipo       Sector      Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
 "Indicad.\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1743,475 +1679,472 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Inicio----      -----Final----   Comienzo   N�mero de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr "N� Ind.  Cab. Sec. Cil.  ID  Cab. Sec. Cil.    Sector    Sectores\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "En bruto (raw)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Imprime la tabla utilizando el formato de datos en bruto"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectores"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Imprime la tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabla"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "S�lo imprime la tabla de particiones"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "No imprime la tabla"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla de ayuda para cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk es un programa de particiones de disco basado en curses que"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permite crear, suprimir y modificar particiones en la unidad"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "de disco duro."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Orden        Significado"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-----        -----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Conmuta el indicador de iniciable de la partici�n actual"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprime la partici�n actual"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Cambia los par�metros de cilindros, cabezas y sectores por pista"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ATENCI�N: Se recomienda utilizar esta opci�n �nicamente"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             si se conoce el funcionamiento de la misma."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza la utilizaci�n del disco de la partici�n actual"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Esta opci�n puede hacer que la partici�n sea"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             incompatible con DOS, OS/2,..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nueva partici�n a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Hay varios formatos distintos para la partici�n"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             entre los que puede elegir:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Datos en bruto (exactamente lo que escribir�a en el "
 "disco)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabla con formato en bruto"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Cambia el tipo de sistema de ficheros"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          Cambia las unidades de visualizaci�n del tama�o de la partici�n"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectores y cilindros"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Escribe la tabla de particiones en el disco (W en may�sculas)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Esta operaci�n de escritura puede causar la destrucci�n"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             de datos del disco, por lo que debe confirmarla o rechazarla"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             escribiendo `s�' o `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flecha arriba  Desplaza el cursor a la partici�n anterior"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flecha abajo   Desplaza el cursor a la partici�n siguiente"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Vuelve a dibujar la pantalla"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: todas las �rdenes pueden escribirse en may�sculas o min�sculas"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Cambia la geometr�a de cilindros"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Cabezas"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Cambiar geometr�a de cabezas"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Cambiar geometr�a de sectores"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Ha finalizado la operaci�n de cambio de geometr�a"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Escriba el n�mero de cilindros: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros no permitido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Escriba el n�mero de cabezas: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valor de cabezas no permitido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Escriba el n�mero de sectores por pista: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valor de sectores no permitido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Escriba el tipo de sistema de ficheros: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a vac�o"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a extendido"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/L�g"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconocido (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unidad de disco: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tama�o: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tama�o: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nombre"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Indicadores"
 
 # Este espacio inicial es para que no se pegue con la s de Indicadores
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr " Tipo"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo de S.F."
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sectores"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cilindros"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Tama�o(MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "Tama�o (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Iniciable"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Conmuta el indicador de iniciable de la partici�n actual"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Suprime la partici�n actual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometr�a"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Cambia la geometr�a del disco (s�lo para usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ayuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiza el uso de disco de la partici�n actual (s�lo usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nueva"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Crea una nueva partici�n a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Salir"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Cambia el tipo de sistema de ficheros (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Cambia las unidades para el tama�o de la partici�n (MB, sect., cil.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Escribir"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Escribe la tabla de particiones en el disco (puede destruirse informaci�n)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "No se puede convertir esta partici�n en una partici�n iniciable"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "No se puede suprimir una partici�n vac�a"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "No se puede maximizar esta partici�n"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Esta partici�n se encuentra en estado inutilizable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Esta partici�n ya est� en uso"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "No se puede cambiar el tipo de una partici�n vac�a"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "No hay m�s particiones"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Orden ilegal"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2283,9 +2216,9 @@ msgstr ""
 "\n"
 "Etiqueta BSD para el dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Orden  Acci�n"
 
@@ -2305,10 +2238,9 @@ msgstr "   i   Instala secuencia de inicio"
 msgid "   l   list known filesystem types"
 msgstr "   l   Lista los tipos de sistemas de ficheros conocidos"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   Imprime este men�"
 
@@ -2320,14 +2252,14 @@ msgstr "   n   A�ade una nueva partici�n BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   Imprime la tabla de particiones BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   Sale sin guardar los cambios"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   Vuelve al men� principal"
 
@@ -2371,13 +2303,13 @@ msgstr "No hay ninguna partici�n *BSD en %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Orden de etiqueta de disco BSD (m para obtener ayuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s o +tama�o o +tama�oM o +tama�oK"
@@ -2422,8 +2354,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2524,8 +2454,8 @@ msgstr "sectores/pista"
 msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -2582,7 +2512,7 @@ msgstr "Secuencia de inicio instalada en %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partici�n (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Se ha creado el n�mero m�ximo de particiones\n"
@@ -2606,7 +2536,7 @@ msgstr ""
 "\n"
 "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2627,7 +2557,7 @@ msgstr ""
 "-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
 "-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2643,198 +2573,184 @@ msgstr ""
 "  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No se puede leer %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No se puede buscar en %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No se puede escribir %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "No se puede asignar m�s memoria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Error muy grave\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   Conmuta el indicador de s�lo lectura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Modifica la etiqueta de disco bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Conmuta indicador de montable"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   Suprime una partici�n"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   Lista los tipos de particiones conocidos"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   A�ade una nueva partici�n"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Crea una nueva tabla de particiones DOS vac�a"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   Imprime la tabla de particiones"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Crea una nueva etiqueta de disco Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   Cambia el identificador de sistema de una partici�n"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   Cambia las unidades de visualizaci�n/entrada"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   Verifica la tabla de particiones"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   Escribe la tabla en el disco y sale"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Funciones adicionales (s�lo para usuarios avanzados)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   Selecciona partici�n iniciable"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   Modifica entrada de fichero de inicio"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   Selecciona partici�n de intercambio sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Conmuta el indicador de iniciable"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Conmuta el indicador de compatibilidad con DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Cambia el n�mero de cilindros alternativos"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   Cambia el n�mero de cilindros"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Imprime los datos en bruto de la tabla de particiones"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Cambia el n�mero de sectores adicionales por cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   Cambia el n�mero de cabezas"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   Cambia el factor de interleave"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Cambia la velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   Cambia el n�mero de sectores por pista"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Cambia el n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Mueve el principio de los datos de una partici�n"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   Lista las particiones extendidas"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Crea una tabla de particiones IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   Corrige el orden de las particiones"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Debe establecer"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2843,11 +2759,11 @@ msgstr ""
 "%s%s.\n"
 "Puede efectuar esta operaci�n desde el men� de funciones adicionales.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2866,12 +2782,12 @@ msgstr ""
 "2) software de arranque o particionamiento de otros sistemas operativos\n"
 "   (p.ej. FDISK de DOS, FDISK de OS/2)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplazamiento incorrecto en particiones extendidas primarias\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2880,19 +2796,19 @@ msgstr ""
 "Atenci�n: se omiten las particiones despu�s de la n�mero %d.\n"
 "Se borrar�n si guarda esta tabla de particiones.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Atenci�n: puntero de enlace adicional en tabla de particiones %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Atenci�n: no se tienen en cuenta los datos adicionales de la tabla de "
 "particiones %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2905,17 +2821,17 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: el tama�o del sector es %d (no %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podr� escribir la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2924,7 +2840,7 @@ msgstr ""
 "Este disco tiene tanto magia DOS como BSD.\n"
 "Utilice la orden 'b' para ir al modo BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2933,17 +2849,17 @@ msgstr ""
 "El dispositivo no contiene una tabla de particiones DOS v�lida ni una "
 "etiqueta de disco Sun o SGI o OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Error interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "No se tiene en cuenta la partici�n extendida adicional %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2952,7 +2868,7 @@ msgstr ""
 "Atenci�n: el indicador 0x%04x inv�lido de la tabla de particiones %d se "
 "corregir� mediante w(rite)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2961,83 +2877,83 @@ msgstr ""
 "\n"
 "se ha detectado EOF tres veces - saliendo...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (escriba L para ver los c�digos): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor predeterminado %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Se est� utilizando el valor predeterminado %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor est� fuera del rango.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "N�mero de partici�n"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Atenci�n: la partici�n %d es de tipo vac�o\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Se ha seleccionado la partici�n %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "�No hay ninguna partici�n definida!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "�Ya se han definido todas las particiones primarias!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Se cambian las unidades de visualizaci�n/entrada a %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATENCI�N: la partici�n %d es una partici�n extendida\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "El indicador de compatibilidad con DOS est� establecido\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no est� establecido\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partici�n %d todav�a no existe\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3050,7 +2966,7 @@ msgstr ""
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partici�n con la orden `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3059,7 +2975,7 @@ msgstr ""
 "No puede convertir una partici�n en extendida ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3070,7 +2986,7 @@ msgstr ""
 "ya que as� lo prev� SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3081,53 +2997,53 @@ msgstr ""
 "y la partici�n 11 como volumen completo (6) ya que IRIX as� lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Se ha cambiado el tipo de sistema de la partici�n %d por %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partici�n %d tiene distintos principios f�sicos/l�gicos (�no Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " f�sicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partici�n %d tiene distintos finales f�sicos/l�gicos:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partici�n %i no empieza en el l�mite del cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partici�n %i no termina en un l�mite de cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3136,7 +3052,7 @@ msgstr ""
 "\n"
 "Disco %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3145,17 +3061,17 @@ msgstr ""
 "\n"
 "Disco %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d cabezas, %d sectores/pista, %d cilindros"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", %llu sectores en total"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3164,7 +3080,7 @@ msgstr ""
 "Unidades = %s de %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3173,7 +3089,7 @@ msgstr ""
 "No hay nada que hacer. El orden ya es correcto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3183,17 +3099,17 @@ msgstr ""
 "Esto no parece una tabla de particiones\n"
 "Probablemente ha seleccionado el dispositivo que no era.\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Inicio    Comienzo      Fin      Bloques  Id  Sistema\n"
 
 # Nota: si se pone Dispositivo no queda bien el resto de la l�nea.
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Disposit."
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3202,7 +3118,7 @@ msgstr ""
 "\n"
 "Las entradas de la tabla de particiones no est�n en el orden del disco\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3213,83 +3129,83 @@ msgstr ""
 "Disco %s: %d cabezas, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "N� IA Cab Sect Cil Cab Sect Cil     Inicio    Tama�o ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Atenci�n: la partici�n %d contiene el sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partici�n %d: el cabeza %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partici�n %d: el sector %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partici�n %d: el cilindro %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partici�n %d: sectores anteriores %d no concuerdan con total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Atenci�n: inicio de datos incorrecto en partici�n %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Atenci�n: la partici�n %d se solapa con la partici�n %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Atenci�n: la partici�n %d est� vac�a\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partici�n l�gica %d no est� por completo en la partici�n %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "El total de sectores asignados %d supera el m�ximo %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld sectores no asignados\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partici�n %d ya est� definida. Supr�mala antes de volver a a�adirla.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hay disponible ning�n sector libre\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3302,23 +3218,23 @@ msgstr ""
 "        tabla de particiones DOS vac�a primero. (Use o.)\n"
 "        ATENCI�N: Esto destruir� el contenido de este disco.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Primero debe suprimir alguna partici�n y a�adir una partici�n extendida\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Se est�n usando todas las particiones l�gicas\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Se a�ade una partici�n primaria\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3329,20 +3245,20 @@ msgstr ""
 "%s\n"
 "   p   Partici�n primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   Partici�n l�gica (5 o superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   Partici�n extendida"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "N�mero de partici�n inv�lido para el tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3351,12 +3267,12 @@ msgstr ""
 "�Se ha modificado la tabla de particiones!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Llamando a ioctl() para volver a leer la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3370,7 +3286,7 @@ msgstr ""
 "El n�cleo todav�a usa la tabla antigua.\n"
 "La nueva tabla se usar� en el pr�ximo reinicio.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3383,7 +3299,7 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina man de fdisk\n"
 "para ver informaci�n adicional.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3392,71 +3308,71 @@ msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partici�n %d no tiene ninguna �rea de datos\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "N�mero de cabezas"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "N�mero de sectores"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Atenci�n: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disco %s no contiene una tabla de particiones v�lida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este n�cleo encuentra el tama�o del sector por s� mismo; no se tiene en "
 "cuenta la opci�n -b\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3465,19 +3381,18 @@ msgstr ""
 "Atenci�n: la opci�n -b (establecer tama�o de sector) debe utilizarse con un "
 "dispositivo especificado\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco OSF/1 en %s, entrando en el modo de\n"
 "etiqueta de disco.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3486,16 +3401,16 @@ msgstr ""
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3562,15 +3477,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3651,7 +3566,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u tama�o%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3709,7 +3623,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Existe m�s de una entrada de disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hay ninguna partici�n definida\n"
@@ -3795,7 +3709,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHa elegido un nombre de fichero de inicio no habitual.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3817,11 +3730,10 @@ msgstr ""
 "Escriba S� si est� seguro de querer dar una etiqueta distinta a esta "
 "partici�n.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "S�\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3900,44 +3812,43 @@ msgstr "Intentando conservar los par�metros de la partici�n %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tPRINCIPIO=%d\tLONGITUD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vac�a"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco completo"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3951,12 +3862,12 @@ msgstr ""
 "como cabezas, sectores, cilindros y particiones\n"
 "o forzar una nueva etiqueta (orden s en men� principal)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "La configuraci�n autom�tica ha encontrado %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3969,7 +3880,7 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3979,72 +3890,72 @@ msgstr ""
 "   ?   Con configuraci�n autom�tica\n"
 "   0   Personalizada (con valores predeterminados detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Seleccionar tipo (? para autom�tico, 0 para personalizado): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Error de configuraci�n autom�tica.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectores/pista"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindros f�sicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Puede cambiar todos los par�metros de disco desde el men� x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete 3,5 pulg."
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partici�n %d no termina en un l�mite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partici�n %d se solapa con otras en los sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espacio no utilizado - sectores 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4053,7 +3964,7 @@ msgstr ""
 "Ya hay otras particiones que abarcan el disco completo.\n"
 "Suprima algunas o reduzca su tama�o antes de volver a intentarlo.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4064,7 +3975,7 @@ msgstr ""
 "el valor %d %s que ha especificado se solapa con otra partici�n.\n"
 "La entrada que ha realizado se ha cambiado por %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4073,7 +3984,7 @@ msgstr ""
 "Si desea mantener la compatibilidad con SunOS/Solaris, se recomienda dejar\n"
 "esta partici�n como disco completo (5), con principio en 0, con %u sectores\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4087,7 +3998,7 @@ msgstr ""
 "Escriba S� si est� seguro de que desea que la partici�n\n"
 "est� marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4106,7 +4017,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4119,16 +4030,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4152,32 +4063,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extendida"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4186,7 +4091,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4279,12 +4183,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4305,8 +4207,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4316,7 +4216,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4337,12 +4236,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4371,12 +4268,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Hibernaci�n de IBM Thinkpad"
@@ -4385,7 +4280,6 @@ msgstr "Hibernaci�n de IBM Thinkpad"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4450,30 +4344,22 @@ msgstr "Datos sin SF"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilidad Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4482,118 +4368,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "inicio Linux/PA-RISC"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Error de b�squeda en %s; no se puede buscar en %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Error de b�squeda: se esperaba 0x%08x%08x, se ha obtenido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "No queda memoria; se abandona el intento\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Error de lectura en %s; no se puede leer el sector %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERROR: el sector %lu no tiene una firma msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Error de escritura en %s; no se puede escribir el sector %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "No se puede abrir el fichero de guardar sector de partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "No se puede ejecutar stat para fichero de restaurar partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "Tama�o incorrecto de fichero de restaurar partici�n; no se efect�a "
 "restauraci�n\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "�No queda memoria?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "No se puede abrir fichero de restaurar partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "No se puede abrir el dispositivo %s para escribir\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Error al escribir el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: no se puede obtener la geometr�a\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: no se puede obtener el tama�o\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4604,22 +4483,22 @@ msgstr ""
 "disco entero. Usar fdisk con ella probablemente no tiene sentido.\n"
 "[Use la opci�n --force si realmente desea realizar esta operaci�n.]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu cabezas\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu sectores\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu cilindros\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4628,7 +4507,7 @@ msgstr ""
 "Atenci�n: n�mero improbable de sectores (%lu); normalmente 63 como m�ximo\n"
 "Esto causar� problemas con el software que direccione con Cil./Cab./Sector\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4637,7 +4516,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabezas, %lu sectores/pista\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4645,7 +4524,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cabeza: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4654,7 +4533,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para sector: %lu\n"
 "(debe estar entre 1 y %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4663,7 +4542,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cilindros: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4672,12 +4551,12 @@ msgstr ""
 "Id  Nombre\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Volviendo a leer la tabla de particiones...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4685,31 +4564,31 @@ msgstr ""
 "La orden para volver a leer la tabla de particiones ha fallado.\n"
 "Reinicie el sistema ahora, antes de utilizar mkfs.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error al cerrar %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: esta partici�n no existe\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Formato no reconocido; utilizando sectores\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabla de particiones de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato no implementado; utilizando %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4718,12 +4597,12 @@ msgstr ""
 "Unidades = cilindros de %lu bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp.  Inic. Princ.   Fin   N�cil    N�bloq.   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4732,12 +4611,12 @@ msgstr ""
 "Unidades = sectores de 512 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp.  Inicio  Principio   Fin   N� sect.  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4746,13 +4625,13 @@ msgstr ""
 "Unidades = bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp.  Inic.  Principio   Fin    N�bloques Id  Sistema\n"
 
 # FIXME: �Qu� es un mebibyte?
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4762,35 +4641,35 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp.  Inic Princ.  Fin    MiB    N�bloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tprincipio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%"
 "ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "No se ha encontrado ninguna partici�n\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4801,53 +4680,53 @@ msgstr ""
 "  para Cil./Cab./Sect.=*/%ld/%ld (en lugar de %ld/%ld/%ld).\n"
 "Para este listado se presupondr� esta geometr�a.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "No existe ninguna tabla de particiones.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Extra�amente s�lo hay %d particiones definidas.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Atenci�n: la partici�n %s tiene tama�o 0 pero no est� marcada como vac�a\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Atenci�n: la partici�n %s tiene tama�o 0 y es iniciable\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Atenci�n: la partici�n %s tiene tama�o 0 y principio distinto de cero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Atenci�n: la partici�n %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no se encuentra dentro de la partici�n %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Atenci�n: las particiones %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "y %s se solapan\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4856,17 +4735,17 @@ msgstr ""
 "Atenci�n: la partici�n %s contiene parte de la tabla de particiones\n"
 "(sector %lu), y la destruir� cuando se llene\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Atenci�n: la partici�n %s empieza en el sector 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Atenci�n: la partici�n %s finaliza m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4874,17 +4753,17 @@ msgstr ""
 "Como m�ximo una de las particiones primarias puede ser extendida\n"
 " (aunque esto no es un problema bajo Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Atenci�n: la partici�n %s no empieza en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Atenci�n: la partici�n %s no termina en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4893,7 +4772,7 @@ msgstr ""
 "Esto no es poblema para LILO, pero el MBR de DOS no se iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4901,7 +4780,7 @@ msgstr ""
 "Atenci�n: normalmente s�lo es posible iniciar desde particiones primarias.\n"
 "LILO no tiene en cuenta el indicador de iniciable.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4911,11 +4790,11 @@ msgstr ""
 "Esto no es problema para LILO, pero el MBR de DOS no iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "comienzo"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4923,24 +4802,24 @@ msgstr ""
 "Partici�n %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "final"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partici�n %s: fin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n %s termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4949,7 +4828,7 @@ msgstr ""
 "Atenci�n: se desplaza el comienzo de la partici�n extd de %ld a %ld\n"
 "(Solamente para visualizarlo. No se cambia su contenido.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4958,133 +4837,132 @@ msgstr ""
 "DOS y Linux interpretar�n el contenido de forma diferente.\n"
 "\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "demasiadas particiones - se ignoran las posteriores al n� (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "��rbol de particiones?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Administrador de disco detectado; no se puede tratar esto\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "Detectada firma DM6 - abandonando\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n extendida de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n BSD de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Se ha especificado el indicador -n: no se ha producido ning�n cambio\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operaci�n\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "L�nea de entrada larga o incompleta; se abandona la operaci�n\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Error de entrada: se esperaba `=' despu�s del campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Error de entrada: car�cter inesperado %c tras campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "N�mero demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "Datos extra�os tras el n�mero\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partici�n\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partici�n extendida adyacente\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "No queda m�s espacio\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Atenci�n: el tama�o dado (%lu) supera el tama�o m�ximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Atenci�n: partici�n vac�a\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atenci�n: principio de partici�n incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "�Especificaci�n parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Partici�n extendida en ubicaci�n no esperada\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5096,48 +4974,44 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente s�lo debe especificar <principio> y <tama�o> (y quiz�s <tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versi�n"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opciones �tiles:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Muestra el tama�o de una partici�n"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprime o cambia el identificador de partici�n"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Muestra las particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:       Igual, pero con un formato adecuado para entrada\n"
 "                         posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  N�mero de cilindros, etc. desde 1 y no desde 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5145,60 +5019,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Acepta/muestra en unidades de\n"
 "                         sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Muestra los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [o --DOS]:        Para compatibilidad con DOS: se pierde algo de "
 "espacio"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Hace que el n�cleo vuelva a leer la tabla de\n"
 "                         particiones"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambia �nicamente la partici�n con el n�mero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribe realmente en el disco"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichero :         Guarda los sectores que se van a sobreescribir\n"
 "                         en `fichero'"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichero:          Restaura estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprime la versi�n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5206,7 +5080,7 @@ msgid ""
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5214,7 +5088,7 @@ msgstr ""
 "    -x [o --show-extended]:  Muestra tambi�n las particiones extendidas en\n"
 "                             salida o espera sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
@@ -5222,114 +5096,114 @@ msgstr ""
 "para\n"
 "                           Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprime mensajes de aviso"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometr�a detectada utilizando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Establece el n�mero de cilindros que se utilizar�n"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 "    -H# [o --heads #]:     Establece el n�mero de cabezas que se utilizar�n"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [o --sectors #]:   Establece el n�mero de sectores que se utilizar�n"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobaci�n de coherencia con:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Hace lo que ordene el usuario, aunque sea il�gico"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\t Enumera las particiones activas del dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2 ... activar particiones n1 ..., desactivar el resto\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An dispositivo\t activa la partici�n n, desactiva el resto\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "�ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu bloques\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo n�mero-partici�n\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uso: sfdisk --change-id dispositivo n�mero-partici�n Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo n�mero-partici�n [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "puede especificar s�lo un dispositivo (salvo con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabezas, %ld sectores por pista\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No se puede obtener el tama�o de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte activo incorrecto: 0x%x en lugar de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5337,7 +5211,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5346,35 +5220,35 @@ msgstr ""
 "Tiene %d particiones primarias activas. No tiene importancia para LILO,\n"
 "pero el MBR de DOS s�lo puede iniciar discos con una partici�n activa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partici�n %s tiene el identificador %x y no est� oculta\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco est� en uso.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Atenci�n: %s no es un dispositivo de bloques\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Comprobando que nadie est� utilizando este disco en este momento...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5389,30 +5263,30 @@ msgstr ""
 "esta\n"
 "comprobaci�n.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situaci�n anterior:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partici�n %d no existe; no se puede cambiar\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Situaci�n nueva:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5421,23 +5295,23 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operaci�n, use la opci�n --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "El sistema no encuentra adecuada esta operaci�n; probablemente deba "
 "responder No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�Est� satisfecho con esta operaci�n? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�Desea escribir esta informaci�n en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5446,16 +5320,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Se est� saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5464,7 +5338,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5571,133 +5445,133 @@ msgstr "getopt (mejorado) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "iniciado desde MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Reloj BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "puerto de reloj ajustado a 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s at�mico ha fallado para 1000 iteraciones."
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "No se puede abrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "No se ha podido obtener permiso porque no se ha intentado.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s no puede obtener acceso al puerto de E/S: la llamada iopl(3) ha fallado.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probablemente son necesarios los privilegios de usuario root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Se presupone que el reloj de hardware tiene la hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: atenci�n: tercera l�nea no reconocida en el fichero adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Se esperaba: `UTC', `LOCAL' o nada.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "�ltimo ajuste de desfase realizado %ld segundos despu�s de 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "�ltima calibraci�n realizada %ld segundos despu�s de 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "El reloj de hardware tiene la hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconocido"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Esperando se�al de reloj...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...recibida se�al de reloj\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Valores inv�lidos en reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora del reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
 "desde 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hora le�da del reloj de hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Estableciendo reloj de hardware en %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "El reloj no se ha modificado; s�lo se est� probando.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5706,7 +5580,7 @@ msgstr ""
 "El tiempo transcurrido desde la hora de referencia es de %.6f segundos.\n"
 "Aumentando el retardo hasta el siguiente segundo completo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5716,22 +5590,22 @@ msgstr ""
 "(por ejemplo, d�a 50 del mes) o exceden el rango que puede utilizarse\n"
 "(por ejemplo, el a�o 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "argumento --date demasiado largo\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5740,23 +5614,23 @@ msgstr ""
 "El valor de la opci�n --date no es una fecha v�lida.\n"
 "En concreto, contiene comillas.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Ejecutando orden date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "No se puede ejecutar el programa 'date' en int�rprete de �rdenes /bin/sh. "
 "popen() ha fallado"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "respuesta de la orden date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5771,7 +5645,7 @@ msgstr ""
 "La respuesta fue:\n"
 "%s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5788,12 +5662,12 @@ msgstr ""
 "La respuesta fue:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "La cadena de fecha %s equivale a %ld segundos desde 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5802,38 +5676,38 @@ msgstr ""
 "El reloj de hardware no contiene una hora v�lida, por lo que no se puede "
 "establecer la hora del sistema a partir de ese valor.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Se est� llamando settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "No se establece el reloj del sistema ya que la ejecuci�n es en modo de "
 "prueba.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Debe ser superusuario para establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ha fallado"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5842,7 +5716,7 @@ msgstr ""
 "No se ajusta el factor de desfase debido a que el reloj de hardware\n"
 "conten�a anteriormente datos extra�os.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5852,7 +5726,7 @@ msgstr ""
 "calibraci�n es cero, as� que el historial es err�neo y es necesaria una\n"
 "calibraci�n desde el principio.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5861,7 +5735,7 @@ msgstr ""
 "No se ajusta el factor de desfase debido a que hace menos de un d�a que se\n"
 "realiz� la �ltima calibraci�n.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5874,24 +5748,24 @@ msgstr ""
 "de\n"
 "desfase en %f segundos por d�a\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "El tiempo transcurrido desde el �ltimo ajuste es de %d segundos\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Es preciso insertar %d segundos y establecer como referencia la hora %.6f "
 "segundos hacia atr�s\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "No se est� actualizando el fichero adjtime debido al modo de prueba.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5900,12 +5774,12 @@ msgstr ""
 "Se habr�a escrito lo siguiente en %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Par�metros de ajuste del desfase no actualizados.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5913,29 +5787,29 @@ msgstr ""
 "El reloj de hardware no contiene una hora v�lida, por lo que no se puede "
 "ajustar.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "El ajuste necesario es inferior a un segundo, por lo que no se establece el "
 "reloj.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilizando %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "No se ha encontrado ninguna interfaz de reloj utilizable.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "No se puede establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5948,17 +5822,17 @@ msgstr ""
 "Alpha (por lo que posiblemente no se est� ejecutando en una m�quina Alpha).\n"
 "No se efect�a ninguna acci�n.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "No se puede obtener el valor de �poca del n�cleo.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "El n�cleo presupone el valor de �poca %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5967,18 +5841,23 @@ msgstr ""
 "Para establecer el valor de �poca, debe utilizar la opci�n 'epoch' para "
 "indicar en qu� valor debe definirse.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "No se est� estableciendo el valor de �poca en %d; s�lo se est� probando.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No se puede establecer el valor de �poca en el n�cleo.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6043,7 +5922,7 @@ msgstr ""
 "  --noadjfile   No accede a /etc/adjtime. Necesita del uso de --utc\n"
 "                o de --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6053,12 +5932,12 @@ msgstr ""
 "                Indica al reloj de hardware el tipo de Alpha (ver hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admite argumentos que no sean opciones. Ha especificado %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6067,7 +5946,7 @@ msgstr ""
 "Ha especificado varias funciones.\n"
 "S�lo puede llevar a cabo una funci�n a la vez.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6076,7 +5955,7 @@ msgstr ""
 "%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
 "ambas.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6085,28 +5964,28 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Con --noadjfile, debe especificarse o bien --utc o bien --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Hora no utilizable. No se puede establecer el reloj.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "�nicamente el superusuario puede cambiar el reloj de hardware.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "�nicamente el superusuario puede cambiar el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6115,12 +5994,12 @@ msgstr ""
 "S�lo el superusuario puede cambiar el valor de �poca del reloj de hardware "
 "del n�cleo.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "No se puede acceder al reloj de hardware por ning�n m�todo conocido.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6156,7 +6035,6 @@ msgstr "ioctl() no ha podido leer la hora de %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "Error de ioctl KDGHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "No se puede abrir /dev/tty1 o /dev/vc/1"
@@ -6253,9 +6131,6 @@ msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Se ha le�do el valor de �poca %ld de %s con ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6283,7 +6158,6 @@ msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6292,7 +6166,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6306,7 +6179,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6360,7 +6232,6 @@ msgstr "/dev: chdir() ha fallado: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: no es un dispositivo de caracteres"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6375,12 +6246,10 @@ msgstr "/dev/%s: no se puede abrir como entrada est�ndar: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: no abierto para lectura/escritura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6425,30 +6294,25 @@ msgstr ""
 "cadena_inicializaci�n] [-H host_inicio_sesi�n]l�nea velocidad_baudios,... "
 "[tipo_terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: poca memoria; el inicio de sesi�n puede fallar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "No se puede realizar asignaci�n de memoria para ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "No se puede realizar asignaci�n de memoria para grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inicio de sesi�n en %s desde %s denegado de forma predeterminada.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inicio de sesi�n en %s desde %s denegado.\n"
@@ -6494,8 +6358,8 @@ msgstr "Cambiando informaci�n de finger para %s.\n"
 msgid "Password error."
 msgstr "Error de contrase�a."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Contrase�a: "
@@ -6679,34 +6543,6 @@ msgstr "Utilice %s -l para ver una lista.\n"
 msgid "No known shells.\n"
 msgstr "No hay ning�n int�rprete de �rdenes conocido.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "No se ha podido abrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "No se han podido leer datos aleatorios de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "No se puede abrir %s para lectura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "No se puede realizar stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s no tiene los modos de fichero correctos"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "No se puede leer datos de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6716,11 +6552,11 @@ msgstr "No se puede leer %s; saliendo."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "uso: last [-#] [-f fichero] [-t tty] [-h nombrehost] [usuario ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  todav�a tiene iniciada la sesi�n"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6729,15 +6565,15 @@ msgstr ""
 "\n"
 "wtmp empieza %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: error de asignaci�n de memoria (malloc).\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6746,51 +6582,45 @@ msgstr ""
 "\n"
 "interrumpido %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Error fatal: no se puede reabrir la terminal: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ERROR FATAL: Terminal err�nea"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h s�lo para superusuario.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uso: login [-fp] [nombreusuario]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No se ha podido inicializar PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Inicio de sesi�n: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "Error de inicio de sesi�n %d desde %s para %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6799,17 +6629,17 @@ msgstr ""
 "Inicio de sesi�n incorrecto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "Demasiados intentos de inicio de sesi�n (%d) desde %s para %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "Error de sesi�n de inicio de sesi�n desde %s para %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6818,7 +6648,7 @@ msgstr ""
 "\n"
 "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6827,136 +6657,121 @@ msgstr ""
 "\n"
 "Problema al iniciar la sesi�n, abortado.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "nombre de usuario NULO en %s:%d. Abortado."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nombre de usuario inv�lido \"%s\" en %s:%d. Abortado."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: No queda memoria\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nombre de usuario no permitido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Inicio de sesi�n %s rechazado en este terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "Inicio de sesi�n %s rechazado desde %s en tty %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "Inicio de sesi�n %s rechazado en tty %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Ya hay demasiados usuarios con una sesi�n iniciada.\n"
-"Int�ntelo de nuevo m�s adelante.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Tiene demasiados procesos en ejecuci�n.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexi�n telef�nica en %s por %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesi�n con root en %s desde %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesi�n con root en %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "Inicio de sesi�n en %s por %s desde %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesi�n en %s por %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Tiene correo nuevo.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Tiene correo.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Fallo en TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ning�n directorio %s\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesi�n con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: no queda memoria para script de int�rprete de �rdenes.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: no se ha podido ejecutar el script de int�rprete de �rdenes: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay int�rprete de �rdenes: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6965,65 +6780,65 @@ msgstr ""
 "\n"
 "Inicio de sesi�n de %s: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesi�n demasiado largo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Los nombres de inicio de sesi�n no pueden empezar por '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de l�nea solos.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de l�nea"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "El inicio de sesi�n ha superado el tiempo de espera tras %d segundos\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo inicio de sesi�n: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesi�n en %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesi�n en %s, %s"
@@ -7043,173 +6858,30 @@ msgstr "es n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "uso: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: �qui�n es usted?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: este grupo no existe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permiso denegado"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "No hay ning�n int�rprete de �rdenes"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"La contrase�a debe tener como m�nimo 6 caracteres; int�ntelo de nuevo.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"La contrase�a debe contener caracteres de al menos dos de las siguientes\n"
-"clases: letras may�sculas y min�sculas, d�gitos, y caracteres no "
-"alfanum�ricos.\n"
-"Consulte passwd(1) para m�s informaci�n.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "No puede volver a utilizar la antigua contrase�a.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"No utilice un valor como por ejemplo el nombre de usuario como contrase�a.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "No utilice un valor como por ejemplo su nombre real como contrase�a.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uso: passwd [nombreusuario [contrase�a]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"S�lo el usuario root puede utilizar los formatos de uno y dos argumentos.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uso: passwd [-foqsvV] [usuario [contrase�a]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "No se puede ejecutar %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "No se puede encontrar el nombre de inicio de sesi�n"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "S�lo el usuario root puede cambiar la contrase�a de otros usuarios.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Hay demasiados argumentos.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"No se puede encontrar el nombre de usuario. �`%s' es realmente un usuario?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Este comando s�lo puede cambiar las contrase�as locales. Utilice yppasswd en "
-"su lugar."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "El UID y el nombre de usuario no coinciden."
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Cambiando contrase�a para %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Escriba la contrase�a antigua: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Contrase�a no permitida."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Escriba la nueva contrase�a: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "No se ha cambiado la contrase�a."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Vuelva a escribir la nueva contrase�a: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Ha escrito de forma incorrecta la contrase�a. No se ha cambiado."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "La contrase�a ha cambiado; usuario %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "Contrase�a de usuario root cambiada"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "Contrase�a cambiada por usuario root; usuario %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "Llamando a setpwnam para establecer contrase�a.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "*NO* se ha cambiado la contrase�a. Int�ntelo de nuevo m�s adelante.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Se ha cambiado la contrase�a.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7256,7 +6928,6 @@ msgstr "reiniciado por %s: %s"
 msgid "halted by %s: %s"
 msgstr "detenido por %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7293,7 +6964,6 @@ msgstr "Ejecutando el programa \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Error al ejecutar \t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7388,7 +7058,6 @@ msgstr "error al establecer close-on-exec sobre /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "error al ejecutar finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "error al efectuar `fork' con finalprog\n"
@@ -7417,7 +7086,7 @@ msgstr "La apertura del directorio ha fallado\n"
 msgid "fork failed\n"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "La ejecuci�n (exec) ha fallado\n"
 
@@ -7568,12 +7237,6 @@ msgstr "Valor de mes no permitido: utilice 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7584,13 +7247,12 @@ msgstr "%s de %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "uso: cal [-13smjyV] [[mes] a�o]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "uso: %s [+formato] [d�a mes a�o]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "D�a de San Tibb"
 
@@ -7723,7 +7385,7 @@ msgstr "%s: fallo al cambiar el nombre de %s a %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "llamada: %s de los ficheros...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7734,22 +7396,22 @@ msgstr ""
 "Utilice `%s [opciones] %s' si quiere utilizarlo de verdad.\n"
 "No se inicia la transcripci�n.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "uso: script [-a] [-f] [-q] [-t] [fichero]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7758,254 +7420,253 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: error de argumento, uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nombre_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nombreficherovuelco ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq n�merofrecuencia ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "No se puede (des)activar el modo de ahorro de alimentaci�n\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Error de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Error al escribir vuelco de pantalla\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "No se ha podido leer %s y no se puede efectuar vuelco de ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no est� definido.\n"
@@ -8081,10 +7742,6 @@ msgstr "atenci�n: no se puede abrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8392,84 +8049,75 @@ msgstr "mount: no se puede abrir %s para establecer la velocidad"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta versi�n se ha compilado sin soporte para el tipo `nfs'"
-
 # FIXME: Falta un . en el original.
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: fall� con la versi�n 4 de nfs mount, probando con la 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: no se ha podido determinar el tipo de sistema de ficheros y no se ha\n"
 "especificado ninguno"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montaje err�neo"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: el punto de montaje %s no es un directorio"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: debe ser superusuario para utilizar mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya est� montado"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya est� montado o %s est� ocupado"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: el punto de montaje %s es un enlace simb�lico sin destino"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8478,12 +8126,12 @@ msgstr ""
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s no est� montado todav�a o una opci�n es incorrecta"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8493,7 +8141,7 @@ msgstr ""
 "       superbloque incorrecto en %s, falta la p�gina de c�digos,\n"
 "       o alg�n otro error"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8501,7 +8149,7 @@ msgstr ""
 "       (�puede que este sea el dispositivo IDE donde est�\n"
 "       usando ide-scsi de forma que se necesite sr0 o sda?"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8509,7 +8157,7 @@ msgstr ""
 "       (�no estar� intentando montar una partici�n extendida,\n"
 "       en lugar de alguna partici�n l�gica que haya dentro?"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8517,52 +8165,51 @@ msgstr ""
 "   En algunos casos se encuentra informaci�n en syslog, pruebe\n"
 "   dmesg | tail   o algo parecido\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo desconocido"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tipo de sistema de ficheros '%s' desconocido"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quer�a referirse a %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: �quiere decir 'iso9660?'"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: �quiere decir 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s con n�mero de dispositivo incorrecto o tipo de sistema de ficheros "
 "%s no soportado"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s no es un dispositivo de bloques y �stat falla?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8571,77 +8218,72 @@ msgstr ""
 "mount: el n�cleo no reconoce %s como dispositivo de bloques\n"
 "       (�tal vez `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no es un dispositivo de bloques (pruebe `-o loop')"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no es un dispositivo de bloques v�lido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositivo de bloques "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: no se puede montar %s%s de s�lo lectura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s est� protegido contra escritura pero se ha dado la opci�n `-w'"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s est� protegido contra escritura; se monta como s�lo lectura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: no se ha especificado ning�n tipo; se presupone nfs por los dos "
 "puntos\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: no se ha especificado ning�n tipo; se presupone smbfs por el "
 "prefijo //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ejecutando en segundo plano \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: se abandona \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8690,34 +8332,34 @@ msgstr ""
 "Otras opciones: [-nfFrsvw] [-o opciones] [-p passwdfd].\n"
 "Escriba man 8 mount para saber mucho m�s.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: no se ha encontrado esta partici�n"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: no se puede encontrar %s en %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no se puede encontrar %s en %s o %s"
@@ -8752,98 +8394,98 @@ msgstr "       Se probar� con el tipo %s\n"
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir demasiado largo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: atenci�n: varios nombres de host no soportados\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: el directorio que se debe montar no tiene el formato host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: no se puede obtener la direcci�n para %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: valor incorrecto para hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de opci�n demasiado largo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Atenci�n: opci�n proto= no reconocida.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Atenci�n: la opci�n namlen no est� soportada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Par�metro de montaje nfs desconocido: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Atenci�n: la opci�n nolock no est� soportada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "Opci�n de montaje nfs desconocida: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: �valor incorrecto para hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP no est� soportado.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "el servidor nfs informa de que el servicio no est� disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "Se ha utilizado el asignador de puertos para encontrar el puerto NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "Utilizando puerto %d para daemon de nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "Valor de retorno de nfs status desconocido: %d"
@@ -8852,7 +8494,7 @@ msgstr "Valor de retorno de nfs status desconocido: %d"
 msgid "bug in xstrndup call"
 msgstr "Error en la llamada xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8865,7 +8507,7 @@ msgstr ""
 "       %s [-v] [-p prioridad] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8876,142 +8518,140 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] especial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: atenci�n: %s tiene permisos %04o que no son seguros, se sugiere %"
 "04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sin soporte para -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: no se puede bifurcar (fork): %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, directorio: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: no se puede obtener la direcci�n para %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: valor incorrecto para hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de bloques inv�lido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no montado"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no se puede escribir el superbloque"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: debe ser superusuario para utilizar umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de bloques no permitidos en sistema de ficheros"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se est� probando con umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "no se ha podido ejecutar umount en %s; en su lugar se prueba con %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de s�lo lectura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no se ha podido volver a montar %s como de s�lo lectura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de ficheros para desmontar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9022,47 +8662,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "No se puede desmontar \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se est� intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no est� montado (seg�n mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no est� en fstab (y usted no es el usuario root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: s�lo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: s�lo el usuario root puede efectuar esta acci�n"
 
@@ -9219,7 +8858,7 @@ msgstr "%s: opci�n desconocida \"-%c\"\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9393,8 +9032,6 @@ msgstr "el n�cleo no est� configurado para memoria compartida\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- L�mites memoria compartida ----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10185,17 +9822,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fichero_fmt] [-n longitud] [-s omitir] "
 "[fichero ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "uso: %s [-dflpcsu] [+n�ml�neas | +/patr�n] nombre1 nombre2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: opci�n desconocida \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10206,8 +9843,7 @@ msgstr ""
 "*** %s: directorio ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10218,45 +9854,45 @@ msgstr ""
 "*** %s: No es un fichero de texto ***\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Utilizar q o Q para salir]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--M�s--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Siguiente fichero: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pulse la barra espaciadora para continuar; 'q' para salir.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...retroceder %d p�ginas"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...retroceder 1 p�gina"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...omitiendo una l�nea"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...omitiendo %d l�neas"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10266,7 +9902,7 @@ msgstr ""
 "***Atr�s***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10280,7 +9916,7 @@ msgstr ""
 "Un asterisco (*) indica que el argumento ser� el nuevo valor "
 "predeterminado.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10326,34 +9962,34 @@ msgstr ""
 ":f                      Muestra el fichero actual y el n�mero de l�nea\n"
 ".                       Repite la orden anterior\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pulse 'h' para consultar las instrucciones.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" l�nea %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No es un fichero] l�nea %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Desbordamiento\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...omitiendo\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Error en expresi�n regular"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10361,15 +9997,15 @@ msgstr ""
 "\n"
 "Patr�n no encontrado\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patr�n no encontrado"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "no se puede bifurcar\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10377,19 +10013,19 @@ msgstr ""
 "\n"
 "...Saltando "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Saltando al fichero "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Retrocediendo al fichero "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "L�nea demasiado larga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "No hay ning�n comando anterior para sustituir"
 
@@ -10444,92 +10080,89 @@ msgstr "hexdump: formato incorrecto {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: car�cter de conversi�n %%%s incorrecto.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Uso: %s [-n�mero] [-p cadena] [-cefrns] [+l�nea] [+/patr�n/] [ficheros]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: la opci�n necesita un argumento -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opci�n ilegal -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...saltando hacia adelante\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...saltando hacia atr�s\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "No hay ning�n fichero siguiente"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "No hay ning�n fichero anterior"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Error de lectura en el fichero %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error desconocido en el fichero %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No se puede crear un fichero temporal.\n"
 
 # �Qu� significa?
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE error:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "No se recuerda ninguna cadena de b�squeda"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "No se puede abrir "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "guardado"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no se permite !orden en el modo rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fall� la llamada al sistema fork(), int�ntelo de nuevo m�s adelante\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Siguiente fichero: "
 
@@ -10583,6 +10216,166 @@ msgstr "L�nea de entrada demasiado larga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "N�mero inv�lido: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Error de sintaxis: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Este par�metro no est� establecido: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dispositivo nombre\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] disp. tama�o sect. cabez. pistas stretch gap rate spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dispositivo\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dispositivo\n"
+
+#~ msgid "version"
+#~ msgstr "versi�n"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "No se ha podido abrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "No se han podido leer datos aleatorios de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "No se puede abrir %s para lectura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "No se puede realizar stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s no tiene los modos de fichero correctos"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "No se puede leer datos de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Ya hay demasiados usuarios con una sesi�n iniciada.\n"
+#~ "Int�ntelo de nuevo m�s adelante.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Tiene demasiados procesos en ejecuci�n.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "La contrase�a debe tener como m�nimo 6 caracteres; int�ntelo de nuevo.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "La contrase�a debe contener caracteres de al menos dos de las siguientes\n"
+#~ "clases: letras may�sculas y min�sculas, d�gitos, y caracteres no "
+#~ "alfanum�ricos.\n"
+#~ "Consulte passwd(1) para m�s informaci�n.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "No puede volver a utilizar la antigua contrase�a.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "No utilice un valor como por ejemplo el nombre de usuario como "
+#~ "contrase�a.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "No utilice un valor como por ejemplo su nombre real como contrase�a.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nombreusuario [contrase�a]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "S�lo el usuario root puede utilizar los formatos de uno y dos "
+#~ "argumentos.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [usuario [contrase�a]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "No se puede ejecutar %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "No se puede encontrar el nombre de inicio de sesi�n"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr ""
+#~ "S�lo el usuario root puede cambiar la contrase�a de otros usuarios.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Hay demasiados argumentos.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "No se puede encontrar el nombre de usuario. �`%s' es realmente un usuario?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Este comando s�lo puede cambiar las contrase�as locales. Utilice yppasswd "
+#~ "en su lugar."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "El UID y el nombre de usuario no coinciden."
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Cambiando contrase�a para %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Escriba la contrase�a antigua: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Contrase�a no permitida."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Escriba la nueva contrase�a: "
+
+#~ msgid "Password not changed."
+#~ msgstr "No se ha cambiado la contrase�a."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Vuelva a escribir la nueva contrase�a: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Ha escrito de forma incorrecta la contrase�a. No se ha cambiado."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "La contrase�a ha cambiado; usuario %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "Contrase�a de usuario root cambiada"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "Contrase�a cambiada por usuario root; usuario %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "Llamando a setpwnam para establecer contrase�a.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr ""
+#~ "*NO* se ha cambiado la contrase�a. Int�ntelo de nuevo m�s adelante.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Se ha cambiado la contrase�a.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: esta versi�n se ha compilado sin soporte para el tipo `nfs'"
+
 #~ msgid "%s: not compiled with minix v2 support\n"
 #~ msgstr "%s: no se ha compilado con soporte para minix v2\n"
 
diff --git a/po/et.gmo b/po/et.gmo
new file mode 100644
index 000000000..bd123beed
--- /dev/null
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index afe78aaea..685657637 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Kasutamine:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Kasutamine: %s [ -n ] seade\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s paketist %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Kahe"
 msgid "Single"
 msgstr "�he"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,97 +202,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s pole kompileeritud minix v2 toega\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s pole flopiseade\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: viga v�tmete anal��simisel\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -769,7 +768,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pole piisavalt vaba ruumi, vaja oleks v�hemalt %lu plokki"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -838,18 +837,18 @@ msgstr "viga .. kirje kirjutamisel"
 msgid "error closing %s"
 msgstr "viga %s sulgemisel"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Kasutamine: mkfs [-V] [-t fst��p] [fs-v�tmed] seade [suurus]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: M�lu sai otsa\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versioon %s (%s)\n"
@@ -892,7 +891,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -945,10 +943,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1021,7 +1015,6 @@ msgstr "ei suuda kirjutada i-kirjeid"
 msgid "write failed in write_block"
 msgstr "ploki kirjutamine ei �nnestunud"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1057,7 +1050,7 @@ msgstr "seek ei �nnestunud plokkide testimisel"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Imelikud v��rtused funktsioonis do_check - ilmselt bugid\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "seek ei �nnestunud plokkide kontrollimisel"
 
@@ -1100,105 +1093,105 @@ msgstr "ei suuda stat'ida seadet %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei �rita luua failis�steemi seadmele `%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Vigane kasutaja poolt m��ratud lehek�lje suurus %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr "Kasutan etteantud lehek�lje suurust %d, mitte s�steemseid %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Eeldan lehek�lje suuruseks %d (mitte %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Kasutamine: %s [-c] [-v0|-v1] [-pLKSUURUS] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "liiga palju vigaseid lehek�lgi"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "M�lu sai otsa"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "�ks vigane lehek�lg\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d vigast lehek�lge\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: Viga - ei ole �eldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: Viga - suurus %ld on suurem kui seadme maht %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Viga - saalimisala peab olema v�hemalt %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Hoiatus - piiran saalimisala %ld kB-ga\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: Viga - ei ole �eldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "ei �rita luua saalimisala seadmele `%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fataalne viga: esimene lehk�lg pole k�ttesaadav"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1212,119 +1205,83 @@ msgstr ""
 "Saalimisala ei tekitataud. Kui Te t�esti soovite sellele seadmele\n"
 "v0 saalimisala tekitada, kasutage -f v�tit selle sundimiseks.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "ei suuda kirjutada signatuuriga lehek�lge"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ei �nnestunud"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Vigane arv: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "S�ntaksiviga: `%s�\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ei tunne parameetrite komplekti `%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "%s [ -p ] seade nimi\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "%s [ -p ] seade maht sekt p�id radu stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "%s [ -c | -y | -n | -d ] seade\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "%s [ -c | -y | -n ] seade\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Kasutamatu"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vaba ruum"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Ketast sai muudetud\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Tehke algk�ivitus, et uuendused m�juma hakkaksid\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1337,331 +1294,312 @@ msgstr ""
 "partitsioone, lugege palun cfdisk'i manuali\n"
 "lisainformatsiooni hankimiseks.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "FATAALNE VIGA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Vajuta m�nda klahvi cfdiskist v�ljumiseks"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Ei suuda kettal seekida"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Ei suuda kettalt lugeda"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Ei suuda kettale kirjutada"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Liiga palju partitsioone"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partitsioon algab enne sektorit 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partitsioon l�ppeb enne sektorit 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partitsioon algab p�rast ketta l�ppu"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partitsioon l�ppeb p�rast ketta l�ppu"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "Loogilised partitsioonid on f��silisest erinevas j�rjestuses"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "Loogilised partitsioonid kattuvad"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "Suurendatud loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "Sisemine viga: loogilise partitsiooni loomisel puudub extended-partitsioon"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Siia ei saa loogilist partitsiooni luua - see tekitakse teise extended'i"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Men��kirje on liiga pikk. Men�� v�ib naljakas v�lja n�ha."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Men�� ilma suunata, eeldan horisontaalset"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Vale klahv"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Vajuta m�nda klahvi j�tkamiseks"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaarne"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Loo uus primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Loogiline"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Loo uus loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "T�hista"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "�ra loo partitsiooni"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisemine viga !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Suurus (MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Beginning"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Lisada partitsioon vaba ruumi algusse"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "End"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Lisada partitsioon vaba ruumi l�ppu"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pole ruumi extended-partitsiooni tegemiseks"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Puuduv partitsioonitabel v�i vale signatuur partitsioonitabelis"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Tr�kkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Kas soovite alustada t�hja tabeliga [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Te andiste suurema silindrite arvu kui kettale mahub"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Ei suuda avada kettaseadet"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Avasin ketta ainult lugemiseks - kirjutamiseks pole �igust"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Vigane loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Hoiatus!!  See v�ib Teie kettal andmeid h�vitada!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Olete kindel, et soovite salvestada partitsioonitabelit? (jah v�i ei):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Ei kirjutanud partitsioonitabelit kettale"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "jah"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Palun sisestage `jah' v�i `ei'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Kirjutan partitsioonitabelit kettale..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Kirjutasin partitsioonitabeli kettale"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Kirjutasin partitsioonitabeli, aga tagasi lugemine eba�nnestus. Reboot abiks."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�kski primaarne partitsioon pole m�rgitud buutivaks. DOSi MBR ei suuda siit "
 "buutida."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Rohkem kui �ks primaarne partitsioon on m�rgitud buutivaks. DOSi MBR ei "
 "suuda siit buutida."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Siseta failinimi v�i vajuta RETURN ekraanil n�itamiseks: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ei suuda avada faili `%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Kettaseade: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Vaba   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr " Primaarne"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr " Loogiline"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitsioonitabel kettal %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Esimene  Viimane\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1669,7 +1607,7 @@ msgid ""
 msgstr ""
 " # T��p     Sektor   Sektor   Offset  Pikkus   Failis�st. t��p (ID)   Lipud\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1678,473 +1616,470 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Algus-----      -----L�pp-----  Esimene Sektorite\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Lipud Pea  Sekt Sil   ID  Pea  Sekt Sil    sektor    arv\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "tooRes"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Tr�kkida tabel toores formaadis (baithaaval)"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorid"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Tr�kkida tabel j�rjestatuna sektorite j�rgi"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Tr�kkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Ei tr�ki midagi"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdiski abiinfo ekraan"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "See on cfdisk, curses'il baseeruv ketta partitsioneerimise"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "programm, mis lubab luua, kustutada ja muuta partitsioone Teie"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "arvuti k�vakettal."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "K�sk        T�hendus"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta silindrite, peade ja rajal olevate sektorite arvu"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             HOIATUS: See k�sk on ainult neile, kes teavad, mida "
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             nad teevad."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          N�idata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimiseerida jooksva partitsiooni kettakasutus"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             M�rkus: see v�ib teha ketta mitte�hilduvaks DOSi,"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             OS/2 ja muude operatsioonis�teemidega."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          V�ljastada partitsioonitabel ekraanile v�i faili"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             V�ljastamisel v�ite valida mitme formaadi vahel:"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - tooRes - see baidijada, mis kettale kirjutataks"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektorite j�rgi j�rjestatud tabel"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel teksti kujul (umbes nagu peaekraanil)"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          V�ljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta jooksva partitsiooni failis�steemi t��pi"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta partitsioonide suuruse ja asukoha �hikuid"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Variandid on MB, sektorid ja silindrid"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjutada partitsioonitabel kettale (jah, suurt�ht)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Kuna see v�ib kettalt andmeid h�vitada, k�sitakse"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             enne kirjutamist kinnitust. Vastata tuleb eestikeelse"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             t�iss�naga (`jah' v�i `ei')."
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nool �les    Viia kursor eelmisele reale"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nool alla    Viia kursor j�rgmisele reale"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Joonistada ekraan �le"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          N�idata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "M�rkus: k�iki neid k�ske saab sisestada nii suur- kui v�iket�htedena,"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "v�lja arvatud suur W."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Muuta silindrite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "pead (H)"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Muuta peade arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Muuta sektorite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Muutused geomeetrias on tehtud"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Sisestage silindrite arv: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Vigane silindrite arv"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Sisetage peade arv: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Vigane peade arv"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Sisestage sektorite arv rajal: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Vigane sektorite arv"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Sisestage failis�steemi t��bi number: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Failis�steemi t��pi ei saa muuta t�hjaks"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Failis�steemi t��pi ei saa muuta extended'iks"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Kettaseade: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Maht: %lld baiti, %ld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Maht: %lld baiti, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "P�id: %d    Sektoreid rajal: %d    Silindreid: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Lipud"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "T��p"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS t��p"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektoreid"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Maht (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Maht (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "kustutaDa"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta ketta geomeetriat (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Help"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "N�idata abiinfot"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksimiseerida"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimiseerida jooksva partitsiooni kettakasutus (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "uus (N)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Prindi"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "V�ljastada partitsioonitabel ekraanile v�i faili"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "V�lja"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "V�ljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "T��p"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Muuta failis�steemi t��pi (DOS, Linux, OS/2 jne)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Uhikud"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Muuta partitsioonide suuruse n�itamise �hikuid (MB, sektorid, silindrid)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "salvesta (W)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjutada partitsioonitabel kettale (v�ib h�vitada andmed)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Seda partitsiooni ei saa buutivaks teha"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "T�hja partitsiooni ei saa kustutada"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Seda partitsiooni ei saa maksimiseerida"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "See partitsioon pole kasutatav"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "See partitsioon on juba olemas"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "T�hja partitsiooni t��pi ei saa muuta"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Rohkem partitsioone ei ole"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Vigane k�sk"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2216,9 +2151,9 @@ msgstr ""
 "\n"
 "BSD partitsioonitabel seadmel %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "K�sk    T�hendus"
 
@@ -2238,10 +2173,9 @@ msgstr "   i   installeerida bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   anda nimekiri tuntud failis�steemide t��pidest"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   n�idata sedasama men��d"
 
@@ -2253,14 +2187,14 @@ msgstr "   n   lisada uus BSD partitsioon"
 msgid "   p   print BSD partition table"
 msgstr "   p   n�idata BSD partitsioonitabelit"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   v�ljuda salvetsamata"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   tagasi peamen��sse"
 
@@ -2303,13 +2237,13 @@ msgstr "Seadmel %s ei ole BSD partitsiooni\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD partitsioonitabeli k�sk (m annab abiinfot): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimane %s v�i +suurus v�i +suurusM v�i +suurusK"
@@ -2354,8 +2288,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2458,8 +2390,8 @@ msgstr "sektorit rajal"
 msgid "tracks/cylinder"
 msgstr "rada silindris"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "silindrit"
 
@@ -2516,7 +2448,7 @@ msgstr "Bootstrap sai installitud seadmele %s\n"
 msgid "Partition (a-%c): "
 msgstr "Partitsioon (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimaalne arv partitsioone on juba loodud\n"
@@ -2540,7 +2472,7 @@ msgstr ""
 "\n"
 "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2562,7 +2494,7 @@ msgstr ""
 "-b 2048: kasutada 2048-baidiseid sektoreid (vajalik n�iteks m�nel MO "
 "seadmel)\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2579,198 +2511,184 @@ msgstr ""
 "jaoks)\n"
 "            ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ei suuda avada seadet %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ei suuda lugeda seadet %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ei suuda seekida seadmel %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ei suuda kirjutada seadmele %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ei �nnestunud seadmel %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "M�lu sai otsa\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fataalne viga\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   l�litada kirjutuskaitse lipp sisse/v�lja"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b redigeerida NSD partitsioonitabelit"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   l�litada monteeritavuse lipp sisse/v�lja"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   kustutada partitsioon"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   anda nimekiri tuntud partitsioonit��pidest"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   lisada uus partitsioon"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   luua uus t�hi DOSi partitsioonitabel"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   n�idata partitsioonitabelit"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   luua uus t�hi Sun'i partitsioonitabel"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   muuta partitsiooni t��pi"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   muuta sisestamise ja tabeli n�itamise �hikuid"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   kontrollida partitsioonitabelit"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   kirjutada tabel kettale ja v�ljuda"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   lisafunktsionaalsus (ainult ekspertidele)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   valida buutiv partitsioon"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigeerida buutfaili kirjet"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   valida SGI saalimispartitsioon"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   l�litada buuditavuse lipp sisse/v�lja"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   l�litada DOSiga �hilduvuse rezhiim sisse/v�lja"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   muuta alternatiivsete silindrite arvu"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   muuta silindrite arvu"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   n�idata partitsioonitabelit baidikaupa"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   muuta lisasektorite arvu silindril"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   muuta peade arvu"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   muuta interleave-tegurit"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   muuta p��rlemise kiirust (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   muuta sektorite arvu rajal"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   muuta f��siliste silindrite arvu"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   liigutada andmete algust partitsioonis"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   n�idata extended-partitsioonide nimekirja"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   luua IRIXi (SGI) partitsioonitabel"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   parandada partitsioonide j�rjekord"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Te peate m��rama, et eksisteerib nii-ja-nii-mitu"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2779,11 +2697,11 @@ msgstr ""
 "%s%s.\n"
 "Te saate seda teha lisafunktsionaalsuse men��st.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2802,29 +2720,29 @@ msgstr ""
 "2) muude operatsioonis�steemide buutimise ja partitsioneerimise\n"
 "tarkvaraga (n�iteks DOSi FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Vigane offset primaarses extended-partitsioonis\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Hoiatus: �leliigne 'link pointer' partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Hoiatus: ignoreerin �leliigseid andmeid partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2836,41 +2754,41 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. P�rast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "M�rkus: sektori suurus on %d (mitte %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Partitsioonitabelit ei saa salvestada\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Seade ei sisalda ei DOSi, Suni, SGI ega ODF partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Sisemine viga\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2879,7 +2797,7 @@ msgstr ""
 "Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
 "kirjutamisel (w) �ra\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2888,83 +2806,83 @@ msgstr ""
 "\n"
 "Sain EOF-i kolm korda j�rjest - aitab\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Kuueteistk�mnends�steemis kood (L n�itab koodide nimekirja): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, vaikimisi %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Kasutan vaikimisi v��rtust %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "V��rtus on piiridest v�ljas\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitsiooni number"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Hoiatus: partitsioonil %d on t�hi t��p\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "�htegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "silinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Sisestamisel ja n�itamisel on n��d �hikuteks %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOSiga �hilduvuse lipp on p�sti\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOSiga �hilduvuse lipp pole p�sti\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2977,7 +2895,7 @@ msgstr ""
 "tekitada t��pi 0 partitsioone. Te saate partitsiooni\n"
 "kustutada k�suga 'd'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2986,7 +2904,7 @@ msgstr ""
 "Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
 "Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2996,7 +2914,7 @@ msgstr ""
 "Soovitav on j�tta partitsioon 3 terveks kettaks (5),\n"
 "sest SunOs/Solaris eeldab seda ja see meeldib isegi Linuxile.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3006,61 +2924,61 @@ msgstr ""
 "Kaaluge partitsiooni 9 j�tmist k�ite p�iseks (0) ja\n"
 "partitsiooni 11 j�tmist terveks kettaks (6) nagu IRIX seda eeldab\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Partitsiooni %d t��p on n��d %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partitsiooni %d f��siline ja loogiline algus ei lange kokku:\n"
 "(Pole Linuxi oma?)\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     f��s=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "loogiline=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitsiooni %d f��siline ja loogiline l�pp ei lange kokku:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "peaks olema (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitsioon %d ei l�ppe silindri piiril\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3070,7 +2988,7 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3078,19 +2996,19 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3099,7 +3017,7 @@ msgstr ""
 "Midagi pole vaja teha, j�rjestus on juba �ige\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3107,16 +3025,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Algus       L�pp   Plokke   Id  S�steem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Seade"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3125,7 +3043,7 @@ msgstr ""
 "\n"
 "Partitsioonitabeli kirjed on f��silisest erinevas j�rjekorras\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3136,82 +3054,82 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  P� Sek  Sil  P� Sek  Sil    Algus     Maht ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitsioon %d: pea %d on suurem kui peade arv %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitsioon %d: sektor %d on suurem kui sektroite arv rajal %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitsioon %d: silinder %d on suurem kui silindrite arv %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitsioon %d: eelnevate sektorite arv %d ei klapi summarsega (%d)\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Hoiatus: partitsioon %d on t�hi\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Loogiline partitsioon %d pole �leni partitsioonis %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partitsioon %d on juba olemas. Kustutage see enne uuesti lisamist\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Vabad sektorid on otsas\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3225,24 +3143,24 @@ msgstr ""
 "\t(k�suga o).\n"
 "\tHOIATUS: see h�vitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Te peate k�igepealt m�ne partitsiooni kustutama ja asemele\n"
 "extended partitsiooni tegema\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Loogilised partitsioonid on f��silisest erinevas j�rjestuses"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3253,20 +3171,20 @@ msgstr ""
 "   %s\n"
 "   p   primaarse partitsiooni (1-4) loomine\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   loogilise partitsiooni (5-...) loomine"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   extended partitsiooni loomine"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Vigane partitsiooni number t��bile `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3275,12 +3193,12 @@ msgstr ""
 "Partitsioonitabelit on muudetud!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3294,7 +3212,7 @@ msgstr ""
 "Tuum kasutab endiselt vana tabelit,\n"
 "uus tabel hakkab kehtima j�rgmisest buudist alates.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3307,74 +3225,74 @@ msgstr ""
 "partitsioone, lugege palun fdisk'i manuali\n"
 "lisainformatsiooni jaoks.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Eksperdi k�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga �hilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda �ratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu k�sk\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kasutatav tuum leiab sektori suuruse ise - ignoreerin -b v�tit\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3383,19 +3301,18 @@ msgstr ""
 "Hoiatus: -b v�tit (sektori suuruse seadmine) tuleks kasutada ainult �he "
 "t�pselt m��ratud seadmega\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Leidisn seadmelt %s OSF/1 partitsioonitabeli, l�hen OSF/1 rezhiimi.\n"
 "DOSi partitsioonitabeli rezhiimi naasmiseks kasutage k�sku `r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "K�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3404,16 +3321,16 @@ msgstr ""
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Buutfail j�i samaks\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3480,15 +3397,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linuxi swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linuxi andmed"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3567,7 +3484,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor %5u pikkus %8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3624,7 +3540,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Tabelis on rohekm kui �ks terve ketta kirje\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "�htegi partitsiooni pole defineeritud\n"
@@ -3708,7 +3624,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tTe olete valinud ebahariliku buutfaili nime\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3728,11 +3643,10 @@ msgstr ""
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda t��pi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3802,44 +3716,43 @@ msgstr "�ritan s�ilitada partitsiooni %d parameetrid\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "T�hi"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Terve ketas"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linuxi iseavastuv raid"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3852,12 +3765,12 @@ msgstr ""
 "peade, sektorite ja silindrite arv ning partitsioonid\n"
 "v�i luua uus tabel (k�suga s p�himen��st).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automaatne konfigureerimine leidis %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3869,7 +3782,7 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. P�rast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3879,72 +3792,72 @@ msgstr ""
 "   ?   automaatne konfigureerimine\n"
 "   0   kohandatud (vaikev��rtustega riistavarlt)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Valige t��p (? t�hendab automaatset, 0 kohandatut): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automaatne konfigureerimine ei �nnestunud\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoreid rajal"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternatiivseid silindreid"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "F��silisi silindreid"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "P��rlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Vahelej�tu tegur"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "K�iki kettaseadme parameetreid saab muuta x men��st"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" floppi"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linuxi oma"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitsioon %d ei l�ppe silindri piiril\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitsioon %d kattub teistega sektorites %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kasutamata vahemik - sektorid 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kasutamata vahemik - sektorid %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3953,7 +3866,7 @@ msgstr ""
 "Teised partitsioonid katavad juba kogu ketta.\n"
 "Kustutage v�i v�hendage neist m�nda ja proovige uuesti\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3963,7 +3876,7 @@ msgstr ""
 "Kolmas partitsioon ei kata kogu ketast, aga sisesatud v��rtus %d %s\n"
 "katab mingi muu partitsiooni. Sisestatud kirje uueks v��rtuseks on %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3972,7 +3885,7 @@ msgstr ""
 "Kui soovite hoida �hilduvust SunOS'i/Solarisega, j�tke see partitsioon\n"
 "kogu ketast katma (5), alguseks 0, pikkuseks %u sektorit\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3986,7 +3899,7 @@ msgstr ""
 "sisestage YES, kui olete t�desti kindlad, et tahate partitsiooni t��biks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4005,7 +3918,7 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4018,16 +3931,16 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lipp    Algus       L�pp   Plokke   ID  S�steem\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "F��siliste silindrite arv"
 
@@ -4051,32 +3964,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX buutiv"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4087,7 +3994,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4185,12 +4091,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4211,8 +4115,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4222,7 +4124,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD v�i SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4243,12 +4144,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vana Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / vana Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4279,12 +4178,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernatsioon"
@@ -4293,7 +4190,6 @@ msgstr "IBM Thinkpad hibernatsioon"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4359,30 +4255,22 @@ msgstr "Mitte-FS andmed"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4391,116 +4279,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/FAT-16)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekundaarne"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Postisioneerimise viga seadmel %s - ei saa minna positsioonile %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Positsioneerimise viga: tahtsin 0x%08x%08x, sain 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "M�lu sai otsa - annan alla\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Lugemisviga seadmel %s - ei saa lugeda sektorit %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIGA: sektor %lu ei sisalda msdos'i signatuuri\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Kirjutamisviga seadmel %s - ei saa kirjutada sektorit %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ei suuda avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "Kirjutamise viga seadmel %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "Ei saa lugeda partitsioonitabeli salvestusfaili staatust (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "Partitsioonitabeli salvestusfail on vale pikkusega - ei taasta\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "M�lu sai otsa\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "Ei saa avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "Viga %s lugemisel\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ei suuda avada seadet %s kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Ketas %s: ei suuda geomeetriat kindlaks teha\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Ketas %s: ei suuda mahtu kindlaks teha\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4511,22 +4392,22 @@ msgstr ""
 "terve ketas. fdiski kasutamine on ilmselt m�ttetu.\n"
 "Kasutage --force v�tit, kui t�esti tahate seda teha.\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Hoiatus: HDIO_GETGEO �tles, et seadmel on %lu pead\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Hoiatus: HDIO_GETGEO �tles, et seadmel on %lu sektorit\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Hoiatus: BLKGETSIZE/HDIO_GETGEO �tles, et seadmel on %lu silindrit\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4536,7 +4417,7 @@ msgstr ""
 "See tekitab probleeme k�igi programmidega, mis �ritavad kasutada\n"
 "C/H/S (silinder/pea/sektor) adresseerimist.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4545,14 +4426,14 @@ msgstr ""
 "\n"
 "Ketas %s: %lu silindrit, %lu pead, %lu sektorit rajal\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s partitsioonil %s sisaldab vigast pead numbrit: %lu (peaks olema 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4561,7 +4442,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast sektori v��rtust: %lu (peaks olema 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4570,7 +4451,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast silindri v��rtust: %lu (peaks olema 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4579,12 +4460,12 @@ msgstr ""
 "ID  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Loen uuesti partitsioonitabelit...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4592,31 +4473,31 @@ msgstr ""
 "Partitsioonitabeli �lelugemine ei �nnestunud\n"
 "Tehke arvutile kohe alglaadimine, enne mkfs kasutamist\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "Tundmatu formaat - kasutan sektoreid\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s partitsioonitabel\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Seda formaati pole veel realiseeritud - kasutan %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4625,12 +4506,12 @@ msgstr ""
 "�hikud = silindrid %lu baidiga, plokid 1024 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus     L�pp   #sil     #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4639,12 +4520,12 @@ msgstr ""
 "�hikud = sektorid 512 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Seade  Buut    Algus      L�pp   #sektors  ID  S�steem\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4653,12 +4534,12 @@ msgstr ""
 "�hikud = 1024-baidised plokid, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Seade  Buut   Algus      L�pp    #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4667,31 +4548,31 @@ msgstr ""
 "�hikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus   L�pp    MB    #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talgus: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tl�pp: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partitsioon l�peb silindril %ld, tagapool ketta l�ppu\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Ei leidnud �htegi partitsiooni\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4702,51 +4583,51 @@ msgstr ""
 "C/H/S=*/%ld/%ld jaoks (mitte %ld/%ld/%ld).\n"
 "Eeldan seda geomeetriat nimekirja n�itamisel.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Imelik, ainult  %d partitsiooni on defineeriud\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, aga pole m�rgitud t�hjaks\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid on m�rgitud buutivaks\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid algus pole 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Hoiatus: partitsioon %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "ei sisaldu partitsioonis %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Hoiatus: partitsioonid %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ja %s kattuvad\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4755,17 +4636,17 @@ msgstr ""
 "Hoiatus: partitsioon %s sisaldab osa partitsioonitabelist (sektor %lu)\n"
 "ja h�vitab selle, kui ta andmetega t�idetakse\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Hoiatus: partitsioon %s algab sektorilt 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Hoiatus: partitsioon %s s�idab �le ketta otsa\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4773,17 +4654,17 @@ msgstr ""
 "Ainult �ks primaarsetest partitsioonidest tohib olla extended\n"
 "(kuigi see pole Linuxis probleemiks)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei alga silindri piirilt\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei l�ppe silindri piiril\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4793,7 +4674,7 @@ msgstr ""
 "LILO jaoks pole see oluline, aga DOS-i MBR v�ib buutimisel raskustesse "
 "sattuda.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4801,7 +4682,7 @@ msgstr ""
 "Hoiatus: harilikult saab buutida ainult primaarsetelt partitsioonidelt,\n"
 "ainult LILO ignoreerib buuditavuse lippu.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4809,39 +4690,39 @@ msgstr ""
 "Hoiatus: �kski primaarne partitsioon pole m�rgitud buutivaks (aktiivseks).\n"
 "See pole LILO jaoks oluline, aga DOS-i MBR ei suuda siit kettalt buutida.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "End"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4849,346 +4730,341 @@ msgstr ""
 "Hoiatus: extended partitsioon ei alga silindri piirilt.\n"
 "DOS ja Linux interpreteerivad selle sisu erinevalt.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: t�hi partitsioon\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5196,42 +5072,42 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5239,73 +5115,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n v�i q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5399,133 +5275,133 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "buuditud MILO'st\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffiani BCD kell\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "kella port parandatud aadressiks 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "Vinge masin!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomaarne '%s' ei �nnestunud 1000 katse jooksul!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ei suuda avada seadet /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ei saanud luba, sest ei k�sinudki\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ei saanud I/O portidele ligi: iopl(3) ei �nnestunud\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Ilmselt on vaja roodu �igusi\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Eeldan, et riistavalises kellas on kasutusel %s aeg\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "kohalik"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Hoiatus: arusaamatu kolmas rida adjtime failis\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Ootasin: `UTC' v�i `LOCAL' v�i mitte midagi)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Viimane ujumise vastane parandus tehti %ld sekundit p�rast 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Viimane kalibreerimine tehti %ld sekundit p�rast 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Riistvaralises kellas on kasutusel %s aeg\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "tundmatu"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Ootan kella tiksu...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...sain tiksu\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Vigased v��rtused riistvaralises kellas: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Riistvaralise kella aeg: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekundit p�rast "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Riistvaralisest kellast loetud aeg: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Sean riistavaralise kella n�iduks %.2d:%.2d:%.2d = %ld sekundit p�rast 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Ei muutnud kella - testime ainult\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5534,7 +5410,7 @@ msgstr ""
 "Seatavast kellaajast on m��das %.6f sekundit.\n"
 "Ootan edasi t�issekundini.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5544,22 +5420,22 @@ msgstr ""
 "kuup�ev) v�i on nad v�ljaspool meie poolt kasutatavat ajavahemikku (n�iteks "
 "aasta 2005)\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekundit\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date parameeter on puudu\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument on liiga pikk\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5568,21 +5444,21 @@ msgstr ""
 "--date suvandiga antud kellaaeg on vigane.\n"
 "T�psemalt �eldes sisaldab ta jutum�rke.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Annan `date' k�su: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Ei suuda k�ivatada 'date' programmi /bin/sh shelliga - popen() sai vea"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date-k�su tulemus = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5597,7 +5473,7 @@ msgstr ""
 "Vastus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5614,12 +5490,12 @@ msgstr ""
 "Vastus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "kuup�evastring %s v�rdub %ld sekundiga p�rast 1969\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5628,36 +5504,36 @@ msgstr ""
 "Riistavaline kell ei sisalda korrektset aega, seega me ei saa seada "
 "s�steemikella selle j�rgi\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "kutsun v�lja settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Ei sea s�steemikella, sest tegu on testimisega\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Kella seadmiseks peab olema root\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ei �nnestunud"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5665,7 +5541,7 @@ msgid ""
 msgstr ""
 "Ei paranda korrigeerimistegurit, kuna riistvaraline kell sisaldas sodi\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5674,7 +5550,7 @@ msgstr ""
 "Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus v�hem "
 "kui ��p�ev tagasi\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5683,7 +5559,7 @@ msgstr ""
 "Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus v�hem "
 "kui ��p�ev tagasi\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5694,23 +5570,23 @@ msgstr ""
 "korrigeerimistegurile %f sekundit p�evas.\n"
 "Paranen korrigeerimisfaktoriks %f sekundit p�evas.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Viimasest kellaaja korrigeermisest on m��dunud %d sekundit\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Vaja ob vahele lisada %d sekundit ning viidata ajale %.6f sekundit tagasi\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Ei uuenda adjtime faili, sest tegu on testimisega\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5719,12 +5595,12 @@ msgstr ""
 "Oleks kirjutanud faili %s j�rgmist:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Ujumise kompenseerimise parameetreid ei uuendatud\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5732,27 +5608,27 @@ msgstr ""
 "Riistvaraline kell ei sisalda korrektset aega, seega me ei saa sinna "
 "parandust lisada\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Vajalik parandus on alla sekundi, seega kella ei sea\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Kasutan %s\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Ei leidnud kasutatavat kellaliidest\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "S�steemikella seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5764,17 +5640,17 @@ msgstr ""
 "See koopia hwclock'ist on kompileeritud t��tama muul masinal (ja seega\n"
 "ilmselt ei t��ta hetkel Alpha peal). Ei v�ta midagi ette.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Ei saanud tuumalt epohhi v��rtust k�tte\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Tuum kasutab epohhi v��rtust %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5783,17 +5659,22 @@ msgstr ""
 "Epohhi v��rtuse seadmiseks peate kasutama `epoch' v�tit uue v��rtuse "
 "andmiseks\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei pannud epohhiks %d - testime ainult\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Epohhi v��rtuse seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s paketist %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5852,7 +5733,7 @@ msgstr ""
 "  --noadjfile   mitte kasutada faili /etc/adjtime. Vajab kas --utc v�i\n"
 "                --localtime v�tit\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5862,19 +5743,19 @@ msgstr ""
 "                �tleb hwclock'ile, mis t��pi Alphaga on tegemist\n"
 "                Vt. hwclock(8) l�hema info jaoks\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ei taha mitte-v�tmelisi argumente. %d on �leliigne\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr "Korraga saab kasutada ainult �hte funktsiooni\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5883,47 +5764,47 @@ msgstr ""
 "%s: --utc ja --localtime v�tmed on teineteist v�listavad. Teie kasutasite "
 "m�lemat korraga\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: V�tmed --adjust ja --noadjfile on vastastikku v�listavad\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Koos v�tmega --noadjfile tuleb anda ka kas --utc v�i --localtime v�ti\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ei saanud kasutatavat aega, ei keera kella\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Kahjuks saab ainult root riistvaralist kella keerata\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Kahjuks saba ainult root s�steemikelal keerata\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr "Kahjuks saab ainult root riistvaralise kella epohhi seada\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Ei suuda �hegi tuntud meetodiga riistvaralist kella k�tte saada\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5958,7 +5839,6 @@ msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK ioctl ei �nnestunud"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Ei suuda avada seadet /dev/tty1 v�i /dev/vc/1"
@@ -6052,9 +5932,6 @@ msgstr "%s ioctl(RTC_EPOCH_READ) ei �nnestunud"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6080,7 +5957,6 @@ msgstr "%s ioctl(RTC_EPOCH_SET) ei �nnestunud"
 msgid "calling open_tty\n"
 msgstr "kutsun v�lja funktsiooni open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kutsun v�lja funktsiooni termio_init\n"
@@ -6089,7 +5965,6 @@ msgstr "kutsun v�lja funktsiooni termio_init\n"
 msgid "writing init string\n"
 msgstr "kirjutan init-stringi\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "enne autobaudimist\n"
@@ -6103,7 +5978,6 @@ msgstr "ootan reavahetust (CR+LF)\n"
 msgid "read %c\n"
 msgstr "lugesin %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "loen kasutajanime\n"
@@ -6157,7 +6031,6 @@ msgstr "chdir () kataloogi /dev ei �nnestunud: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s pole s�mbolseade"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6172,12 +6045,10 @@ msgstr "ei saanud avada /dev/%s standardsisendina: %m"
 msgid "%s: not open for read/write"
 msgstr "%s pole avatud lugemiseks _ja_ kirjutamiseks"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dubleerin sokleid\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6222,30 +6093,25 @@ msgstr ""
 "       [-hiLmw] [-l login_programm] [-t taimaut] [-I init-string] [-H "
 "login_host] seade baud_rate,... [terminalit��p]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: m�lu on v�he, sisse logimine ei tarvitse �nnestuda\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ei j�tku m�lu ttyclass'ile"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "ei j�tku m�lu grplist'ile"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Sisselogimisest liinil %s masinast %s keeldutakse vaikereegli t�ttu\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Sisselogimisest liinil %s masinast %s keeldutakse\n"
@@ -6290,8 +6156,8 @@ msgstr "Muudan kasutaja %s kohta k�ivat informatsiooni\n"
 msgid "Password error."
 msgstr "Miski ei klapi"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Parool: "
@@ -6467,34 +6333,6 @@ msgstr "Kasutage %s -l lubatud shellide nimekirja vaatamiseks\n"
 msgid "No known shells.\n"
 msgstr "Ei leidu �htegi lubatud shelli\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "ei suuda lugeda juhust seadmelt /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "ei suuda avada faili %s lugemiseks"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat(%s) ei �nnestunud"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "failil %s on valed juurdep��su�igused"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "ei suuda lugeda faili %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6504,11 +6342,11 @@ msgstr "Ei suuda lugeda faili %s, katkestan"
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Kasutamine: [-#] [-f fail] [-t tty] [-h hostinimi] [kasutaja ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  veel masinas"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6517,15 +6355,15 @@ msgstr ""
 "\n"
 "wtmp algab %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: M�lu sai otsa\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6534,51 +6372,45 @@ msgstr ""
 "\n"
 "katkestatud %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Saatuslik viga: ei suuda taasavada terminali: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on ainult superkasutajale\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kasutamine: login [-fp] [kasutajanimi]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ei suutnud initsialiseerida PAM'i: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6587,17 +6419,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6606,142 +6438,127 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: M�lu sai otsa\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Vigane kasutajanimi"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Kasutaja %s ei tohi sellelt terminaliltsisse logida\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Liiga palju kasutajaid on juba sisse loginud.\n"
-"Proovige hiljem uuesti.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Teil on liiga palju protsesse t��tamas\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teile on uusi kirju\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teile on kirju\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Viga fork'imisel: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ei �nnestunud: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ei �nnestunud"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Kataloogi %s pole!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login sisse kodukataloogiga \"/\"\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: Ei j�tku m�lu shell-skriptile\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: Ei suutnud k�ivitada shell skripti: %s\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: shelli pole: %s\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6750,65 +6567,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kasutajanimi on liiga pikk\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Nimi on liiga pikk"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Kasutajanimed ei tohi alata miinusega\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Liiga palju t�hje ridu\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "TOHUTULT reavahetusi"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6828,167 +6645,30 @@ msgstr "on v�lja l�litatud (n)\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Kasutamine: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Kes Te niisugune olete?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Sellist gruppi pole"
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Pole �igusi"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Pole shelli"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Parool peab olema v�hemalt 6 s�mbolit. Proovige uuesti\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Parool peab sisaldama m�rke v�hemalt kahest j�rgnevast klassist:\n"
-"suur- ja v�iket�hed, numbrid ja muud s�mbolid. Vaadake passwd(1) lisainfoks\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Vana parooli ei saa uuesti kasutada\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "�rge palun pange parooliks midagi, mis sarnaneb Teie kasutajanimega!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "�rge palun pange parooliks midagi, mis sarnaneb Teie p�risnimega!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Kasutamine: passwd [kasutajanimi [parool]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Ainult superkasutaja tohib ka argumente kasutada\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Kasutamine: passwd [-foqsvV] [kasutajanimi [parool]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ei suuda k�ivitada programmi %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Ei suuda kindlaks teha Teie kasutajanime"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Ainult superkasutaja tohib teiste paroole muuta\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Liiga palju argumente\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Ei suuda leida sellist kasutajat. Kas `%s' on ikka kasutaja?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Selle programmiga saab muuta ainult lokaalseid paroole.\n"
-"Ehk aitab programmi yppasswd kasutamine."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID ja kasutajanimi ei lange kokku - petis niisugune!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Muudame kasutaja %s parooli\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Vana parool: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Vale parool"
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Uus parool: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Ei muutnud parooli."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Uus parool uuesti: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Paroolid ei klapi - tippisite ilmselt valesti. Parool j�i muutmata."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "muudeti kasutaja %s parool"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROODU PAROOL MUUDETI"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "kasutaja %s muutis roodu parooli"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kutsun v�lja funktsiooni setpwnam parooli seadmiseks\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Parool on n��d muudetud\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7035,7 +6715,6 @@ msgstr "buutis %s: %s"
 msgid "halted by %s: %s"
 msgstr "seiskas %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7072,7 +6751,6 @@ msgstr "T�idan programmi \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Viga %s t�itmisel\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7162,7 +6840,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "viga finalprog'i k�ivitamisel\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "viga finalprog'i k�ivitamisel\n"
@@ -7191,7 +6868,7 @@ msgstr "kataloogi avamine ei �nnestunud\n"
 msgid "fork failed\n"
 msgstr "fork ei �nnestunud\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec ei �nnestunud\n"
 
@@ -7342,12 +7019,6 @@ msgstr "Vigane kuu number, lubatud on 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7358,13 +7029,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Kasutamine: %s[+formaat] [kuup�ev kuu aasta]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "P�ha Tib'i p�ev"
 
@@ -7496,7 +7166,7 @@ msgstr "%s: %s �mber nimetamine %s -ks ei �nnestnud: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Kasutamine: %s kust kuhu failid...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7504,276 +7174,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Kasutamine: script [-a] [-f] [-q] [-t] [fail]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7850,10 +7519,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8137,232 +7802,217 @@ msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   anda nimekiri tuntud failis�steemide t��pidest"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8388,34 +8038,34 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8450,98 +8100,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8550,7 +8200,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8559,7 +8209,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8567,138 +8217,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: ei suuda k�ivitada programmi %s: %m"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: Ei suuda avada faili %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8706,48 +8354,47 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8892,7 +8539,7 @@ msgstr "%s: tundmatu signaal %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9046,8 +8693,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9801,17 +9446,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: tundmatu signaal %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9819,8 +9464,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9828,52 +9472,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr ""
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9881,7 +9525,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9904,66 +9548,66 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -10016,94 +9660,91 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "v�ti `%s' vajab argumenti\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: vigane v�ti (%s)\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "�htegi partitsiooni pole defineeritud\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr "positsioneerimise viga"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
@@ -10157,6 +9798,150 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Vigane arv: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "S�ntaksiviga: `%s�\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ei tunne parameetrite komplekti `%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "%s [ -p ] seade nimi\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "%s [ -p ] seade maht sekt p�id radu stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "%s [ -c | -y | -n | -d ] seade\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "%s [ -c | -y | -n ] seade\n"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "ei suuda lugeda juhust seadmelt /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "ei suuda avada faili %s lugemiseks"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat(%s) ei �nnestunud"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "failil %s on valed juurdep��su�igused"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "ei suuda lugeda faili %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Liiga palju kasutajaid on juba sisse loginud.\n"
+#~ "Proovige hiljem uuesti.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Teil on liiga palju protsesse t��tamas\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Parool peab olema v�hemalt 6 s�mbolit. Proovige uuesti\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Parool peab sisaldama m�rke v�hemalt kahest j�rgnevast klassist:\n"
+#~ "suur- ja v�iket�hed, numbrid ja muud s�mbolid. Vaadake passwd(1) "
+#~ "lisainfoks\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Vana parooli ei saa uuesti kasutada\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "�rge palun pange parooliks midagi, mis sarnaneb Teie kasutajanimega!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "�rge palun pange parooliks midagi, mis sarnaneb Teie p�risnimega!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Kasutamine: passwd [kasutajanimi [parool]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Ainult superkasutaja tohib ka argumente kasutada\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Kasutamine: passwd [-foqsvV] [kasutajanimi [parool]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ei suuda k�ivitada programmi %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Ainult superkasutaja tohib teiste paroole muuta\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Liiga palju argumente\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Ei suuda leida sellist kasutajat. Kas `%s' on ikka kasutaja?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Selle programmiga saab muuta ainult lokaalseid paroole.\n"
+#~ "Ehk aitab programmi yppasswd kasutamine."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID ja kasutajanimi ei lange kokku - petis niisugune!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Muudame kasutaja %s parooli\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Vana parool: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Vale parool"
+
+#~ msgid "Enter new password: "
+#~ msgstr "Uus parool: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Ei muutnud parooli."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Uus parool uuesti: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Paroolid ei klapi - tippisite ilmselt valesti. Parool j�i muutmata."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "muudeti kasutaja %s parool"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROODU PAROOL MUUDETI"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "kasutaja %s muutis roodu parooli"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kutsun v�lja funktsiooni setpwnam parooli seadmiseks\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Parool on n��d muudetud\n"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Hoiatus: kustutan partitsioonid p�rast %d\n"
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 000000000..4e28b16ee
--- /dev/null
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index ae4014996..5aff7d6d8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,26 +1,26 @@
 # Finnish messages for util-linux
-# Copyright � 2002, 2003 Lauri Nurmi <lanurmi@iki.fi>
-# Lauri Nurmi <lanurmi@iki.fi>, 2002, 2003.
+# Copyright © 2002, 2003, 2005 Lauri Nurmi <lanurmi@iki.fi>
+# Lauri Nurmi <lanurmi@iki.fi>, 2002, 2003, 2005.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
 # header is not removed and modified versions are marked
 # as such.
 #
-# T�t� tiedostoa ja muutettuja versioita saa kopioida
-# ja levitt�� vapaasti edellytt�en, ett� t�t� otsikkoa
-# ei poisteta, ja muutetut versiot merkit��n muutetuiksi.
+# Tätä tiedostoa ja muutettuja versioita saa kopioida
+# ja levittää vapaasti edellyttäen, että tätä otsikkoa
+# ei poisteta, ja muutetut versiot merkitään muutetuiksi.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2003-08-20 11:40+0300\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-03-05 17:10+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: disk-utils/blockdev.c:62
@@ -49,12 +49,11 @@ msgstr "aseta lohkokoko"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
-msgstr ""
+msgstr "hae 32-bittinen sektorimäärä"
 
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "hae koko"
+msgstr "hae koko tavuina"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
@@ -66,7 +65,7 @@ msgstr "hae lukuennakko"
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
-msgstr "tyhjenn� puskurit"
+msgstr "tyhjennä puskurit"
 
 #: disk-utils/blockdev.c:94
 msgid "reread partition table"
@@ -75,7 +74,7 @@ msgstr "lue osiotaulu uudelleen"
 #: disk-utils/blockdev.c:103
 #, c-format
 msgid "Usage:\n"
-msgstr "K�ytt�:\n"
+msgstr "Käyttö:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
@@ -90,7 +89,7 @@ msgstr "  %s [-v|-q] komennot laitteet\n"
 #: disk-utils/blockdev.c:107
 #, c-format
 msgid "Available commands:\n"
-msgstr "K�ytett�viss� olevat komennot:\n"
+msgstr "Käytettävissä olevat komennot:\n"
 
 #: disk-utils/blockdev.c:254
 #, c-format
@@ -122,10 +121,10 @@ msgstr "%s: ioctl-virhe laitteessa %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   AlkuSekt     Koko    Laite\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
-msgstr "k�ytt�:\n"
+msgstr "käyttö:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -149,7 +148,7 @@ msgstr "Luku: "
 #: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr "Ongelma luettaessa sylinteri� %d, odotettiin %d, luettiin %d\n"
+msgstr "Ongelma luettaessa sylinteriä %d, odotettiin %d, luettiin %d\n"
 
 #: disk-utils/fdformat.c:79
 #, c-format
@@ -157,22 +156,21 @@ msgid ""
 "bad data in cyl %d\n"
 "Continuing ... "
 msgstr ""
-"viallista dataa sylinteriss� %d\n"
+"viallista dataa sylinterissä %d\n"
 "Jatketaan... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "k�ytt�: %s [ -n ] laite\n"
+msgstr "käyttö: %s [ -n ] laite\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s paketista %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -182,7 +180,7 @@ msgstr "%s: ei ole lohkolaite\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr "Nykyist� alustustyyppi� ei voi m��ritt��"
+msgstr "Nykyistä alustustyyppiä ei voi määrittää"
 
 #: disk-utils/fdformat.c:141
 #, c-format
@@ -197,7 +195,7 @@ msgstr "Kaksi"
 msgid "Single"
 msgstr "Yksi"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -206,113 +204,113 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
-"k�ytt�: %s [-hv] [-x hak] tiedosto\n"
-" -h         n�yt� t�m� ohje\n"
+"käyttö: %s [-hv] [-x hak] tiedosto\n"
+" -h         näytä tämä ohje\n"
 " -x hak     pura hakemistoon hak\n"
 " -v         monisanaisuus\n"
 " tiedosto   tarkistettava tiedosto\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: virhe %d purettaessa! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: kokovirhe symlinkiss� \"%s\"\n"
+msgstr "%s: kokovirhe symlinkissä \"%s\"\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  puretaan paikkaan %2$ld lohkoa %1$ld (%3$ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%1$s: virheellinen tila (%3$o) polussa \"%2$s\"\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "  reik� kohdassa %ld (%d)\n"
+msgstr "  reikä kohdassa %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Ei-lohko (%ld) tavua\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Ei-koko (%ld vs %ld) tavua\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: virheellinen cramfs--v��r� polun pituus\n"
+msgstr "%s: virheellinen cramfs--väärä polun pituus\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: k��nnetty ilman -x -tukea\n"
+msgstr "%s: käännetty ilman -x -tukea\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: varoitus--tiedostoj�rjestelm�n kokoa ei voi m��ritt�� \n"
+msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voi määrittää \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
-msgstr "%s ei ole lohkolaite eik� tiedosto\n"
+msgstr "%s ei ole lohkolaite eikä tiedosto\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: virheellinen cramfs--tiedosto on liian lyhyt\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr "%s: virheellinen cramfs--v��r� taika\n"
+msgstr "%s: virheellinen cramfs--väärä taika\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr "%s: varoitus--tiedosto on liian pitk�, tasattu kuva?\n"
+msgstr "%s: varoitus--tiedosto on liian pitkä, tasattu kuva?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: virheellinen cramfs--crc-virhe\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr "%s: varoitus--vanha cramfs-kuva, ei CRC:t�\n"
+msgstr "%s: varoitus--vanha cramfs-kuva, ei CRC:tä\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: virheellinen cramfs--viallinen superlohko\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: virheellinen cramfs--hakemistodatan loppu (%ld) != tiedostodatan alku (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtym�\n"
+msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtymä\n"
 
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "K�ytt�: %s [-larvsmf] /dev/nimi\n"
+msgstr "Käyttö: %s [-larvsmf] /dev/nimi\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
@@ -331,12 +329,12 @@ msgstr "tarkistus keskeytetty.\n"
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Vy�hykenumero < FIRSTZONE tiedostossa \"%s\"."
+msgstr "Vyöhykenumero < FIRSTZONE tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Vy�hykenumero >= ZONES tiedostossa \"%s\"."
+msgstr "Vyöhykenumero >= ZONES tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
@@ -358,12 +356,12 @@ msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Sis�inen virhe: yritet��n kirjoittaa viallista lohkoa\n"
-"Kirjoituspyynt�� ei huomioida\n"
+"Sisäinen virhe: yritetään kirjoittaa viallista lohkoa\n"
+"Kirjoituspyyntöä ei huomioida\n"
 
 #: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
-msgstr "siirtyminen ep�onnistui funktiossa write_block"
+msgstr "siirtyminen epäonnistui funktiossa write_block"
 
 #: disk-utils/fsck.minix.c:398
 #, c-format
@@ -372,7 +370,7 @@ msgstr "Kirjoitusvirhe: viallinen lohko tiedostossa \"%s\"\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
-msgstr "siirtyminen ep�onnistui funktiossa write_super_block"
+msgstr "siirtyminen epäonnistui funktiossa write_super_block"
 
 #: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
@@ -384,7 +382,7 @@ msgstr "I-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
-msgstr "Vy�hykekartan kirjoitus ei onnistu"
+msgstr "Vyöhykekartan kirjoitus ei onnistu"
 
 #: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
@@ -392,7 +390,7 @@ msgstr "I-solmuja ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:557
 msgid "seek failed"
-msgstr "siirtyminen ep�onnistui"
+msgstr "siirtyminen epäonnistui"
 
 #: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
@@ -404,15 +402,15 @@ msgstr "virheellinen taikaluku superlohkossa"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "Vain 1k-lohkot/vy�hykkeet ovat tuettuja"
+msgstr "Vain 1k-lohkot/vyöhykkeet ovat tuettuja"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
-msgstr "virheellinen s_imap_blocks-kentt� superlohkossa"
+msgstr "virheellinen s_imap_blocks-kenttä superlohkossa"
 
 #: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
-msgstr "virheellinen s_zmap_blocks-kentt� superlohkossa"
+msgstr "virheellinen s_zmap_blocks-kenttä superlohkossa"
 
 #: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
@@ -428,7 +426,7 @@ msgstr "I-solmujen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
-msgstr "Vy�hykkeen laskemiseen ei voi varata puskuria"
+msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
@@ -436,7 +434,7 @@ msgstr "I-solmukarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
-msgstr "Vy�hykekarttaa ei voi lukea"
+msgstr "Vyöhykekarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
@@ -445,7 +443,7 @@ msgstr "I-solmuja ei voi lukea"
 #: disk-utils/fsck.minix.c:612
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
-msgstr "Varoitus: Ensimm�inenvy�hyke != Norm_ensimm�inenvy�hyke\n"
+msgstr "Varoitus: Ensimmäinenvyöhyke != Norm_ensimmäinenvyöhyke\n"
 
 #: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
@@ -460,12 +458,12 @@ msgstr "%ld lohkoa\n"
 #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Ensimm�inendatavy�hyke=%ld (%ld)\n"
+msgstr "Ensimmäinendatavyöhyke=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Vy�hykekoko=%d\n"
+msgstr "Vyöhykekoko=%d\n"
 
 #: disk-utils/fsck.minix.c:621
 #, c-format
@@ -475,7 +473,7 @@ msgstr "Maxkoko=%ld\n"
 #: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
-msgstr "Tied.j�rj. tila=%d\n"
+msgstr "Tied.järj. tila=%d\n"
 
 #: disk-utils/fsck.minix.c:623
 #, c-format
@@ -489,11 +487,11 @@ msgstr ""
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "K�ytt�m�tt�m�ksi merkitty� i-solmua %d k�ytet��n tiedostoon \"%s\"\n"
+msgstr "Käyttämättömäksi merkittyä i-solmua %d käytetään tiedostoon \"%s\"\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
-msgstr "Merkitse k�ytt��n"
+msgstr "Merkitse käyttöön"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
@@ -503,7 +501,7 @@ msgstr "Tiedostolla \"%s\" on tila %05o\n"
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
 msgid "Warning: inode count too big.\n"
-msgstr "Varoitus i-solmujen m��r� on liian suuri.\n"
+msgstr "Varoitus i-solmujen määrä on liian suuri.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
@@ -512,18 +510,18 @@ msgstr "juuren i-solmu ei ole hakemisto"
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Lohkoa on k�ytetty aikaisemmin. Nyt tiedostossa \"%s\"."
+msgstr "Lohkoa on käytetty aikaisemmin. Nyt tiedostossa \"%s\"."
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
 #: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
-msgstr "Tyhjenn�"
+msgstr "Tyhjennä"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "Lohko %d tiedostossa \"%s\" on merkitty k�ytt�m�tt�m�ksi."
+msgstr "Lohko %d tiedostossa \"%s\" on merkitty käyttämättömäksi."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
@@ -533,7 +531,7 @@ msgstr "Korjaa"
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
-"Hakemisto \"%s\" sis�lt�� virheellisen i-solmunumeron tiedostolle \"%.*s\"."
+"Hakemisto \"%s\" sisältää virheellisen i-solmunumeron tiedostolle \"%.*s\"."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
@@ -542,7 +540,7 @@ msgstr " Poista"
 #: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "\"%s\": viallinen hakemisto: \".\" ei ole ensimm�isen�\n"
+msgstr "\"%s\": viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
 #: disk-utils/fsck.minix.c:964
 #, c-format
@@ -552,7 +550,7 @@ msgstr "\"%s\": viallinen hakemisto: \"..\" ei ole toisena\n"
 #: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: viallinen hakemisto: \".\" ei ole ensimm�isen�\n"
+msgstr "%s: viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
 #: disk-utils/fsck.minix.c:1032
 #, c-format
@@ -561,7 +559,7 @@ msgstr "%s: viallinen hakemisto: \"..\" ei ole toisena\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
-msgstr "sis�inen virhe"
+msgstr "sisäinen virhe"
 
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
@@ -570,7 +568,7 @@ msgstr "%s: viallinen hakemisto: koko < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
-msgstr "siirtyminen ep�onnistui funktiossa bad_zone"
+msgstr "siirtyminen epäonnistui funktiossa bad_zone"
 
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
@@ -580,40 +578,40 @@ msgstr "I-solmun %d tila ei ole tyhjennetty."
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr "I-solmua %d ei k�ytet�, merkitty k�ytetyksi bittikartassa."
+msgstr "I-solmua %d ei käytetä, merkitty käytetyksi bittikartassa."
 
 #: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "I-solmu %d k�yt�ss�, merkitty k�ytt�m�tt�m�ksi bittikartassa."
+msgstr "I-solmu %d käytössä, merkitty käyttämättömäksi bittikartassa."
 
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "I-solmu %d (tila = %07o), i_linkkim��r�=%d, laskettu=%d."
+msgstr "I-solmu %d (tila = %07o), i_linkkimäärä=%d, laskettu=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
-msgstr "Aseta i_linkkim��r� lasketun mukaiseksi"
+msgstr "Aseta i_linkkimäärä lasketun mukaiseksi"
 
 #: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr "Vy�hyke %d: merkitty k�ytt��n, mutta mik��n tiedosto ei k�yt� sit�."
+msgstr "Vyöhyke %d: merkitty käyttöön, mutta mikään tiedosto ei käytä sitä."
 
 #: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Poista merkint�"
+msgstr "Poista merkintä"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Vy�hyke %d: k�yt�ss�, laskettu=%d\n"
+msgstr "Vyöhyke %d: käytössä, laskettu=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Vy�hyke %d: ei k�yt�ss�, laskettu=%d\n"
+msgstr "Vyöhyke %d: ei käytössä, laskettu=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
@@ -630,7 +628,7 @@ msgstr "virheellinen v2 i-solmun koko"
 
 #: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
-msgstr "vuorovaikutteisiin korjauksiin tarvitaan p��te"
+msgstr "vuorovaikutteisiin korjauksiin tarvitaan pääte"
 
 #: disk-utils/fsck.minix.c:1286
 #, c-format
@@ -645,12 +643,12 @@ msgstr "%s on puhdas, ei tarkistusta.\n"
 #: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Pakotetaan tiedostoj�rjestelm�n tarkistus laitteella %s.\n"
+msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr "Tiedostoj�rjestelm� laitteella %s on likainen, vaatii tarkistuksen.\n"
+msgstr "Tiedostojärjestelmä laitteella %s on likainen, vaatii tarkistuksen.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -659,12 +657,12 @@ msgid ""
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 "\n"
-"%6ld i-solmua k�ytetty (%ld%%)\n"
+"%6ld i-solmua käytetty (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
-msgstr "%6ld vy�hykett� k�ytety (%ld%%)\n"
+msgstr "%6ld vyöhykettä käytety (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1340
 #, c-format
@@ -684,8 +682,8 @@ msgstr ""
 "%6d hakemistoa\n"
 "%6d merkkilaitetiedostoa\n"
 "%6d lohkolaitetiedostoa\n"
-"%6d linkki�\n"
-"%6d symbolista linkki�\n"
+"%6d linkkiä\n"
+"%6d symbolista linkkiä\n"
 "------\n"
 "%6d tiedostoa\n"
 
@@ -697,18 +695,18 @@ msgid ""
 "----------------------------\n"
 msgstr ""
 "--------------------------------\n"
-"TIEDOSTOJ�RJESTELM�� ON MUUTETTU\n"
+"TIEDOSTOJÄRJESTELMÄÄ ON MUUTETTU\n"
 "--------------------------------\n"
 
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "%s: avaaminen ep�onnistui: %s\n"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: virhe siirryt�ess� tiedostossa %s\n"
+msgstr "%s: virhe siirrytäessä tiedostossa %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
@@ -718,17 +716,17 @@ msgstr "%s: virhe luettaessa tiedostoa %s\n"
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr "sektorim��r�: %d, sektorikoko: %d\n"
+msgstr "sektorimäärä: %d, sektorikoko: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr "%s: virhe valitsimien j�sennyksess�\n"
+msgstr "%s: virhe valitsimien jäsennyksessä\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "K�ytt�: %s [-x] [-d <nro>] iso9660-kuva\n"
+msgstr "Käyttö: %s [-x] [-d <nro>] iso9660-kuva\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -736,16 +734,16 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
-"K�ytt�: %s [-v] [-N i-solmum��r�] [-V osionimi]\n"
-"       [-F tied.j�rj.nimi] laite [lohkom��r�]\n"
+"Käyttö: %s [-v] [-N i-solmumäärä] [-V osionimi]\n"
+"       [-F tied.järj.nimi] laite [lohkomäärä]\n"
 
 #: disk-utils/mkfs.bfs.c:135
 msgid "volume name too long"
-msgstr "osionimi on liian pitk�"
+msgstr "osionimi on liian pitkä"
 
 #: disk-utils/mkfs.bfs.c:142
 msgid "fsname name too long"
-msgstr "tiedostoj�rjestelm�n nimi on liian pitk�"
+msgstr "tiedostojärjestelmän nimi on liian pitkä"
 
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
@@ -779,9 +777,9 @@ msgstr "liian monta i-solmua - maksimi on 512"
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr "tila ei riit�, vaaditaan v�hint��n %lu lohkoa"
+msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -794,7 +792,7 @@ msgstr "Osio: <%-6s>\n"
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr "Tiedj�rj.nimi: <%-6s>\n"
+msgstr "Tiedjärj.nimi: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
 #, c-format
@@ -839,37 +837,37 @@ msgstr "siirtymisvirhe"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr "virhe kirjoitettessa \".\"-merkint��"
+msgstr "virhe kirjoitettessa \".\"-merkintää"
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr "virhe kirjoitettessa \"..\"-merkint��"
+msgstr "virhe kirjoitettessa \"..\"-merkintää"
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
 msgstr "virhe suljettaessa laitetta %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"K�ytt�: mkfs [-V] [-t tied.j�rj. tyyppi] [tied.j�rj.valitsimet] laite "
+"Käyttö: mkfs [-V] [-t tied.järj. tyyppi] [tied.järj.valitsimet] laite "
 "[koko]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Muisti lopussa!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs-versio %s (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
 "outfile\n"
@@ -886,19 +884,19 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"k�ytt�: %s [-v] [-b lkoko] [-e laitos] [-i tied] [-n nimi] haknimi "
+"käyttö: %s [-v] [-b lkoko] [-e laitos] [-i tied] [-n nimi] haknimi "
 "tulostied\n"
-" -h          n�yt� t�m� ohje\n"
+" -h          näytä tämä ohje\n"
 " -v          monisanaisuus\n"
-" -E          k�sittele varoitukset virhein� (nollasta poikkeava paluuarvo)\n"
-" -b lkoko    k�yt� t�t� lohkokokoa, on oltava sama kuin sivukoko\n"
-" -e laitos   aseta laitosnumero (osa tied.j�rj-id:t�)\n"
-" -i tied     sis�llyt� tiedostokuva tiedostoj�rjestelm��n (vaatii >= 2.4.0)\n"
-" -n nimi     aseta cramfs-tiedostoj�rjestelm�n nimi\n"
-" -p          tasaa %d tavulla k�ynnistyskoodia varten\n"
-" -s          lajittele hakemistomerkinn�t (vanha valitsin, ei huomioida)\n"
-" -z          tee reiki� (vaatii >= 2.3.39)\n"
-" haknimi     pakattavan tiedostoj�rjestelm�n juuri\n"
+" -E          käsittele varoitukset virheinä (nollasta poikkeava paluuarvo)\n"
+" -b lkoko    käytä tätä lohkokokoa, on oltava sama kuin sivukoko\n"
+" -e laitos   aseta laitosnumero (osa tied.järj-id:tä)\n"
+" -i tied     sisällytä tiedostokuva tiedostojärjestelmään (vaatii >= 2.4.0)\n"
+" -n nimi     aseta cramfs-tiedostojärjestelmän nimi\n"
+" -p          tasaa %d tavulla käynnistyskoodia varten\n"
+" -s          lajittele hakemistomerkinnät (vanha valitsin, ei huomioida)\n"
+" -z          tee reikiä (vaatii >= 2.3.39)\n"
+" haknimi     tiivistettävän tiedostojärjestelmän juuri\n"
 " tulostied   tulostiedosto\n"
 
 #: disk-utils/mkfs.cramfs.c:335
@@ -907,14 +905,14 @@ msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
-"L�ytyi hyvin pitk� tiedostonimi \"%2$s\" (%1$u tavua).\n"
-" Kasvata vakiota MAX_INPUT_NAMELEN tiedostossa mkcramfs.c ja k��nn� "
+"Löytyi hyvin pitkä tiedostonimi \"%2$s\" (%1$u tavua).\n"
+" Kasvata vakiota MAX_INPUT_NAMELEN tiedostossa mkcramfs.c ja käännä "
 "uudelleen. Poistutaan.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr "tiedostoj�rjestelm� on liian suuri. Poistutaan.\n"
+msgstr "tiedostojärjestelmä on liian suuri. Poistutaan.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -922,10 +920,9 @@ msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
-"MAXENTRIES ylitetty. Kasvata t�t� arvoa tiedostossa mkcramfs.c ja k��nn� "
+"MAXENTRIES ylitetty. Kasvata tätä arvoa tiedostossa mkcramfs.c ja käännä "
 "uudelleen. Poistutaan.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -942,13 +939,13 @@ msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
-"varoitus: arviokoko (yl�raja) on %Ld Mt, mutta suurin kuvakoko on %u Mt. "
-"Prosessi saattaa p��tty� ennenaikaisesti.\n"
+"varoitus: arviokoko (yläraja) on %Ld Mt, mutta suurin kuvakoko on %u Mt. "
+"Prosessi saattaa päättyä ennenaikaisesti.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
-msgstr "Sis�llytet��n: %s\n"
+msgstr "Sisällytetään: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
@@ -974,21 +971,17 @@ msgstr "CRC: %x\n"
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
-"ROM-kuvalle ei ole varattu riitt�v�sti tilaa (%Ld varattu, %d k�ytetty)\n"
+"ROM-kuvalle ei ole varattu riittävästi tilaa (%Ld varattu, %d käytetty)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr "ROM-kuvan kirjoitus ep�onnistui (%d %d)\n"
+msgstr "ROM-kuvan kirjoitus epäonnistui (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "varoitus: tiedostonimet typistet��n 255 tavuun.\n"
+msgstr "varoitus: tiedostonimet typistetään 255 tavuun.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
@@ -1005,13 +998,13 @@ msgstr ""
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "varoitus: uid:t typistetty %u bittiin. (T�m� voi olla turvaongelma.)\n"
+msgstr "varoitus: uid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "varoitus: gid:t typistetty %u bittiin. (T�m� voi olla turvaongelma.)\n"
+msgstr "varoitus: gid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1019,30 +1012,30 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"VAROITUS: laitenumerot typistetty %u bittiin. T�m� tarkoittaa l�hes\n"
-"varmasti, ett� jotkut laitetiedostot ovat v��rin.\n"
+"VAROITUS: laitenumerot typistetty %u bittiin. Tämä tarkoittaa lähes\n"
+"varmasti, että jotkut laitetiedostot ovat väärin.\n"
 
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "K�ytt�: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
+msgstr "Käyttö: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s on liitetty; ei tehd� tiedostoj�rjestelm�� t�h�n!"
+msgstr "%s on liitetty; ei tehdä tiedostojärjestelmää tähän!"
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
-msgstr "siirtyminen k�ynnistyslohkoon ep�onnistui funktiossa write_tables"
+msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
 
 #: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
-msgstr "k�ynnistyssektorin tyhjent�minen ei onnistu"
+msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
 #: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
-msgstr "siirtyminen ep�onnistui funktiossa write_tables"
+msgstr "siirtyminen epäonnistui funktiossa write_tables"
 
 #: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
@@ -1050,7 +1043,7 @@ msgstr "i-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
-msgstr "vy�hykekarttaa ei voi kirjoittaa"
+msgstr "vyöhykekarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
@@ -1058,9 +1051,8 @@ msgstr "i-solmuja ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
-msgstr "kirjoitus ep�onnistui funktiossa write_block"
+msgstr "kirjoitus epäonnistui funktiossa write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1068,7 +1060,7 @@ msgstr "liian monta viallista lohkoa"
 
 #: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
-msgstr "ei riitt�v�sti ehji� lohkoja"
+msgstr "ei riittävästi ehjiä lohkoja"
 
 #: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
@@ -1089,22 +1081,22 @@ msgstr ""
 
 #: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
-msgstr "siirtyminen ep�onnistui lohkojen testauksen aikana"
+msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 
 #: disk-utils/mkfs.minix.c:534
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
-"Outoja arvoja funktiossa do_check: todenn�k�isesti ohjelmistovirheit�\n"
+"Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovirheitä\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
-msgstr "siirtyminen ep�onnistui funktiossa check_blocks"
+msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
 #: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"virheellisi� lohkoja ennen data-aluetta: tiedostoj�rjestelm�� ei voi luoda"
+"virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
 
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
@@ -1118,12 +1110,12 @@ msgstr "yksi viallinen lohko\n"
 
 #: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
-msgstr "vialliset lohkot sis�lt�v�� tiedostoa ei voi avata"
+msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
 
 #: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "strtol error: number of blocks not specified"
-msgstr "strtol-virhe: lohkojen m��r�� ei ole annettu"
+msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
 
 #: disk-utils/mkfs.minix.c:704
 #, c-format
@@ -1138,108 +1130,108 @@ msgstr "tiedoston %s tilaa ei voi lukea"
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "ei yritet� luoda tiedostoj�rjestelm�� kohteeseen \"%s\""
+msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen \"%s\""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "K�ytt�j�n antama sivukoko %d on virheellinen\n"
+msgstr "Käyttäjän antama sivukoko %d on virheellinen\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
-"K�ytet��n k�ytt�j�n antamaa sivukokoa %d j�rjestelm�n arvojen %d/%d sijaan\n"
+"Käytetään käyttäjän antamaa sivukokoa %d järjestelmän arvojen %d/%d sijaan\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Oletetaan sivujen kooksi %d (ei %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Virheellinen sivutusotsakkeen koko, nimiötä ei kirjoitettu.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Nimiötä lyhennettiin.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "nimi�"
+msgstr "ei nimiötä, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "ei uuid:tä\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "K�ytt�: %s [-c] [-v0|-v1] [-pSIVUKOKO] /dev/nimi [lohkot]\n"
+msgstr "Käyttö: %s [-c] [-v0|-v1] [-pSIVUKOKO] [-L nimiö] /dev/nimi [lohkot]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "liian monta viallista sivua"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Muisti lopussa"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "yksi viallinen sivu\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d viallista sivua\n"
+msgstr "%lu viallista sivua\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: virhe: Sivutustilan kohde?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
-msgstr "%s: virhe: koko %ld on suurempi kuin laitteen koko %d\n"
+msgstr "%s: virhe: koko %lu on suurempi kuin laitteen koko %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: virhe: sivutusalueen on oltava v�hint��n %ld kt:n kokoinen\n"
+msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kt:n kokoinen\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: varoitus: typistet��n sivutusalue kokoon %ld kt\n"
+msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kt\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: virhe: Sivutustilan kohde?\n"
+msgstr "%s: virhe: vasta sivutustilan versio 1 tukee nimiöitä\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Ei yritet� luoda sivutuslaitetta kohteeseen \"%s\""
+msgstr "Ei yritetä luoda sivutuslaitetta kohteeseen \"%s\""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
-msgstr "vakavaa: ensimm�inen sivu on lukukelvoton"
+msgstr "vakavaa: ensimmäinen sivu on lukukelvoton"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1247,127 +1239,89 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: Laitteella \"%s\" on kelvollinen Sun-levynimi�.\n"
-"T�m� tarkoittaa todenn�k�isesti sit�, ett� v0-sivutuksen luominen tuhoaisi\n"
+"%s: Laitteella \"%s\" on kelvollinen Sun-levynimiö.\n"
+"Tämä tarkoittaa todennäköisesti sitä, että v0-sivutuksen luominen tuhoaisi\n"
 "osiotaulun. Sivutusta ei luotu. Jos todella haluat luoda v0-sivutuksen\n"
-"kyseiselle laitteelle, k�yt� valitsinta -f sen pakottamiseen.\n"
+"kyseiselle laitteelle, käytä valitsinta -f sen pakottamiseen.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Asetetaan sivutustila, versio %d, koko = %llu kt\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
-msgstr "sivutuslaitteella ei voi siirty� taaksep�in"
+msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "allekirjoitussivua ei voi kirjoittaa"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
-msgstr "fsync ep�onnistui"
-
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Virheellinen luku: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaksivirhe: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Parametria ei ole asetettu: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] laite nimi\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] laite koko sekt p��t raidat venytys v�li aste erik1 fmt_v�li\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] laite\n"
+msgstr "fsync epäonnistui"
 
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] laite\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
-msgstr "Ei k�ytett�viss�"
+msgstr "Ei käytettävissä"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vapaa tila"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux XFS"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Levy on vaihdettu.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
-"J�rjestelm� on syyt� k�ynnist�� uudelleen osiotaulun p�ivittymisen "
+"Järjestelmä on syytä käynnistää uudelleen osiotaulun päivittymisen "
 "varmistamiseksi.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1377,341 +1331,318 @@ msgid ""
 msgstr ""
 "\n"
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
-"katso lis�tietoja cfdiskin manuaalista.\n"
+"katso lisätietoja cfdiskin manuaalista.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "VAKAVA VIRHE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
-msgstr "Paina mit� tahansa n�pp�int� poistuaksesi cfdiskist�"
+msgstr "Paina mitä tahansa näppäintä poistuaksesi cfdiskistä"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Levyasemalla ei voi siirty�"
+msgstr "Levyasemalla ei voi siirtyä"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Levyasemaa ei voi lukea"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Levyasemalle ei voi kirjoittaa"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Liian monta osiota"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Osion alku on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Osion loppu on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
-msgstr "Osion alku on levyn lopun j�lkeen"
+msgstr "Osion alku on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
-msgstr "Osion loppu on levyn lopun j�lkeen"
+msgstr "Osion loppu on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
-msgstr "Osion loppu on viimeisell� osittaisella sylinterill�"
+msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
-msgstr "loogiset osiot eiv�t ole levyj�rjestyksess�"
+msgstr "loogiset osiot eivät ole levyjärjestyksessä"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
-msgstr "loogiset osiot ovat p��llekk�iset"
+msgstr "loogiset osiot ovat päällekkäiset"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
-msgstr "suurennetut loogiset osiot ovat p��llekk�iset"
+msgstr "suurennetut loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Sis�inen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
+"!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"T�h�n ei voi luoda loogista asemaa -- luotaisiin kaksi laajennettua osiota"
+"Tähän ei voi luoda loogista asemaa -- luotaisiin kaksi laajennettua osiota"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "Liian pitk� valikon kohta. Valikko voi n�ytt�� oudolta."
+msgstr "Liian pitkä valikon kohta. Valikko voi näyttää oudolta."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Valikko ilman suuntaa. K�ytet��n oletuksena vaakasuuntaa."
+msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
-msgstr "V��r� n�pp�in"
+msgstr "Väärä näppäin"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
-msgstr "Paina n�pp�int� jatkaaksesi"
+msgstr "Paina näppäintä jatkaaksesi"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
-msgstr "Ensi�"
+msgstr "Ensiö"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
-msgstr "Luo uusi ensi�osio"
+msgstr "Luo uusi ensiöosio"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Looginen"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Luo uusi looginen osio"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
-msgstr "�l� luo osiota"
+msgstr "Älä luo osiota"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
-msgstr "!!! Sis�inen virhe !!!"
+msgstr "!!! Sisäinen virhe !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Koko (Mt): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Alku"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
-msgstr "Lis�� osio tyhj�n tilan alkuun"
+msgstr "Lisää osio tyhjän tilan alkuun"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Loppu"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
-msgstr "Lis�� osio tyhj�n tilan loppuun"
+msgstr "Lisää osio tyhjän tilan loppuun"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Laajennetun osion luomiseen ei ole tilaa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "osiotaulua ei ole.\n"
+msgstr "Ei osiotaulua.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "Ei osiotaulua tai tuntematon allekirjoitus osiotaulussa"
+msgstr "Ei osiotaulua. Aloitetaan tyhjällä taululla."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "N�yt� osiotaulu"
+msgstr "Osiotaulun allekirjoitus on virheellinen"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "osiotaulua ei ole.\n"
+msgstr "Tuntematon osiotaulun tyyppi"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr "Haluatko aloittaa tyhj�ll� osiotaululla [y/N]?"
+msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
-msgstr "Annoit suuremman sylinterim��r�n kuin levylle mahtuu"
+msgstr "Annettu sylinterimäärä ei mahdu levylle"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Levyasemaa ei voi avata"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Levy avattiin vain luku -tilassa - sinulla ei ole kirjoitusoikeutta"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Levyn kokoa ei voi hakea"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
-msgstr "Viallinen ensi�osio"
+msgstr "Viallinen ensiöosio"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Viallinen looginen osio"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Varoitus!! T�m� voi tuhota dataa levylt�!"
+msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Oletko varma, ett� haluat kirjoittaa osiotaulun levylle? (kyll� tai ei):"
+"Oletko varma, että haluat kirjoittaa osiotaulun levylle? (kyllä tai ei):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Osiotaulua ei kirjoitettu levylle"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
-msgstr "kyll�"
+msgstr "kyllä"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
-msgstr "Kirjoita \"kyll�\" tai \"ei\""
+msgstr "Kirjoita \"kyllä\" tai \"ei\""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Kirjoitetaan osiotaulua levylle..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"Osiotaulu kirjoitettiin, mutta uudelleenluku ep�onnistui. Tietokone on "
-"k�ynnistett�v� uudelleen, jotta taulu p�ivittyy."
+"Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Tietokone on "
+"käynnistettävä uudelleen, jotta taulu päivittyy."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Yht��n ensi�osiota ei ole merkitty k�ynnistett�v�ksi. DOS MBR ei k�ynnist� "
-"t�t�."
+"Yhtään ensiöosiota ei ole merkitty käynnistettäväksi. DOS MBR ei käynnistä "
+"tätä."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Useampi kuin yksi ensi�osio on merkitty k�ynnistett�v�ksi. DOS MBR ei "
-"k�ynnist� t�t�."
+"Useampi kuin yksi ensiöosio on merkitty käynnistettäväksi. DOS MBR ei "
+"käynnistä tätä."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Sy�t� tiedostonimi tai paina RETURN saadaksesi n�yt�lle: "
+msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Tiedostoa \"%s\" ei voi avata"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Levyasema: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektori 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektori %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
-msgstr "   Ei mit��n"
+msgstr "   Ei mitään"
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Ens/Loog"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
-msgstr "   Ensi�"
+msgstr "   Ensiö"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Looginen"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
-msgstr "K�ynnistett�v�"
+msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
-msgstr "Ei mit��n"
+msgstr "Ei mitään"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Laitteen %s osiotaulu\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Alku-      Loppu-\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
-" # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.j�rj. tyyppi (ID) "
+" # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.järj. tyyppi (ID) "
 "Liput\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1719,467 +1650,464 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Alku----         ----Loppu----    Alku-     Sektorien\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
-msgstr " # Liput P��t Sekt Syl   ID  P��t Sekt Syl    sektori    m��r�\n"
+msgstr " # Liput Päät Sekt Syl   ID  Päät Sekt Syl    sektori    määrä\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- ------------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Raaka"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
-msgstr "N�yt� taulu raa'assa datamuodossa"
+msgstr "Näytä taulu raa'assa datamuodossa"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorit"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
-msgstr "N�yt� taulu j�rjestettyn� sektoreiden mukaan"
+msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Taulu"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
-msgstr "N�yt� osiotaulu"
+msgstr "Näytä osiotaulu"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
-msgstr "�l� n�yt� taulua"
+msgstr "Älä näytä taulua"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Cfdiskin ohjeruutu"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "T�m� on cfdisk, curses-pohjainen levynosiointiohjelma, "
+msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyll� "
+msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "olevia osioita."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr "Copyright � 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Komento      Merkitys"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b          Aseta nykyisen osion k�ynnistett�vyyslippu p��lle/pois"
+msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr "  g          Muuta sylinteri-, p��- ja sektoriparametreja"
+msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
-msgstr "             VAROITUS: T�t� valitsinta tulee k�ytt�� vain niiden,"
+msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "             jotka tiet�v�t mit� ovat tekem�ss�."
+msgstr "             jotka tietävät mitä ovat tekemässä."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
-msgstr "  h          N�yt� t�m� ohjeruutu"
+msgstr "  h          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m          Maksimoi nykyisen osion levynk�ytt�"
+msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "             Huom: T�m� saattaa tehd� osiosta ep�yhteensopivan"
+msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             mm. DOSin ja OS/2:n kanssa."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
-msgstr "  n          Luo uusi osio tyhj�st� tilasta"
+msgstr "  n          Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Osioille on useita erilaisia muotoja,"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             joista voit valita:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"                r - Raaka data (tasan se, mit� levylle kirjoitettaisiin)"
+"                r - Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
-msgstr "                s - Sektoreittain j�rjestetty taulu"
+msgstr "                s - Sektoreittain järjestetty taulu"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Taulu raa'assa muodossa"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
-msgstr "  t          Muuta tiedostoj�rjestelm�n tyyppi�"
+msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
-msgstr "  u          Muuta osiokokon�kym�n yksik�it�"
+msgstr "  u          Muuta osiokokonäkymän yksiköitä"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien v�lill�"
+msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjoita osiotaulu levylle (on annettava iso kirjain W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "             Koska t�m� saattaa tuhota levyll� olevaa dataa, kirjoitus"
+msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
-"             on joko varmistettava tai peruttava kirjoittamalla \"kyll�\" tai"
+"             on joko varmistettava tai peruttava kirjoittamalla \"kyllä\" tai"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             \"ei\""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Nuoli yl�s   Siirr� osoitin edelliseen osioon"
+msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Nuoli alas   Siirr� osoitin seuraavaan osioon"
+msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
-msgstr "CTRL-L       Piirt�� ruudun uudelleen"
+msgstr "CTRL-L       Piirtää ruudun uudelleen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
-msgstr "  ?          N�yt� t�m� ohjeruutu"
+msgstr "  ?          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienill�"
+msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "kirjaimilla (paitsi taulun kirjoitus (W) )."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Sylinterit"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Muuta sylinterigeometriaa"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
-msgstr "P��t"
+msgstr "Päät"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
-msgstr "Vaihda p��geometriaa"
+msgstr "Vaihda päägeometriaa"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Vaihda sektorigeometriaa"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Valmis"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometrian muutos valmis"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
-msgstr "Anna sylinterien m��r�: "
+msgstr "Anna sylinterien määrä: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Virheellinen sylinteriarvo"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
-msgstr "Anna p�iden m��r�: "
+msgstr "Anna päiden määrä: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
-msgstr "Virheellinen p��arvo"
+msgstr "Virheellinen pääarvo"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
-msgstr "Anna sektorien m��r� uraa kohden: "
+msgstr "Anna sektorien määrä uraa kohden: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
-msgstr "Virheellinen sektorim��r�"
+msgstr "Virheellinen sektorimäärä"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
-msgstr "Anna tiedostoj�rjestelm�n tyyppi: "
+msgstr "Anna tiedostojärjestelmän tyyppi: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
-msgstr "Tiedostoj�rjestelm�n tyyppi� ei voi muuttaa tyhj�ksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
-msgstr "Tiedostoj�rjestelm�n tyyppi� ei voi muuttaa laajennetuksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tunt(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Ens/Loog"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tuntematon (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Levyasema: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Koko: %lld tavua, %lld Mt"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Koko: %lld tavua, %lld.%lld Gt"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
-msgstr "P��t: %d   Sektorit/ura: %d   Sylinterit: %lld"
+msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Liput"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Osiotyyppi"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
-msgstr "Tied.j�rj.tyyppi"
+msgstr "Tied.järj.tyyppi"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
-msgstr "[Nimi�]"
+msgstr "[Nimiö]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektorit"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr " Sylinterit"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr " Koko (Mt)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr " Koko (Gt)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
-msgstr "K�ynnistett�v�"
+msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
-msgstr "Aseta nykyisen osion k�ynnistett�vyyslippu p��lle/pois"
+msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Poista"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta levyn geometriaa (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ohje"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "N�yt� ohjeruutu"
+msgstr "Näytä ohjeruutu"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "Maksimoi nykyisen osion tilank�ytt� (vain asiantuntijoille)"
+msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Uusi"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
-msgstr "Luo uusi osio tyhj�st� tilasta"
+msgstr "Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
-msgstr "N�yt�"
+msgstr "Näytä"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Lopeta"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tyyppi"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Vaihda tiedostoj�rjestelm�n tyyppi (DOS, Linux, OS/2, jne)"
+msgstr "Vaihda tiedostojärjestelmän tyyppi (DOS, Linux, OS/2, jne)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
-msgstr "Yksik�t"
+msgstr "Yksiköt"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Vaihda osiokokon�yt�n yksik�t (Mt, sekt, syl)"
+msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Kirjoita"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Kirjoita osiotaulu levylle (t�m� saattaa tuhota dataa)"
+msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
-msgstr "T�st� osiosta ei voi tehd� k�ynnistett�v��"
+msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
-msgstr "Tyhj�� osiota ei voi poistaa"
+msgstr "Tyhjää osiota ei voi poistaa"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
-msgstr "T�t� osiota ei voi maksimoida"
+msgstr "Tätä osiota ei voi maksimoida"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
-msgstr "T�m� osio on ei ole k�ytett�viss�"
+msgstr "Tämä osio on ei ole käytettävissä"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
-msgstr "T�m� osio on jo k�yt�ss�"
+msgstr "Tämä osio on jo käytössä"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
-msgstr "Tyhj�n osion tyyppi� ei voi vaihtaa"
+msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
-msgstr "Ei enemp�� osioita"
+msgstr "Ei enempää osioita"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Virheellinen komento"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright � 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2199,19 +2127,19 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"K�ytt�:\n"
-"N�yt� versio:\n"
+"Käyttö:\n"
+"Näytä versio:\n"
 "        %s -v\n"
-"N�yt� osiotaulu:\n"
+"Näytä osiotaulu:\n"
 "        %s -P {r|s|t} [valitsimet] laite\n"
-"Vuorovaikutteinen k�ytt�:\n"
+"Vuorovaikutteinen käyttö:\n"
 "        %s [valitsimet] laite\n"
 "\n"
 "Valitsimet:\n"
-"-a: K�yt� nuolta korostuksen asemesta;\n"
-"-z: Aloita tyhj�ll� osiotaululla, osiotaulua ei lueta levylt�;\n"
-"-c C -h H -s S: Ohita ytimen mielipide sylinterien ja p�iden m��r�st�,\n"
-"                sek� sektoreita/ura-m��r�st�.\n"
+"-a: Käytä nuolta korostuksen asemesta;\n"
+"-z: Aloita tyhjällä osiotaululla, osiotaulua ei lueta levyltä;\n"
+"-c C -h H -s S: Ohita ytimen mielipide sylinterien ja päiden määrästä,\n"
+"                sekä sektoreita/ura-määrästä.\n"
 "\n"
 
 #: fdisk/fdiskaixlabel.c:27
@@ -2230,16 +2158,16 @@ msgid ""
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
 "\n"
-"\tT�ll� levyll� on kelvollinen AIX-nimi�.\n"
+"\tTällä levyllä on kelvollinen AIX-nimiö.\n"
 "\tValitettavasti Linux ei toistaiseksi osaa \n"
-"\tk�sitell� t�llaisia levyj�. Siit� huolimatta\n"
+"\tkäsitellä tällaisia levyjä. Siitä huolimatta\n"
 "\tjoitakin neuvoja:\n"
 "\t1. fdisk tuhoaa levyn tiedot kirjoitettaessa.\n"
-"\t2. Varmista, ett� t�m� levy EI ole en�� elint�rke�\n"
-"\t   osa osioryhm��. (Jos on, muutkin levyt saattavat\n"
-"\t   tyhjenty�, ellei niit� ole peilattu.)\n"
-"\t3. Varmista ennen t�m�n fyysisen osion tuhoamista,\n"
-"\t   ett� levy on loogisesti poistettu AIX-koneesta.\n"
+"\t2. Varmista, että tämä levy EI ole enää elintärkeä\n"
+"\t   osa osioryhmää. (Jos on, muutkin levyt saattavat\n"
+"\t   tyhjentyä, ellei niitä ole peilattu.)\n"
+"\t3. Varmista ennen tämän fyysisen osion tuhoamista,\n"
+"\t   että levy on loogisesti poistettu AIX-koneesta.\n"
 "\t   (Muussa tapauksessa sinusta tulee AIXpertti)."
 
 #: fdisk/fdiskbsdlabel.c:122
@@ -2249,11 +2177,11 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 "\n"
-"BSD-nimi� laitteelle: %s\n"
+"BSD-nimiö laitteelle: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Komento  merkitys"
 
@@ -2271,53 +2199,52 @@ msgstr "   i    asenna esilatausohjelma"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr "   l    listaa tunnetut tiedostoj�rjestelm�tyypit"
+msgstr "   l    listaa tunnetut tiedostojärjestelmätyypit"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
-msgstr "   m    n�yt� t�m� valikko"
+msgstr "   m    näytä tämä valikko"
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr "   n    lis�� uusi BSD-osio"
+msgstr "   n    lisää uusi BSD-osio"
 
 #: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr "   p    n�yt� BSD-osiotaulu"
+msgstr "   p    näytä BSD-osiotaulu"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q    lopeta tallentamatta muutoksia"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
-msgstr "   r    palaa p��valikkoon"
+msgstr "   r    palaa päävalikkoon"
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr "   s    n�yt� t�ydellinen levynimi�"
+msgstr "   s    näytä täydellinen levynimiö"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr "   t    vaihda osion tiedostoj�rjestelm�-id:t�"
+msgstr "   t    vaihda osion tiedostojärjestelmä-id:tä"
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   u    vaihda yksik�t (sylinterit/sektorit)"
+msgstr "   u    vaihda yksiköt (sylinterit/sektorit)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr "   w    kirjoita levynimi� levylle"
+msgstr "   w    kirjoita levynimiö levylle"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x    linkit� BSD-osio ei-BSD-osioon"
+msgstr "   x    linkitä BSD-osio ei-BSD-osioon"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
@@ -2327,7 +2254,7 @@ msgstr "Osiolla %s on virheellinen alkusektori 0.\n"
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Luetaan laitteen %s levynimi�t� sektorilta %d.\n"
+msgstr "Luetaan laitteen %s levynimiötä sektorilta %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2336,15 +2263,15 @@ msgstr "Laitteella %s ei ole *BSD-osiota.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "BSD-levynimi�komento (m antaa ohjeen): "
+msgstr "BSD-levynimiökomento (m antaa ohjeen): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
-msgstr "Ensimm�inen %s"
+msgstr "Ensimmäinen %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimeinen %s tai +koko tai +kokoM tai +kokoK"
@@ -2367,7 +2294,7 @@ msgstr "levy: %.*s\n"
 #: fdisk/fdiskbsdlabel.c:322
 #, c-format
 msgid "label: %.*s\n"
-msgstr "nimi�: %.*s\n"
+msgstr "nimiö: %.*s\n"
 
 #: fdisk/fdiskbsdlabel.c:323
 #, c-format
@@ -2377,7 +2304,7 @@ msgstr "liput:"
 #: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid " removable"
-msgstr " siirrett�v�"
+msgstr " siirrettävä"
 
 #: fdisk/fdiskbsdlabel.c:327
 #, c-format
@@ -2389,8 +2316,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2414,7 +2339,7 @@ msgstr "sektoreita/sylinteri: %ld\n"
 #: fdisk/fdiskbsdlabel.c:337
 #, c-format
 msgid "cylinders: %ld\n"
-msgstr "sylintereit�: %ld\n"
+msgstr "sylintereitä: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:338
 #, c-format
@@ -2429,17 +2354,17 @@ msgstr "lomitus: %d\n"
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
-msgstr "urav��ristym�: %d\n"
+msgstr "uravääristymä: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr "sylinteriv��ristym�: %d\n"
+msgstr "sylinterivääristymä: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "p��nvaihto: %ld\t\t# millisekuntia\n"
+msgstr "päänvaihto: %ld\t\t# millisekuntia\n"
 
 #: fdisk/fdiskbsdlabel.c:344
 #, c-format
@@ -2468,16 +2393,16 @@ msgstr "#       alku        loppu    koko     tyyppi   [fkoko bkoko   cpg]\n"
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Kirjoitetaan levynimi�t� laitteelle %s.\n"
+msgstr "Kirjoitetaan levynimiötä laitteelle %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "Laitteella %s ei ole levynimi�t�.\n"
+msgstr "Laitteella %s ei ole levynimiötä.\n"
 
 #: fdisk/fdiskbsdlabel.c:427
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Haluatko luoda levynimi�n? (y/n) "
+msgstr "Haluatko luoda levynimiön? (y/n) "
 
 #: fdisk/fdiskbsdlabel.c:467
 msgid "bytes/sector"
@@ -2491,8 +2416,8 @@ msgstr "sektoria/ura"
 msgid "tracks/cylinder"
 msgstr "uraa/sylinteri"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "sylinterit"
 
@@ -2515,15 +2440,15 @@ msgstr "lomitus"
 
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
-msgstr "urav��ristym�"
+msgstr "uravääristymä"
 
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
-msgstr "sylinteriv��ristym�"
+msgstr "sylinterivääristymä"
 
 #: fdisk/fdiskbsdlabel.c:487
 msgid "headswitch"
-msgstr "p��nvaihto"
+msgstr "päänvaihto"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
@@ -2537,7 +2462,7 @@ msgstr "Esilatausohjelma: %sboot -> boot%s (%s): "
 #: fdisk/fdiskbsdlabel.c:554
 #, c-format
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Esilatausohjelma on p��llekk�inen levynimi�n kanssa!\n"
+msgstr "Esilatausohjelma on päällekkäinen levynimiön kanssa!\n"
 
 #: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
@@ -2549,15 +2474,15 @@ msgstr "Esilatausohjelma asennettu laitteelle %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Osio (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
-msgstr "Maksimim��r� osioita on luotu\n"
+msgstr "Maksimimäärä osioita on luotu\n"
 
 #: fdisk/fdiskbsdlabel.c:630
 #, c-format
 msgid "This partition already exists.\n"
-msgstr "T�m� osio on jo olemassa.\n"
+msgstr "Tämä osio on jo olemassa.\n"
 
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
@@ -2573,7 +2498,7 @@ msgstr ""
 "\n"
 "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2584,16 +2509,16 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"K�ytt�: fdisk [-b SSZ] [-u] LEVY     Muuta osiotaulua\n"
-"        fdisk -l [-b SSZ] [-u] LEVY  N�yt� osiotaulu(t)\n"
-"        fdisk -s OSIO                N�yt� osio(ide)n koko/koot lohkoina\n"
-"        fdisk -v                     N�yt� fdiskin versio\n"
-"T�ss� LEVY on esimerkiksi /dev/hdb tai /dev/sda\n"
+"Käyttö: fdisk [-b SSZ] [-u] LEVY     Muuta osiotaulua\n"
+"        fdisk -l [-b SSZ] [-u] LEVY  Näytä osiotaulu(t)\n"
+"        fdisk -s OSIO                Näytä osio(ide)n koko/koot lohkoina\n"
+"        fdisk -v                     Näytä fdiskin versio\n"
+"Tässä LEVY on esimerkiksi /dev/hdb tai /dev/sda\n"
 "ja OSIO on esimerkiksi /dev/hda7\n"
 "-u: anna Alku ja Loppu sektoreina (sylinterien sijaan)\n"
-"-b 2048: (tietyille MO-levyille) k�yt� 2048 tavun sektoreita\n"
+"-b 2048: (tietyille MO-levyille) käytä 2048 tavun sektoreita\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2602,218 +2527,204 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"K�ytt�: fdisk [-l] [-b SSZ] [-u] laite\n"
-"Esim: fdisk /dev/hda  (ensimm�inen IDE-levy)\n"
+"Käyttö: fdisk [-l] [-b SSZ] [-u] laite\n"
+"Esim: fdisk /dev/hda  (ensimmäinen IDE-levy)\n"
 " tai: fdisk /dev/sdc  (kolmas SCSI-levy)\n"
-" tai: fdisk /dev/eda  (ensimm�inen PS/2 ESDI -asema)\n"
+" tai: fdisk /dev/eda  (ensimmäinen PS/2 ESDI -asema)\n"
 " tai: fdisk /dev/rd/c0d0  tai: fdisk /dev/ida/c0d0  (RAID-laitteet)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Laitetta %s ei voi lukea\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "Laitteella %s ei voi siirty�\n"
+msgstr "Laitteella %s ei voi siirtyä\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Laitteelle %s ei voi kirjoittaa\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "BLKGETSIZE-ioctl ep�onnistui laitteelle %s\n"
+msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
-msgstr "Muistia ei voi varata enemp��\n"
+msgstr "Muistia ei voi varata enempää\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Vakava virhe\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
-msgstr "   a    aseta vain luku -lippu p��lle/pois"
+msgstr "   a    aseta vain luku -lippu päälle/pois"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
-msgstr "   b    muokkaa bsd-levynimi�t�"
+msgstr "   b    muokkaa bsd-levynimiötä"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
-msgstr "   c    aseta liitett�vyyslippu p��lle/pois"
+msgstr "   c    aseta liitettävyyslippu päälle/pois"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d    poista osio"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l    listaa tunnetut osiotyypit"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
-msgstr "   n    lis�� uusi osio"
+msgstr "   n    lisää uusi osio"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o    luo uusi tyhj� DOS-osiotaulu"
+msgstr "   o    luo uusi tyhjä DOS-osiotaulu"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
-msgstr "   p    n�yt� osiotaulu"
+msgstr "   p    näytä osiotaulu"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s    luo uusi tyhj� Sun-levynimi�"
+msgstr "   s    luo uusi tyhjä Sun-levynimiö"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t    vaihda osion j�rjestelm�-id:t�"
+msgstr "   t    vaihda osion järjestelmä-id:tä"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u    vaihda n�kym�/sy�teyksik�t"
+msgstr "   u    vaihda näkymä/syöteyksiköt"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v    varmista osiotaulu"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w    kirjoita taulu levylle ja poistu"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
-msgstr "   x    lis�toiminnot (vain asiantuntijoille)"
+msgstr "   x    lisätoiminnot (vain asiantuntijoille)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a    valitse k�ynnistett�v� osio"
+msgstr "   a    valitse käynnistettävä osio"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
-msgstr "   b    muokkaa k�ynnistystiedostomerkint��"
+msgstr "   b    muokkaa käynnistystiedostomerkintää"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c    valitse sgi-sivutusosio"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
-msgstr "   a    aseta k�ynnistett�vyyslippu p��lle/pois"
+msgstr "   a    aseta käynnistettävyyslippu päälle/pois"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c    aseta dos-yhteensopivuuslippu p��lle/pois"
+msgstr "   c    aseta dos-yhteensopivuuslippu päälle/pois"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
-msgstr "   a    muuta vaihtoehtoisten sylinterien m��r��"
+msgstr "   a    muuta vaihtoehtoisten sylinterien määrää"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
-msgstr "   c    muuta sylinterien m��r��"
+msgstr "   c    muuta sylinterien määrää"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
-msgstr "   d    n�yt� osiotaulun raaka data"
+msgstr "   d    näytä osiotaulun raaka data"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e    muuta sylinterikohtaisten lis�sektorien m��r��"
+msgstr "   e    muuta sylinterikohtaisten lisäsektorien määrää"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
-msgstr "   h    muuta p�iden m��r��"
+msgstr "   h    muuta päiden määrää"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i    muuta lomituskerrointa"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o    muuta py�rimisnopeutta (rpm)"
+msgstr "   o    muuta pyörimisnopeutta (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
-msgstr "   s    muuta sektorien m��r�� uraa kohden"
+msgstr "   s    muuta sektorien määrää uraa kohden"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
-msgstr "   y    muuta fyysisten sylintereiden m��r��"
+msgstr "   y    muuta fyysisten sylintereiden määrää"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
-msgstr "   b    siirr� datan alkua osiossa"
+msgstr "   b    siirrä datan alkua osiossa"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e    listaa laajennetut osiot"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    luo IRIX (SGI) -osiotaulu"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   f    korjaa osioj�rjestys"
+msgstr "   f    korjaa osiojärjestys"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "On asetettava"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
-msgstr "p��t"
+msgstr "päät"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"T�m�n voi tehd� lis�toimintovalikosta.\n"
+"Tämän voi tehdä lisätoimintovalikosta.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2825,36 +2736,38 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 "\n"
-"T�m�n levyn sylintereiden m��r�ksi on asetettu %d.\n"
-"Siin� ei ole mit��n vikaa, mutta se on suurempi kuin 1024, ja voi\n"
-"tietyiss� kokoonpanoissa aiheuttaa ongelmia seuraavissa tapauksissa:\n"
-"1) k�ynnistyksess� ajettavat ohjelmat (esim. LILOn vanhat versiot)\n"
-"2) muiden k�ytt�j�rjestelmien k�ynnistys- ja osiointiohjelmat\n"
+"Tämän levyn sylintereiden määräksi on asetettu %d.\n"
+"Siinä ei ole mitään vikaa, mutta se on suurempi kuin 1024, ja voi\n"
+"tietyissä kokoonpanoissa aiheuttaa ongelmia seuraavissa tapauksissa:\n"
+"1) käynnistyksessä ajettavat ohjelmat (esim. LILOn vanhat versiot)\n"
+"2) muiden käyttöjärjestelmien käynnistys- ja osiointiohjelmat\n"
 "   (esim. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
-msgstr "Virheellinen siirtym� laajennetussa ensi�osiossa\n"
+msgstr "Virheellinen siirtymä laajennetussa ensiöosiossa\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
+"Varoitus: ei huomioida #%d:n jälkeisiä osioita.\n"
+"Ne tuhotaan jos tämä osiotaulu tallennetaan.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Varoitus: ylim��r�inen linkkiosoitin osiotaulussa %d\n"
+msgstr "Varoitus: ylimääräinen linkkiosoitin osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr "Varoitus: j�tet��n huomiotta ylim��r�inen data osiotaulussa %d\n"
+msgstr "Varoitus: jätetään huomiotta ylimääräinen data osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2862,47 +2775,47 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Muodostetaan uusi DOS-levynimi�. Muutokset tehd��n vain k�ytt�muistiin,\n"
-"kunnes p��t�t kirjoittaa ne levylle. Sen j�lkeen edellist� sis�lt�� ei\n"
-"tietenk��n voida en�� palauttaa.\n"
+"Muodostetaan uusi DOS-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida enää palauttaa.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Huom: sektorikoko on %d (ei %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Et pysty kirjoittamaan osiotaulua.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
-"T�ll� levyll� on sek� DOS-, ett� BSD-taikatavut.\n"
+"Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
 "Siirry BSD-tilaan \"b\"-komennolla.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
-msgstr "Laitteella ei ole kelvollista DOS-, Sun-, SGI- eik� OSF-levynimi�t�\n"
+msgstr "Laitteella ei ole kelvollista DOS-, Sun-, SGI- eikä OSF-levynimiötä\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
-msgstr "Sis�inen virhe\n"
+msgstr "Sisäinen virhe\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "Ylim��r�ist� laajennettua osiota %d ei huomioida\n"
+msgstr "Ylimääräistä laajennettua osiota %d ei huomioida\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2911,7 +2824,7 @@ msgstr ""
 "Varoitus: osiotaulun %2$d virheellinen lippu 0x%1$04x korjataan "
 "kirjoitettaessa (w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2920,84 +2833,84 @@ msgstr ""
 "\n"
 "saatiin EOF kolmesti - poistutaan..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Heksakoodi (L listaa koodit): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, oletus %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
-msgstr "K�ytet��n oletusarvoa %u\n"
+msgstr "Käytetään oletusarvoa %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
-msgstr "Arvo sallitun v�lin ulkopuolella.\n"
+msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Osionumero"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Varoitus: osiolla %d on tyhj� tyyppi\n"
+msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valittiin osio %d\n"
 
 #
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
-msgstr "Osioita ei ole viel� m��ritelty!\n"
+msgstr "Osioita ei ole vielä määritelty!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr "Kaikki ensi�osiot on jo m��ritelty!\n"
+msgstr "Kaikki ensiöosiot on jo määritelty!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "sylinteri"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektori"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Vaihdetaan n�kym�/sy�teyksik�iksi %s\n"
+msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROITUS: Osio %d on laajennettu osio\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-yhteensopivuuslippu on asetettu\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-yhteensopivuuslippua ei ole asetettu\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "Osiota %d ei ole viel� olemassa!\n"
+msgstr "Osiota %d ei ole vielä olemassa!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3005,86 +2918,86 @@ msgid ""
 "type 0 is probably unwise. You can delete\n"
 "a partition using the `d' command.\n"
 msgstr ""
-"Tyyppi 0 merkitsee tyhj�� tilaa useissa j�rjestelmiss�\n"
-"(mutta ei Linuxissa). Tyyppi� 0 olevien osioiden\n"
-"pit�minen ei todenn�k�isesti ole viisasta. Osion voi\n"
-"poistaa k�ytt�m�ll� \"d\"-komentoa.\n"
+"Tyyppi 0 merkitsee tyhjää tilaa useissa järjestelmissä\n"
+"(mutta ei Linuxissa). Tyyppiä 0 olevien osioiden\n"
+"pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
+"poistaa käyttämällä \"d\"-komentoa.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Osiota ei voi muuttaa laajennetuksi osioksi, eik� p�invastoin.\n"
+"Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
 "Se on poistettava ensin.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Osion 3 tyypiksi on syyt� j�tt�� Koko levy (5),\n"
-"koska SunOS/Solaris odottaa sit�, ja jopa Linux pit�� siit�.\n"
+"Osion 3 tyypiksi on syytä jättää Koko levy (5),\n"
+"koska SunOS/Solaris odottaa sitä, ja jopa Linux pitää siitä.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Osion 9 tyypiksi on syyt� j�tt�� osio-otsikko (0),\n"
-"ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sit�.\n"
+"Osion 9 tyypiksi on syytä jättää osio-otsikko (0),\n"
+"ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sitä.\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
-msgstr "Osion %d j�rjestelm�tyypiksi vaihdettiin %x (%s)\n"
+msgstr "Osion %d järjestelmätyypiksi vaihdettiin %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset alkukohdat (ei-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyysinen=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "looginen=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset loppukohdat:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Osion %i alku ei ole sylinterin rajalla:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
-msgstr "pit�� olla (%d, %d, 1)\n"
+msgstr "pitää olla (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Osion %i loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
-msgstr "pit�� olla (%d, %d, %d)\n"
+msgstr "pitää olla (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3093,7 +3006,7 @@ msgstr ""
 "\n"
 "Levy %s: %ld Mt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3102,59 +3015,62 @@ msgstr ""
 "\n"
 "Levy %s: %ld.%ld Gt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr "%d p��t�, %d sektoria/ura, %d sylinteri�"
+msgstr "%d päätä, %d sektoria/ura, %d sylinteriä"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
-msgstr ", yhteens� %llu sektoria"
+msgstr ", yhteensä %llu sektoria"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
-msgstr "Yksik�t = %2$d * %3$d = %4$d -tavuiset %1$s\n"
+msgstr "Yksiköt = %2$d * %3$d = %4$d -tavuiset %1$s\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Ei mit��n teht�v��. J�rjestys on jo oikea.\n"
+"Ei mitään tehtävää. Järjestys on jo oikea.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Tämä ei näytä osiotaululta\n"
+"Valittuna on todennäköisesti väärä laite.\n"
+"\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s K�ynn     Alku          Loppu    Lohkot   Id  J�rjestelm�\n"
+msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Laite"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 "\n"
-"Osiotaulumerkinn�t eiv�t ole levyj�rjestyksess�\n"
+"Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3162,86 +3078,87 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %s: %d p��t�, %d sektoria, %d sylinteri�\n"
+"Levy %s: %d päätä, %d sektoria, %d sylinteriä\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
-msgstr "No AF P�� Sekt Syl P�� Sekt Syl     Alku       Koko ID\n"
+msgstr "No AF Pää Sekt Syl Pää Sekt Syl     Alku       Koko ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Varoitus: osio %d sis�lt�� sektorin 0\n"
+msgstr "Varoitus: osio %d sisältää sektorin 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Osio %d: p�� %d on suurempi kuin maksimi %d\n"
+msgstr "Osio %d: pää %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Osio %d: sektori %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Osio %d: sylinteri %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
-"Osio %d: edellinen sektorim��r� %d on ristiriidassa yhteism��r�n %d kanssa\n"
+"Osio %d: edellinen sektorimäärä %d on ristiriidassa yhteismäärän %d kanssa\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varoitus: virheellinen datan alkukohta osiossa %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Varoitus: osio %d ja osio %d ovat (osittain) p��llekk�iset.\n"
+msgstr "Varoitus: osio %d ja osio %d ovat (osittain) päällekkäiset.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Varoitus: osio %d on tyhj�\n"
+msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Looginen osio %d ei ole kokonaan osiossa %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "Varattujen sektoreiden kokonaism��r� %d on suurempi kuin maksimi %d\n"
+msgstr ""
+"Varattujen sektoreiden kokonaismäärä %d on suurempi kuin maksimi %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d varaamatonta sektoria\n"
+msgstr "%lld varaamatonta sektoria\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "Osio %d on jo m��ritelty. Poista se ennen uudelleen lis��mist�.\n"
+msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
-msgstr "Ei vapaita sektoreita k�ytett�viss�\n"
+msgstr "Ei vapaita sektoreita käytettävissä\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3249,27 +3166,27 @@ msgid ""
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
-"\tValitan - t�m� fdisk ei osaa k�sitell� AIX-levynimi�it�.\n"
-"\tJos haluat lis�t� DOS-tyyppisi� osioita, luo ensin\n"
+"\tValitan - tämä fdisk ei osaa käsitellä AIX-levynimiöitä.\n"
+"\tJos haluat lisätä DOS-tyyppisiä osioita, luo ensin\n"
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
-"\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sis�ll�n.\n"
+"\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "Jokin osio on poistettava ja lis�tt�v� laajennettu osio ensin\n"
+msgstr "Jokin osio on poistettava ja lisättävä laajennettu osio ensin\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "loogiset osiot eiv�t ole levyj�rjestyksess�"
+msgstr "Kaikki loogiset osiot ovat käytössä\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Viallinen ensi�osio"
+msgstr "Lisätään ensiöosio\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3278,22 +3195,22 @@ msgid ""
 msgstr ""
 "Komento  merkitys\n"
 "   %s\n"
-"   p    ensi�osio (1-4)\n"
+"   p    ensiöosio (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l    looginen (5 tai yli)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e    laajennettu"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Virheellinen osionumero tyypille \"%c\"\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3302,12 +3219,12 @@ msgstr ""
 "Osiotaulua on muutettu!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3316,11 +3233,11 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"VAROITUS: Osiotaulun uudelleenluku ep�onnistui, virhe %d: %s.\n"
-"Ydin k�ytt�� edelleen vanhaa taulua.\n"
-"Uutta taulua k�ytet��n seuraavasta k�ynnistyksest� alkaen.\n"
+"VAROITUS: Osiotaulun uudelleenluku epäonnistui, virhe %d: %s.\n"
+"Ydin käyttää edelleen vanhaa taulua.\n"
+"Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3330,114 +3247,115 @@ msgid ""
 msgstr ""
 "\n"
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
-"katso lis�tietoja fdiskin manuaalisivulta.\n"
+"katso lisätietoja fdiskin manuaalisivulta.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Virhe suljettaessa %s\n"
+msgstr ""
+"\n"
+"Virhe suljettaessa tiedostoa\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
-msgstr "Sylinterien m��r�"
+msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
-msgstr "P�iden m��r�"
+msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
-msgstr "Sektorien m��r�"
+msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr "Varoitus: asetetaan sektorisiirtym� DOS-yhteensopivuutta varten\n"
+msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr "Levy %s ei sis�ll� kelvollista osiotaulua\n"
+msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr "T�m� ydin l�yt�� sektorin koon itse -- -b-valitsinta ei huomioida\n"
+msgstr "Tämä ydin löytää sektorin koon itse -- -b-valitsinta ei huomioida\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Varoitus: valitsinta -b (sektorikoon asetus) tulee k�ytt�� yhden annetun "
+"Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
 "laitteen kanssa\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
-"Havaittiin OSF/1-levynimi� laitteella %s, siirryt��n levynimi�tilaan.\n"
+"Havaittiin OSF/1-levynimiö laitteella %s, siirrytään levynimiötilaan.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Nykyinen k�ynnistystiedosto on: %s\n"
+"Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
-msgstr "Anna uuden k�ynnistystiedoston nimi: "
+msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
-msgstr "K�ynnistystiedosto muuttumaton\n"
+msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3504,15 +3422,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux-sivutus"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linuxmainen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3526,16 +3444,16 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"MIPS Computer Systems, Inc:in mukaan nimi�ss� saa olla korkeintaan 512 "
+"MIPS Computer Systems, Inc:in mukaan nimiössä saa olla korkeintaan 512 "
 "tavua\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr "Havaittiin sgi-levynimi�, jolla on v��r� tarkistussumma.\n"
+msgstr "Havaittiin sgi-levynimiö, jolla on väärä tarkistussumma.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3546,15 +3464,15 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (SGI-levynimi�): %2$d p��t�, %3$d sektoria\n"
-"%4$d sylinteri�, %5$d fyysist� sylinteri�\n"
-"%6$d ylim��r�ist� sekt/syl, lomitus %7$d:1\n"
+"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria\n"
+"%4$d sylinteriä, %5$d fyysistä sylinteriä\n"
+"%6$d ylimääräistä sekt/syl, lomitus %7$d:1\n"
 "%8$s\n"
-"Yksik�t = %10$d * 512 -tavuiset %9$s\n"
+"Yksiköt = %10$d * %11$d -tavuiset %9$s\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3562,8 +3480,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (SGI-levynimi�): %2$d p��t�, %3$d sektoria, %4$d sylinteri�\n"
-"Yksik�t = %6$d * 512 -tavuiset %5$s\n"
+"Levy %1$s (SGI-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+"Yksiköt = %6$d * %7$d -tavuiset %5$s\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
@@ -3573,7 +3491,7 @@ msgid ""
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- osiot -----\n"
-"Os# %*s  Info     Alku        Loppu Sektorit Id  J�rjestelm�\n"
+"Os# %*s  Info     Alku        Loppu Sektorit Id  Järjestelmä\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, c-format
@@ -3582,16 +3500,15 @@ msgid ""
 "Bootfile: %s\n"
 "----- Directory Entries -----\n"
 msgstr ""
-"----- K�ynnistysinfo -----\n"
-"K�ynnistystiedosto: %s\n"
-"----- Hakemistomerkinn�t -----\n"
+"----- Käynnistysinfo -----\n"
+"Käynnistystiedosto: %s\n"
+"----- Hakemistomerkinnät -----\n"
 
 #: fdisk/fdisksgilabel.c:250
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektori%5u koko%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3601,8 +3518,8 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Virheellinen k�ynnistystiedosto!\n"
-"\tK�ynnistystiedoston on oltava absoluuttinen, ei-tyhj� polku,\n"
+"Virheellinen käynnistystiedosto!\n"
+"\tKäynnistystiedoston on oltava absoluuttinen, ei-tyhjä polku,\n"
 "\tesim. \"/unix\" tai \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:310
@@ -3612,7 +3529,7 @@ msgid ""
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tK�ynnistystiedoston nimi on liian pitk�: maksimi 16 tavua.\n"
+"\tKäynnistystiedoston nimi on liian pitkä: maksimi 16 tavua.\n"
 
 #: fdisk/fdisksgilabel.c:315
 #, c-format
@@ -3621,7 +3538,7 @@ msgid ""
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tK�ynnistystiedoston polun on oltava t�ydellinen.\n"
+"\tKäynnistystiedoston polun on oltava täydellinen.\n"
 
 #: fdisk/fdisksgilabel.c:322
 #, c-format
@@ -3631,7 +3548,7 @@ msgid ""
 "\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
 msgstr ""
 "\n"
-"\tHuomaa, ett� k�ynnistystiedoston olemassaoloa ei tarkisteta.\n"
+"\tHuomaa, että käynnistystiedoston olemassaoloa ei tarkisteta.\n"
 "\tSGI:n oletus on \"/unix\", ja varmuuskopiolle \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:348
@@ -3641,22 +3558,22 @@ msgid ""
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tK�ynnistystiedostoksi muutettiin \"%s\".\n"
+"\tKäynnistystiedostoksi muutettiin \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Levyll� on useampi kuin yksi kokolevymerkint�.\n"
+msgstr "Levyllä on useampi kuin yksi kokolevymerkintä.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
-msgstr "Ei m��riteltyj� osioita\n"
+msgstr "Ei määriteltyjä osioita\n"
 
 #: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr "IRIX pit�� siit�, ett� Osio 11 t�ytt�� koko levyn.\n"
+msgstr "IRIX pitää siitä, että Osio 11 täyttää koko levyn.\n"
 
 #: fdisk/fdisksgilabel.c:453
 #, c-format
@@ -3679,7 +3596,7 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:465
 #, c-format
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Yhden osion (#11) tulee t�ytt�� koko levy.\n"
+msgstr "Yhden osion (#11) tulee täyttää koko levy.\n"
 
 #: fdisk/fdisksgilabel.c:475
 #, c-format
@@ -3694,12 +3611,12 @@ msgstr "Osion %d loppu ei ole sylinterin rajalla.\n"
 #: fdisk/fdisksgilabel.c:488
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
-msgstr "Osiot %d ja %d ovat p��llekk�iset %d sektorin verran.\n"
+msgstr "Osiot %d ja %d ovat päällekkäiset %d sektorin verran.\n"
 
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
 #, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "K�ytt�m�t�n %8u sektorin alue - sektorit %8u-%u\n"
+msgstr "Käyttämätön %8u sektorin alue - sektorit %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3708,7 +3625,7 @@ msgid ""
 "The boot partition does not exist.\n"
 msgstr ""
 "\n"
-"K�ynnistysosiota ei ole olemassa.\n"
+"Käynnistysosiota ei ole olemassa.\n"
 
 #: fdisk/fdisksgilabel.c:528
 #, c-format
@@ -3726,14 +3643,13 @@ msgid ""
 "The swap partition has no swap type.\n"
 msgstr ""
 "\n"
-"Sivutusosiolla ei ole sivutustyyppi�.\n"
+"Sivutusosiolla ei ole sivutustyyppiä.\n"
 
 #: fdisk/fdisksgilabel.c:535
 #, c-format
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tValittu k�ynnistystiedoston nimi on ep�tavallinen.\n"
+msgstr "\tValittu käynnistystiedoston nimi on epätavallinen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3747,36 +3663,35 @@ msgid ""
 "Only the \"SGI volume\" entire disk section may violate this.\n"
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
-"On eritt�in suositeltavaa, ett� osiolla siirtym�n 0 kohdalla\n"
-"on tyyppi \"SGI volhdr\". IRIX-j�rjestelm� olettaa, ett�\n"
-"erillisty�kalut, kuten sash ja fx, voidaan hakea sen hakemistosta.\n"
-"Vain \"SGI volume\" -kokolevyosuus voi rikkoa t�t� s��nt��.\n"
-"Kirjoita KYLL�, jos olet varma t�m�n osion merkitsemisest� toisin.\n"
+"On erittäin suositeltavaa, että osiolla siirtymän 0 kohdalla\n"
+"on tyyppi \"SGI volhdr\". IRIX-järjestelmä olettaa, että\n"
+"erillistyökalut, kuten sash ja fx, voidaan hakea sen hakemistosta.\n"
+"Vain \"SGI volume\" -kokolevyosuus voi rikkoa tätä sääntöä.\n"
+"Kirjoita KYLLÄ, jos olet varma tämän osion merkitsemisestä toisin.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
-msgstr "KYLL�\n"
+msgstr "KYLLÄ\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr "Tied�tk�, ett� levyll� on p��llekk�isi� osioita?\n"
+msgstr "Tiedätkö, että levyllä on päällekkäisiä osioita?\n"
 
 #: fdisk/fdisksgilabel.c:637
 #, c-format
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr "Yritet��n luoda kokolevymerkint� automaattisesti.\n"
+msgstr "Yritetään luoda kokolevymerkintä automaattisesti.\n"
 
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "Koko levy on jo osioiden k�yt�ss�.\n"
+msgstr "Koko levy on jo osioiden käytössä.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr "Levyll� on p��llekk�isi� osioita. T�m� on korjattava ensin!\n"
+msgstr "Levyllä on päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
 #: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
 #, c-format
@@ -3784,14 +3699,14 @@ msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"On eritt�in suositeltavaa, ett� yhdestoista osio\n"
-"kattaa koko levyn ja on tyyppi� \"SGI volume\"\n"
+"On erittäin suositeltavaa, että yhdestoista osio\n"
+"kattaa koko levyn ja on tyyppiä \"SGI volume\"\n"
 
 #: fdisk/fdisksgilabel.c:671
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
-"Levyll� tulee olemaan p��llekk�isi� osioita. T�m� on korjattava ensin!\n"
+"Levyllä tulee olemaan päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
 #: fdisk/fdisksgilabel.c:676
 #, c-format
@@ -3806,9 +3721,9 @@ msgid ""
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Muodostetaan uusi SGI-levynimi�. Muutokset tehd��n vain k�ytt�muistiin,\n"
-"kunnes p��t�t kirjoittaa ne levylle. Sen j�lkeen edellist� sis�lt�� ei\n"
-"tietenk��n voida palauttaa.\n"
+"Muodostetaan uusi SGI-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida palauttaa.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3818,58 +3733,57 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"Varoitus: BLKGETSIZE-ioctl ep�onnistui laitteelle %s. K�ytet��n geometrian\n"
-"sylinteriarvoa %d. T�m� arvo voi typisty� laitteilla, jotka ovat suurempia\n"
+"Varoitus: BLKGETSIZE-ioctl epäonnistui laitteelle %s. Käytetään geometrian\n"
+"sylinteriarvoa %d. Tämä arvo voi typistyä laitteilla, jotka ovat suurempia\n"
 "kuin 33,8 Gt.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
-msgstr "Yritet��n s�ilytt�� osion %d parametrit.\n"
+msgstr "Yritetään säilyttää osion %d parametrit.\n"
 
 #: fdisk/fdisksgilabel.c:743
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tALKU=%d\tPITUUS=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
-msgstr "Tyhj�"
+msgstr "Tyhjä"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Koko levy"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS-var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3877,18 +3791,18 @@ msgid ""
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
-"Havaittiin Sun-levynimi�, jolla on v��r�\n"
-"tarkistussumma. Joudut todenn�k�isesti asettamaan\n"
-"kaikki arvot, esim. p��t, sektorit, sylinterit ja\n"
-"osiot tai pakottamaan tuoreen nimi�n \n"
-"(s-komento p��valikossa)\n"
+"Havaittiin Sun-levynimiö, jolla on väärä\n"
+"tarkistussumma. Joudut todennäköisesti asettamaan\n"
+"kaikki arvot, esim. päät, sektorit, sylinterit ja\n"
+"osiot tai pakottamaan tuoreen nimiön \n"
+"(s-komento päävalikossa)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
-msgstr "Automaattikonfigurointi l�ysi: %s%s%s\n"
+msgstr "Automaattikonfigurointi löysi: %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3896,12 +3810,12 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Luodaan uutta Sun-levynimi�t�. Muutokset tehd��n vain k�ytt�muistiin,\n"
-"kunnes p��t�t kirjoittaa ne levylle. Sen j�lkeen edellinen sis�lt� ei\n"
-"tietenk��n ole palautettavissa.\n"
+"Luodaan uutta Sun-levynimiötä. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellinen sisältö ei\n"
+"tietenkään ole palautettavissa.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3911,100 +3825,100 @@ msgstr ""
 "   ?   automaattinen konfigurointi\n"
 "   0   mukautettu (laitteiston mukaisilla oletuksilla)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Valitse tyyppi (?: automaattinen, 0: mukautettu): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
-msgstr "Automaattinen konfigurointi ep�onnistui.\n"
+msgstr "Automaattinen konfigurointi epäonnistui.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektoreita/ura"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Vaihtoehtoiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fyysiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr "Py�rimisnopeus (rpm)"
+msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
-msgstr "Ylim��r�isi� sektoreita sylinterill�"
+msgstr "Ylimääräisiä sektoreita sylinterillä"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "Voit s��t�� kaikkia levyn parametreja x-valikosta"
+msgstr "Voit säätää kaikkia levyn parametreja x-valikosta"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" levyke"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "mukautettu Linux"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Osion %d loppu ei ole sylinterin rajalla\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr "Osio %d on p��llekk�inen muiden kanssa sektoreilla %d-%d\n"
+msgstr "Osio %d on päällekkäinen muiden kanssa sektoreilla %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "K�ytt�m�t�nt� tilaa - sektorit 0-%d\n"
+msgstr "Käyttämätöntä tilaa - sektorit 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr "K�ytt�m�t�nt� tilaa - sektorit %d-%d\n"
+msgstr "Käyttämätöntä tilaa - sektorit %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"Muut osiot k�ytt�v�t jo koko levyn.\n"
-"Poista/kutista joitakin ennen uutta yrityst�.\n"
+"Muut osiot käyttävät jo koko levyn.\n"
+"Poista/kutista joitakin ennen uutta yritystä.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
 "%d %s covers some other partition. Your entry has been changed\n"
 "to %d %s\n"
 msgstr ""
-"Kolmas osio ei kata koko levy�, mutta arvo %d %s kattaa jonkin toisen\n"
-"osion. Merkint� on muutettu arvoon %d %s\n"
+"Kolmas osio ei kata koko levyä, mutta arvo %d %s kattaa jonkin toisen\n"
+"osion. Merkintä on muutettu arvoon %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Jos halutaan s�ilytt�� SunOS/Solaris-yhteensopivuus, t�m�n osion tyyppin�\n"
-"on syyt� s�ilytt�� Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
+"Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
+"on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4012,13 +3926,13 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
-"On eritt�in suositeltavaa, ett� osio siirtym�n 0 kohdalla\n"
-"on tyypilt��n UFS, EXT2FS tai SunOS-sivutus. Linuxin sivutusosion\n"
-"sijoittaminen sinne saattaa tuhota osiotaulun ja k�ynnistyslohkon.\n"
-"Kirjoita KYLL�, jos olet eritt�in varma, ett� haluat osion tyypiksi\n"
-"merkitt�v�n 82 (Linux-sivutus): "
+"On erittäin suositeltavaa, että osio siirtymän 0 kohdalla\n"
+"on tyypiltään UFS, EXT2FS tai SunOS-sivutus. Linuxin sivutusosion\n"
+"sijoittaminen sinne saattaa tuhota osiotaulun ja käynnistyslohkon.\n"
+"Kirjoita KYLLÄ, jos olet erittäin varma, että haluat osion tyypiksi\n"
+"merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4030,15 +3944,15 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (Sun-levynimi�): %2$d p��t�, %3$d sektoria,\n"
-"%4$d kierrosta minuutissa, %5$d sylinteri�, %6$d vaihtoehtoista\n"
-"sylinteri�, %7$d fyysist� sylinteri�, %8$d ylim��r�ist� sekt/syl,\n"
+"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria,\n"
+"%4$d kierrosta minuutissa, %5$d sylinteriä, %6$d vaihtoehtoista\n"
+"sylinteriä, %7$d fyysistä sylinteriä, %8$d ylimääräistä sekt/syl,\n"
 "lomitus %9$d:1\n"
 "%10$s\n"
-"Yksik�t = %12$d * 512 -tavuiset %11$s\n"
+"Yksiköt = %12$d * 512 -tavuiset %11$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4047,22 +3961,22 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (Sun-levynimi�): %2$d p��t�, %3$d sektoria, %4$d sylinteri�\n"
-"Yksik�t = %6$d * 512 -tavuiset %5$s\n"
+"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+"Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  J�rjestelm�\n"
+msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
-msgstr "Vaihtoehtoisten sylinterien m��r�"
+msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
-msgstr "Fyysisten sylinterien m��r�"
+msgstr "Fyysisten sylinterien määrä"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4084,32 +3998,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Laajennettu"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
-msgstr "AIX k�ynnistett�v�"
+msgstr "AIX käynnistettävä"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Alkulatauksen hallinta"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4118,7 +4026,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4133,7 +4040,7 @@ msgstr "OPUS"
 
 #: fdisk/i386_sys_types.c:22
 msgid "Hidden FAT12"
-msgstr "K�tketty FAT12"
+msgstr "Kätketty FAT12"
 
 #: fdisk/i386_sys_types.c:23
 msgid "Compaq diagnostics"
@@ -4141,15 +4048,15 @@ msgstr "Compaq-diagnostiikka"
 
 #: fdisk/i386_sys_types.c:24
 msgid "Hidden FAT16 <32M"
-msgstr "K�tketty FAT16 <32M"
+msgstr "Kätketty FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:25
 msgid "Hidden FAT16"
-msgstr "K�tketty FAT16"
+msgstr "Kätketty FAT16"
 
 #: fdisk/i386_sys_types.c:26
 msgid "Hidden HPFS/NTFS"
-msgstr "K�tketty HPFS/NTFS"
+msgstr "Kätketty HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
@@ -4157,15 +4064,15 @@ msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden W95 FAT32"
-msgstr "K�tketty W95 FAT32"
+msgstr "Kätketty W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
 msgid "Hidden W95 FAT32 (LBA)"
-msgstr "K�tketty W95 FAT32 (LBA)"
+msgstr "Kätketty W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
 msgid "Hidden W95 FAT16 (LBA)"
-msgstr "K�tketty W95 FAT16 (LBA)"
+msgstr "Kätketty W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4211,12 +4118,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4237,8 +4142,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4248,7 +4151,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD tai SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4269,20 +4171,17 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vanha Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix/vanha Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Linux-sivutus"
+msgstr "Linux-sivutus / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "OS/2 k�tketty C:-asema"
+msgstr "OS/2 kätketty C:-asema"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
@@ -4290,12 +4189,11 @@ msgstr "Linux laajennettu"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "NTFS-osioryhm�"
+msgstr "NTFS-osioryhmä"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext3"
+msgstr "Linux teksti"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4305,12 +4203,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad -valmiustila"
@@ -4319,7 +4215,6 @@ msgstr "IBM Thinkpad -valmiustila"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4350,16 +4245,15 @@ msgstr "BSDI sivutus"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
-msgstr "K�tketty Boot Wizard"
+msgstr "Kätketty Boot Wizard"
 
 #: fdisk/i386_sys_types.c:77
 msgid "Solaris boot"
 msgstr "Solaris boot"
 
 #: fdisk/i386_sys_types.c:78
-#, fuzzy
 msgid "Solaris"
-msgstr "Solaris boot"
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4379,207 +4273,192 @@ msgstr "Syrinx"
 
 #: fdisk/i386_sys_types.c:83
 msgid "Non-FS data"
-msgstr "ei-tied.j�rj. data"
+msgstr "ei-tied.järj. data"
 
 #: fdisk/i386_sys_types.c:84
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS vain luku"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
-msgstr "BeOS-tied.j�rj."
+msgstr "BeOS-tied.järj."
 
 #: fdisk/i386_sys_types.c:94
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS-toisio"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirty�\n"
+msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirtyä\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "siirtymisvirhe: haluttiin 0x%08x%08x, saatiin 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "muisti lopussa - luovutetaan\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "virhe luettaessa laitetta %s - sektoria %lu ei voi lukea\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIRHE: sektorilla %lu ei ole msdos-allekirjoitusta\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "virhe kirjoitettaessa laitteelle %s - sektoria %lu ei voi kirjoittaa\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "osion sektoreiden tallennustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "virhe kirjoitettaessa %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "osionpalautustiedoston %s tilaa ei voi lukea\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr "osion palautustiedoston koko on v��r� - ei palauteta\n"
+msgstr "osion palautustiedoston koko on väärä - ei palauteta\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "muisti lopussa?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "osionpalautustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "virhe luettaessa tiedostoa %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "laitetta %s ei voi avata kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "virhe kirjoitettaessa sektoria %lu laitteelle %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Levy %s: geometriaa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Levy %s: kokoa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Varoitus: alku=%lu - t�m� n�ytt�� enemm�n osiolta kuin kokonaiselta\n"
-"levylt�. Sen muokkaaminen fdiskill� on todenn�k�isesti turhaa.\n"
-"[K�yt� --force -valitsinta jos todella haluat tehd� niin]\n"
+"Varoitus: alku=%lu - tämä näyttää enemmän osiolta kuin kokonaiselta\n"
+"levyltä. Sen muokkaaminen fdiskillä on todennäköisesti turhaa.\n"
+"[Käytä --force -valitsinta jos todella haluat tehdä niin]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Varoitus: HDIO_GETGEO kertoo, ett� p�it� on %lu\n"
+msgstr "Varoitus: HDIO_GETGEO kertoo, että päitä on %lu\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Varoitus: HDIO_GETGEO kertoo, ett� sektoreita on %lu\n"
+msgstr "Varoitus: HDIO_GETGEO kertoo, että sektoreita on %lu\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, ett� sylintereit� on %lu\n"
+msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, että sylintereitä on %lu\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Varoitus: ep�todenn�k�inen sektorim��r� (%lu) - yleens� korkeintaan 63\n"
-"T�st� aiheutuu ongelmia kaikkien C/H/S-osoitusta k�ytt�vien ohjelmien "
+"Varoitus: epätodennäköinen sektorimäärä (%lu) - yleensä korkeintaan 63\n"
+"Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
 "kanssa.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 "\n"
-"Levy %s: %lu sylinteri�, %lu p��t�, %lu sektoria/ura\n"
+"Levy %s: %lu sylinteriä, %lu päätä, %lu sektoria/ura\n"
 
-# ensimm�inen %s on "start" tai "end", joita ei voi suomentaa
-# bugiraportti t�ytyy l�hett�� joskus
-#: fdisk/sfdisk.c:608
+# ensimmäinen %s on "start" tai "end", joita ei voi suomentaa
+# bugiraportti täytyy lähettää joskus
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "Osion %2$s %1$s p��arvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
+msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4587,7 +4466,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sektoriarvo on mahdoton: %3$lu (tulee olla 1-%4$lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4595,7 +4474,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sylinteriarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4604,631 +4483,625 @@ msgstr ""
 "Id  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Luetaan osiotaulu uudelleen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Osiotaulun uudelleenlukukomento ep�onnistui\n"
-"K�ynnist� j�rjestelm� uudelleen nyt, ennen mkfs:n k�ytt��\n"
+"Osiotaulun uudelleenlukukomento epäonnistui\n"
+"Käynnistä järjestelmä uudelleen nyt, ennen mkfs:n käyttöä\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Virhe suljettaessa %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: osiota ei ole\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
-msgstr "tunnistamaton muoto - k�ytet��n sektoreita\n"
+msgstr "tunnistamaton muoto - käytetään sektoreita\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s:n osiotaulu\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "toteuttamaton muoto - k�ytet��n %s\n"
+msgstr "toteuttamaton muoto - käytetään %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksik�t = sylinterit %lu-tavuisia, lohkot 1024-tavuisia, lasketaan %d "
+"Yksiköt = sylinterit %lu-tavuisia, lohkot 1024-tavuisia, lasketaan %d "
 "alkaen\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr "   Laite K�ynn Alku      Loppu #syl     #lohkot   Id  J�rjestelm�\n"
+msgstr "   Laite Käynn Alku      Loppu #syl     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksik�t = 512-tavuiset sektorit, alkaen kohdasta %d\n"
+"Yksiköt = 512-tavuiset sektorit, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Laite  K�ynn   Alku        Loppu #sektorit Id  J�rjestelm�\n"
+msgstr "   Laite  Käynn   Alku        Loppu #sektorit Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksik�t = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
+"Yksiköt = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Laite  K�ynn  Alku        Loppu  #lohkot   Id  J�rjestelm�\n"
+msgstr "   Laite  Käynn  Alku        Loppu  #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Yksik�t = 1048576-tavuiset megatavut, 1024-tavuiset lohkot, alkaen kohdasta %"
+"Yksiköt = 1048576-tavuiset megatavut, 1024-tavuiset lohkot, alkaen kohdasta %"
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
-msgstr "   Laite K�ynn Alku    Loppu  Mt     #lohkot   Id  J�rjestelm�\n"
+msgstr "   Laite Käynn Alku    Loppu  Mt     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) l�ytyi (%ld,%ld,%ld)\n"
+msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) l�ytyi (%ld,%ld,%ld)\n"
+msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr "osio loppuu sylinterill� %ld, joka on levyn lopun j�lkeen\n"
+msgstr "osio loppuu sylinterillä %ld, joka on levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
-msgstr "Osioita ei l�ytynyt\n"
+msgstr "Osioita ei löytynyt\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Varoitus: Osiotaulu n�ytt�� silt�, ett� se on tehty\n"
+"Varoitus: Osiotaulu näyttää siltä, että se on tehty\n"
 "  arvoille C/H/S=*/%ld/%ld (ei %ld/%ld/%ld).\n"
-"T�ss� listauksessa k�ytet��n tuota geometriaa.\n"
+"Tässä listauksessa käytetään tuota geometriaa.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "osiotaulua ei ole.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "outoa, vain %d osiota m��ritelty.\n"
+msgstr "outoa, vain %d osiota määritelty.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "Varoitus: osion %s koko on 0, mutta sit� ei ole merkitty tyhj�ksi\n"
+msgstr "Varoitus: osion %s koko on 0, mutta sitä ei ole merkitty tyhjäksi\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Varoitus: osion %s koko on 0 ja se on merkitty k�ynnistett�v�ksi\n"
+msgstr "Varoitus: osion %s koko on 0 ja se on merkitty käynnistettäväksi\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varoitus: osion %s koko on 0 ja alkukohta ei ole nolla\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varoitus: osio %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "ei sis�lly osioon %s\n"
+msgstr "ei sisälly osioon %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varoitus: osiot %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
-msgstr "ja %s ovat p��llekk�iset\n"
+msgstr "ja %s ovat päällekkäiset\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Varoitus: osio %s sis�lt�� osan osiotaulusta (sektori %lu), ja se tulee\n"
-"tuhoutumaan kun osiota k�ytet��n\n"
+"Varoitus: osio %s sisältää osan osiotaulusta (sektori %lu), ja se tulee\n"
+"tuhoutumaan kun osiota käytetään\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varoitus: osio %s alkaa sektorilta 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varoitus: osio %s jatkuu levyn lopun yli\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
-"Vain yksi ensi�osio voi olla laajennettu\n"
-" (t�m� ei tosin ole ongelma Linuxissa)\n"
+"Vain yksi ensiöosio voi olla laajennettu\n"
+" (tämä ei tosin ole ongelma Linuxissa)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei ala sylinterin rajalta\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei lopu sylinterin rajalle\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Varoitus: useampi kuin yksi ensi�osio on merkitty k�ynnistett�v�ksi "
+"Varoitus: useampi kuin yksi ensiöosio on merkitty käynnistettäväksi "
 "(aktiiviseksi)\n"
-"Se ei haittaa LILOa, mutta DOS MBR ei k�ynnist� t�lt� levylt�.\n"
+"Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä levyltä.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Varoitus: yleens� vain ensi�osiolta voi k�ynnist��\n"
-"LILO ei v�lit� \"k�ynnistett�v�\"-lipusta.\n"
+"Varoitus: yleensä vain ensiöosiolta voi käynnistää\n"
+"LILO ei välitä \"käynnistettävä\"-lipusta.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Varoitus: yht��n ensi�osiota ei ole merkitty k�ynnistett�v�ksi\n"
-"(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei k�ynnist� t�lt� "
-"levylt�.\n"
+"Varoitus: yhtään ensiöosiota ei ole merkitty käynnistettäväksi\n"
+"(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
+"levyltä.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "alun"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) l�ytyi (%ld,%ld,%ld)\n"
+msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "lopun"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) l�ytyi (%ld,%ld,%ld)\n"
+"osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
-msgstr "osio %s loppuu sylinterill� %ld, levyn lopun j�lkeen\n"
+msgstr "osio %s loppuu sylinterillä %ld, levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 "Varoitus: laajennetun osion alkua siirretty kohdasta %ld kohtaan %ld\n"
-"(Vain listaustarkoituksiin. �l� muuta sen sis�lt��.)\n"
+"(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 "Varoitus: laajennetun osion alku ei ole sylinterin rajalla.\n"
-"DOS ja Linux tulkitsevat sis�ll�n eri tavoin.\n"
+"DOS ja Linux tulkitsevat sisällön eri tavoin.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr "liian monta osiota - ei huomioida numeron (%d) j�lkeisi�\n"
+msgstr "liian monta osiota - ei huomioida numeron (%d) jälkeisiä\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "osiopuu?\n"
 
 # huono suomennos
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "havaittiin Disk Manager - sit� ei voi k�sitell�\n"
+msgstr "havaittiin Disk Manager - sitä ei voi käsitellä\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
-msgstr "DM6-allekirjoitus l�ytyi - luovutetaan\n"
+msgstr "DM6-allekirjoitus löytyi - luovutetaan\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "outoa..., laajennettu osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "outoa..., BSD-osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: tunnistamaton osio\n"
+msgstr " %s: tunnistamaton osiotaulun tyyppi\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
-msgstr "valitsin -n oli annettu: Mit��n ei muutettu\n"
+msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Vanhojen sektoreiden tallennus ep�onnistui - keskeytet��n\n"
+msgstr "Vanhojen sektoreiden tallennus epäonnistui - keskeytetään\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Osion kirjoitus ep�onnistui laitteelle %s\n"
+msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
-msgstr "liian pitk� tai ep�t�ydellinen sy�terivi - lopetetaan\n"
+msgstr "liian pitkä tai epätäydellinen syöterivi - lopetetaan\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "sy�tevirhe: kent�n %s j�lkeen odotetaan l�ytyv�n \"=\"\n"
+msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän \"=\"\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "sy�tevirhe: odottamaton merkki %c kent�n %s j�lkeen\n"
+msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "tunnistamaton sy�te: %s\n"
+msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
-msgstr "roskaa numeron per�ss�\n"
+msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
-msgstr "ymp�r�iv�� laajennettua osiota ei voi rakentaa\n"
+msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
-msgstr "liian monta sy�tekentt��\n"
+msgstr "liian monta syötekenttää\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
-msgstr "Ei enemp�� tilaa\n"
+msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Varoitus: annettu koko (%lu) ylitt�� suurimman sallitun koon (%lu)\n"
+msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
-msgstr "Varoitus: tyhj� osio\n"
+msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "tunnistamaton \"k�ynnistett�v�\"-lippu - valitse - tai *\n"
+msgstr "tunnistamaton \"käynnistettävä\"-lippu - valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
-msgstr "osittainen c,h,s-m��ritys?\n"
+msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
-msgstr "virheellinen sy�te\n"
+msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Sy�te seuraavassa muodossa: puuttuvat kent�t saavat oletusarvon.\n"
-"<alku> <koko> <tyyppi [E,S,L,X,hex]> <k�ynnistett�v� [-,*]> <c,h,s> <c,h,s>\n"
-"Yleens� riitt�� <alku> ja <koko> (ja ehk� <tyyppi>).\n"
+"Syöte seuraavassa muodossa: puuttuvat kentät saavat oletusarvon.\n"
+"<alku> <koko> <tyyppi [E,S,L,X,hex]> <käynnistettävä [-,*]> <c,h,s> <c,h,s>\n"
+"Yleensä riittää <alku> ja <koko> (ja ehkä <tyyppi>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versio"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "K�ytt�: %s [valitsimet] laite ...\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
-msgstr "hy�dylliset valitsimet:"
+msgstr "hyödylliset valitsimet:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr "    -s [tai --show-size]: n�yt� osion koko"
+msgstr "    -s [tai --show-size]: näytä osion koko"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr "    -c [tai --id:        n�yt� tai muuta osio-id"
+msgstr "    -c [tai --id:        näytä tai muuta osio-id"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [tai --list]:     listaa kaikkien laitteiden osiot"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [tai --dump]:     sama kuin edell�, muoto sopiva sy�tteeksi"
+msgstr "    -d [tai --dump]:     sama kuin edellä, muoto sopiva syötteeksi"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
-"    -i [tai --increment]:numeroi sylinterit, ym. alkaen 1:st�, ei 0:sta"
+"    -i [tai --increment]:numeroi sylinterit, ym. alkaen 1:stä, ei 0:sta"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
-"    -uS, -uB, -uC, -uM:  k�yt� yksikk�in� sektoreita/lohkoja/sylintereit�/Mt"
+"    -uS, -uB, -uC, -uM:  käytä yksikköinä sektoreita/lohkoja/sylintereitä/Mt"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [tai --list-types]:listaa tunnetut osiotyypit"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa v�h�n tilaa"
+"    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa vähän tilaa"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [tai --re-read]:  k�ske ytimen lukea osiotaulu uudelleen"
+msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                muuta vain osiota numero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                 �l� kirjoita levylle oikeasti"
+msgstr "    -n :                 älä kirjoita levylle oikeasti"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O tiedosto :        tallenna ylikirjoitettavat sektori tiedostoon"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
-msgstr "    -I tiedosto :        palauta n�m� sektorit"
+msgstr "    -I tiedosto :        palauta nämä sektorit"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
-msgstr "    -v [tai --version]:  n�yt� versio"
+msgstr "    -v [tai --version]:  näytä versio"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
-msgstr "    -? [tai --help]:     n�yt� t�m� viesti"
+msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "vaaralliset valitsimet:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr "    -g [tai --show-geometry]: n�yt� ytimen k�sitys geometriasta"
+msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "    -g [tai --show-geometry]: n�yt� ytimen k�sitys geometriasta"
+msgstr "    -G [tai --show-pt-geometry]: näytä osiotausta päätelty geometria"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [tai --show-extended]: listaa my�s laajennetut osiot tulosteessa\n"
-"                             tai odota sy�tteest� niiden kahvoja"
+"    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
+"                             tai odota syötteestä niiden kahvoja"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
-"    -L  [tai --Linux]:     �l� huomauta Linuxissa merkityksett�mist� asioista"
+"    -L  [tai --Linux]:     älä huomauta Linuxissa merkityksettömistä asioista"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [tai --quiet]:     vaienna varoitusviestit"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
-msgstr "    Voit ohittaa tunnistetun geometrian k�ytt�m�ll�:"
+msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr "    -C# [tai --cylinders #]:aseta k�ytett�v� sylinterien m��r�"
+msgstr "    -C# [tai --cylinders #]:aseta käytettävä sylinterien määrä"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
-msgstr "    -h# [tai --heads #]:    aseta k�ytett�v� p�iden m��r�"
+msgstr "    -h# [tai --heads #]:    aseta käytettävä päiden määrä"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr "    -S# [tai --sectors #]:  aseta k�ytett�v� sektorien m��r�"
+msgstr "    -S# [tai --sectors #]:  aseta käytettävä sektorien määrä"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Kaikki tarkistukset voi ohittaa valitsimella:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [tai --force]:     tee mit� k�sken, vaikka se olisi tyhm��"
+msgstr "    -f  [tai --force]:     tee mitä käsken, vaikka se olisi tyhmää"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "K�ytt�:"
+msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s laite\t\t listaa laitteella olevat aktiiviset osiot\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s laite n1 n2 ... aktivoi osiot n1 ..., inaktivoi loput\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An laite\t aktivoi osio n, poista muiden aktivointi\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "yhteens�: %d lohkoa\n"
+msgstr "yhteensä: %llu lohkoa\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "k�ytt�: sfdisk --print-id laite osionumero\n"
+msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "k�ytt�: sfdisk --change-id laite osionumero Id\n"
+msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "k�ytt�: sfdisk --id laite osionumero [Id]\n"
+msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "vain yhden laitteen voi antaa (paitsi valitsimella -l tai -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s: %ld sylinteri�, %ld p��t�, %ld sektoria/ura\n"
+msgstr "%s: %ld sylinteriä, %ld päätä, %ld sektoria/ura\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "laitteen %s kokoa ei voi hakea"
+msgstr "Laitteen %s kokoa ei voida hakea\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "virheellinen aktiivinen tavu: 0x80:n asemesta 0x%x\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5236,44 +5109,44 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
-"Aktiivisia ensi�osioita on %d kappaletta. T�m� ei haittaa LILOa, mutta\n"
-"DOS MBR k�ynnist�� vain levylt�, jolla on tasan yksi aktiivinen osio.\n"
+"Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
+"DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "osiolla %s id on %x eik� osiota ole k�tketty\n"
+msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
-msgstr "Levy on t�ll� hetkell� k�yt�ss�.\n"
+msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Vakava virhe: laitetta %s ei l�ydy\n"
+msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Tarkistetaan, ett� kukaan ei k�yt� levy� juuri nyt...\n"
+msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5281,75 +5154,75 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"T�m� levy on t�ll� hetkell� k�yt�ss� - sen uudelleenosiointi on\n"
-"todenn�k�isesti huono ajatus. Irrota kaikki levyn tiedostoj�rjestelm�t\n"
-"(komento umount) ja kaikki levyll� olevat sivutusosiot (komento swapoff).\n"
-"K�yt� valitsinta --no-reread t�m�n testin ohittamiseen.\n"
+"Tämä levy on tällä hetkellä käytössä - sen uudelleenosiointi on\n"
+"todennäköisesti huono ajatus. Irrota kaikki levyn tiedostojärjestelmät\n"
+"(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
+"Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr "K�yt� --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
+msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "Osiota %d ei ole olemassa, sit� ei voi muuttaa\n"
+msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
-"En pid� n�ist� osioista - mit��n ei muutettu.\n"
-"(Jos todella haluat t�t�, k�yt� valitsinta --force.)\n"
+"En pidä näistä osioista - mitään ei muutettu.\n"
+"(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
-msgstr "En pid� t�st� - kannattaa todenn�k�isesti vastata \"No\"\n"
+msgstr "En pidä tästä - kannattaa todennäköisesti vastata \"No\"\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
-msgstr "Oletko tyytyv�inen t�h�n? [ynq] "
+msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
-msgstr "Haluatko kirjoittaa t�m�n levylle? [ynq] "
+msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk: ennenaikainen sy�tteen loppu\n"
+"sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
-msgstr "Lopetetaan - mit��n ei muutettu\n"
+msgstr "Lopetetaan - mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5358,32 +5231,32 @@ msgstr ""
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Jos DOS-osio, esim. /dev/foo7, luotiin tai sit� muutettiin, k�yt� dd(1):t�\n"
-"nollataksesi ensimm�iset 512 tavua:\n"
+"Jos DOS-osio, esim. /dev/foo7, luotiin tai sitä muutettiin, käytä dd(1):tä\n"
+"nollataksesi ensimmäiset 512 tavua:\n"
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Katso fdisk(8).)\n"
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Komento \"getopt --help\" antaa lis�� tietoa.\n"
+msgstr "Komento \"getopt --help\" antaa lisää tietoa.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
-msgstr "tyhj� pitk� valitsin argumentin -l tai --long j�lkeen"
+msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr "tuntematon kuori argumentin -s tai --shell j�lkeen"
+msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "K�ytt�: getopt valitsinmerkkijono parametrit\n"
+msgstr "Käyttö: getopt valitsinmerkkijono parametrit\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
@@ -5403,22 +5276,22 @@ msgstr "              parametrit\n"
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
-"  -a, --alternative            Salli pitkien valitsimien alkaminen yhdell� -:"
+"  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:"
 "lla\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   T�m� pieni k�ytt�opas\n"
+msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr "  -l, --longoptions=valitsimet Pitk�t tunnistettavat valitsimet\n"
+msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
 
 #: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
-"  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydess�\n"
+"  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
@@ -5434,7 +5307,7 @@ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr "  -s, --shell=kuori            Aseta kuoren lainausk�yt�nn�t\n"
+msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
@@ -5442,11 +5315,11 @@ msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unquote                Ei lainausmerkkej� tulosteeseen\n"
+msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr "  -V, --version                N�yt� versiotiedot\n"
+msgstr "  -V, --version                Näytä versiotiedot\n"
 
 #: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
@@ -5459,195 +5332,195 @@ msgstr "getopt (parannettu) 1.1.3)\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr "sis�inen virhe, ota yhteytt� tekij��n."
+msgstr "sisäinen virhe, ota yhteyttä tekijään."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
-msgstr "k�ynnistetty MILOsta\n"
+msgstr "käynnistetty MILOsta\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD -kello\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "kelloportiksi asetettu 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: atominen \"%s\" ep�onnistui 1000 iteraatiolle!"
+msgstr "%s: atominen \"%s\" epäonnistui 1000 iteraatiolle!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ei voi avata laitetta /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "En saanut k�ytt�oikeutta, koska en yritt�nyt.\n"
+msgstr "En saanut käyttöoikeutta, koska en yrittänyt.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr "%s ei saa k�ytt�oikeutta I/O-porttiin:  iopl(3)-kutsu ep�onnistui.\n"
+msgstr "%s ei saa käyttöoikeutta I/O-porttiin:  iopl(3)-kutsu epäonnistui.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
-msgstr "Tarvitset todenn�k�isesti p��k�ytt�j�n oikeudet.\n"
+msgstr "Tarvitset todennäköisesti pääkäyttäjän oikeudet.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Oletetaan laitteistokellon olevan %sajassa.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC-"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "paikallisessa "
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varoitus: tunnistamaton kolmas rivi adjtime-tiedostossa\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Odotetaan: \"UTC\", \"LOCAL\" tai ei mit��n.)\n"
+msgstr "(Odotetaan: \"UTC\", \"LOCAL\" tai ei mitään.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Viimeinen siirtym�s��t� tehty %ld sekuntia vuoden 1969 j�lkeen\n"
+msgstr "Viimeinen siirtymäsäätö tehty %ld sekuntia vuoden 1969 jälkeen\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Viimeinen kalibrointi tehty %ld sekuntia vuoden 1969 j�lkeen\n"
+msgstr "Viimeinen kalibrointi tehty %ld sekuntia vuoden 1969 jälkeen\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Laitteistokello on %sajassa\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "tuntemattomassa "
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
-msgstr "Odotetaan kellon tikityst�...\n"
+msgstr "Odotetaan kellon tikitystä...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...saatiin tikitys\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
-"Virheellisi� arvoja laitteistokellossa: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6"
+"Virheellisiä arvoja laitteistokellossa: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6"
 "$.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Laitteistokellon aika: %3$.2d.%2$.2d.%1$4d %4$.2d:%5$.2d:%6$.2d = %7$ld "
 "sekuntia vuodesta 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr ""
 "Laitteistokellosta luettu aika: %3$.2d.%2$.2d.%1$4d %4$02d:%5$02d:%6$02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Asetetaan laitteistokello aikaan %.2d:%.2d:%.2d = %ld sekuntia vuodesta "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "Kellonaikaa ei muutettu - pelkk� testi.\n"
+msgstr "Kellonaikaa ei muutettu - pelkkä testi.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 "Viiteajankohdasta on kulunut %.6f sekuntia.\n"
-"Odotetaan seuraavaa t�ytt� sekuntia.\n"
+"Odotetaan seuraavaa täyttä sekuntia.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"Laitteistokellon rekistereiss� on arvoja, jotka ovat joko kelvottomia (esim. "
-"kuukauden 50:s p�iv�) tai suurempia kuin pystymme k�sittelem��n (esim. vuosi "
+"Laitteistokellon rekistereissä on arvoja, jotka ovat joko kelvottomia (esim. "
+"kuukauden 50:s päivä) tai suurempia kuin pystymme käsittelemään (esim. vuosi "
 "2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekuntia\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
-msgstr "liian pitk� --date -argumentti\n"
+msgstr "liian pitkä --date -argumentti\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Valitsimelle --date annettu arvo ei ole kelvollinen p�iv�ys.\n"
-"Se sis�lt�� lainausmerkkej�.\n"
+"Valitsimelle --date annettu arvo ei ole kelvollinen päiväys.\n"
+"Se sisältää lainausmerkkejä.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "K�ynnistet��n \"date\"-komento: %s\n"
+msgstr "Käynnistetään \"date\"-komento: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "Komentoa \"date\" ei voitu ajaa /bin/sh-kuoressa. popen() ep�onnistui"
+msgstr "Komentoa \"date\" ei voitu ajaa /bin/sh-kuoressa. popen() epäonnistui"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date-komennon vastaus = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5656,13 +5529,13 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"%sin k�ynnist�m� \"date\"-komento palautti odottamattomia tuloksia.\n"
+"%sin käynnistämä \"date\"-komento palautti odottamattomia tuloksia.\n"
 "Komento oli:\n"
 "  %s\n"
 "Vastaus oli:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5672,111 +5545,111 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"%sin k�ynnist�m� \"date\"-komento palautti muuta kuin kokonaisluvun odotetun "
+"%sin käynnistämä \"date\"-komento palautti muuta kuin kokonaisluvun odotetun "
 "muunnetun aika-arvon paikalla.\n"
 "Komento oli:\n"
 "  %s\n"
 "Vastaus oli:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr "p�iv�ysmerkkijono %s vastaa %ld sekuntia vuodesta 1969.\n"
+msgstr "päiväysmerkkijono %s vastaa %ld sekuntia vuodesta 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"Laitteistokellon aika ei ole kelvollinen, joten j�rjestelm�n aikaa ei voida "
+"Laitteistokellon aika ei ole kelvollinen, joten järjestelmän aikaa ei voida "
 "asettaa sen perusteella.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Kutsutaan settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
-msgstr "J�rjestelm�kelloa ei aseteta, koska k�ytet��n testitilaa.\n"
+msgstr "Järjestelmäkelloa ei aseteta, koska käytetään testitilaa.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
-msgstr "Vain p��k�ytt�j� voi asettaa j�rjestelm�n kellon.\n"
+msgstr "Vain pääkäyttäjä voi asettaa järjestelmän kellon.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
-msgstr "settimeofday() ep�onnistui"
+msgstr "settimeofday() epäonnistui"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"Ei s��det� siirtym�kerrointa, koska laitteistokellossa oli edellisell� "
+"Ei säädetä siirtymäkerrointa, koska laitteistokellossa oli edellisellä "
 "kerralla roskaa.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"Ei s��det� siirtym�kerrointa, koska edellinen kalibrointiaika on nolla,\n"
+"Ei säädetä siirtymäkerrointa, koska edellinen kalibrointiaika on nolla,\n"
 "joten historia on virheellinen ja kalibroinnin uudelleen aloitus on\n"
 "tarpeellista.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"Ei s��det� siirtym�kerrointa, koska edellisest� kalibroinnista on alle "
+"Ei säädetä siirtymäkerrointa, koska edellisestä kalibroinnista on alle "
 "vuorokausi.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
 "of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Kellon siirtym� oli %.1f sekuntia viimeisten %d sekunnin aikana, %f sekuntia/"
-"vrk -siirtym�kertoimesta\n"
-"huolimatta. S��det��n siirtym�kerrointa %f sekunnilla/vrk\n"
+"Kellon siirtymä oli %.1f sekuntia viimeisten %d sekunnin aikana, %f sekuntia/"
+"vrk -siirtymäkertoimesta\n"
+"huolimatta. Säädetään siirtymäkerrointa %f sekunnilla/vrk\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Aikaa edellisest� s��d�st� on kulunut %d sekuntia\n"
+msgstr "Aikaa edellisestä säädöstä on kulunut %d sekuntia\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr "On lis�tt�v� %d sekuntia ja viitattava aikaan %.6f sekuntia sitten\n"
+msgstr "On lisättävä %d sekuntia ja viitattava aikaan %.6f sekuntia sitten\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Ei p�ivitet� adjtime-tiedostoa, koska k�ytet��n testaustilaa.\n"
+msgstr "Ei päivitetä adjtime-tiedostoa, koska käytetään testaustilaa.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5785,38 +5658,38 @@ msgstr ""
 "Tiedostoon %s olisi kirjoitettu seuraavaa:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Siirtym�ns��t�parametreja ei p�ivitetty.\n"
+msgstr "Siirtymänsäätöparametreja ei päivitetty.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "Laitteistokellon aika ei ole kelvollinen, joten sit� ei voi s��t��.\n"
+msgstr "Laitteistokellon aika ei ole kelvollinen, joten sitä ei voi säätää.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Tarvittava muutos on alle sekunti, joten ei aseteta kelloa.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "K�ytet��n rajapintaa %s.\n"
+msgstr "Käytetään rajapintaa %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
-msgstr "K�ytt�kelpoista kellorajapintaa ei l�ytynyt.\n"
+msgstr "Käyttökelpoista kellorajapintaa ei löytynyt.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
-msgstr "J�rjestelm�kellon asetus ei onnistu.\n"
+msgstr "Järjestelmäkellon asetus ei onnistu.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5824,38 +5697,43 @@ msgid ""
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"Ydin s�ilytt�� laitteistokellon epoch-arvoa vain Alpha-koneilla.\n"
-"T�m� hwclock on k��nnetty muulle koneelle kuin Alphalle\n"
-"(ja todenn�k�isesti sit� ei ajeta Alphassa nyt). Toimintoa ei suoritettu.\n"
+"Ydin säilyttää laitteistokellon epoch-arvoa vain Alpha-koneilla.\n"
+"Tämä hwclock on käännetty muulle koneelle kuin Alphalle\n"
+"(ja todennäköisesti sitä ei ajeta Alphassa nyt). Toimintoa ei suoritettu.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "Ytimelt� ei saada epoch-arvoa.\n"
+msgstr "Ytimeltä ei saada epoch-arvoa.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ydin olettaa epoch-arvoksi %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
-msgstr "Epoch arvon asettamiseksi on k�ytett�v� \"epoch\"-valitsinta.\n"
+msgstr "Epoch arvon asettamiseksi on käytettävä \"epoch\"-valitsinta.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei aseteta epoch-arvoksi %d - vain kokeilu.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Ytimen epoch-arvoa ei voi asettaa.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s paketista %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5888,34 +5766,34 @@ msgid ""
 msgstr ""
 "hwclock - lukee ja asettaa laitteistokellon (RTC)\n"
 "\n"
-"K�ytt�: hwclock [toiminto] [valitsimet...]\n"
+"Käyttö: hwclock [toiminto] [valitsimet...]\n"
 "\n"
 "Toiminnot:\n"
-"  --help        n�ytt�� t�m�n ohjeen\n"
-"  --show        lukee laitteistokellon ja n�ytt�� tulokset\n"
-"  --set         asettaa laitteistokellon --date:lla m��r�ttyyn aikaan\n"
-"  --hctosys     asettaa j�rjestelm�kellon ajan laitteistokellon mukaan\n"
-"  --systohc     asettaa laitteistokellon nykyiseen j�rjestelm�n aikaan\n"
-"  --adjust      s��t�� laitteistokellon huomioimaan systemaattisen "
-"siirtym�n\n"
-"                edellisen asetuksen tai s��d�n j�lkeen\n"
-"  --getepoch    n�ytt�� ytimen epoch-arvon laitteistokellolle\n"
+"  --help        näyttää tämän ohjeen\n"
+"  --show        lukee laitteistokellon ja näyttää tulokset\n"
+"  --set         asettaa laitteistokellon --date:lla määrättyyn aikaan\n"
+"  --hctosys     asettaa järjestelmäkellon ajan laitteistokellon mukaan\n"
+"  --systohc     asettaa laitteistokellon nykyiseen järjestelmän aikaan\n"
+"  --adjust      säätää laitteistokellon huomioimaan systemaattisen "
+"siirtymän\n"
+"                edellisen asetuksen tai säädön jälkeen\n"
+"  --getepoch    näyttää ytimen epoch-arvon laitteistokellolle\n"
 "  --setepoch    asettaa ytimen epoch-arvon laitteistokellolle --epoch:illa\n"
-"                m��r�ttyyn arvoon\n"
-"  --version     n�ytt�� hwclockin versionumeron vakiotulosteeseen\n"
+"                määrättyyn arvoon\n"
+"  --version     näyttää hwclockin versionumeron vakiotulosteeseen\n"
 "\n"
 "Valitsimet: \n"
-"  --utc         laitteistokello on kansainv�lisess� ajassa (UTC)\n"
+"  --utc         laitteistokello on kansainvälisessä ajassa (UTC)\n"
 "  --localtime   laitteistokello on paikallisesssa ajassa\n"
-"  --directisa   k�yt� ISA-v�yl�� suoraan, ei laitteen %s kautta\n"
+"  --directisa   käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
 "  --badyear     ei huomioida laitteistokellon vuotta, koska BIOS on rikki\n"
 "  --date        aika, johon laitteistokello asetetaan\n"
 "  --epoch=year  vuosi, joka on laitteistokellon\n"
 "                epoch-arvon nollakohta\n"
-"  --noadjfile   ei k�ytet� tiedostoa /etc/adjtime. Vaatii joko valitsimen\n"
-"                --utc tai --localtime k�ytt�mist�\n"
+"  --noadjfile   ei käytetä tiedostoa /etc/adjtime. Vaatii joko valitsimen\n"
+"                --utc tai --localtime käyttämistä\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5924,80 +5802,80 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                kertoo hwclockille Alphan tyypin (katso hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ottaa vain valitsimia argumentteina. Annoit %d muuta.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Monta toimintoa m��ritelty.\n"
+"Monta toimintoa määritelty.\n"
 "Vain yksi toiminto voidaan suorittaa kerrallaan.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
-"%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevia. K�ytit "
+"%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevia. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevia. K�ytit "
+"%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevia. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
-"%s: Valitsimen --noadjfile kanssa on k�ytett�v� joko valitsinta --utc tai --"
+"%s: Valitsimen --noadjfile kanssa on käytettävä joko valitsinta --utc tai --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Ei k�ytt�kelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
+msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Valitan, vain p��k�ytt�j� voi s��t�� laitteistokelloa.\n"
+msgstr "Valitan, vain pääkäyttäjä voi säätää laitteistokelloa.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Valitan, vain p��k�ytt�j� voi s��t�� j�rjestelm�kelloa.\n"
+msgstr "Valitan, vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Valitan, vain p��k�ytt�j� voi s��t�� laitteistokellon epoch-arvoa ytimess�.\n"
+"Valitan, vain pääkäyttäjä voi säätää laitteistokellon epoch-arvoa ytimessä.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr "Laitteistokelloa ei pystyt� k�ytt�m��n mill��n tunnetulla tavalla.\n"
+msgstr "Laitteistokelloa ei pystytä käyttämään millään tunnetulla tavalla.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-"K�yt� --debug -valitsinta n�hd�ksesi yksityiskohdat k�ytt�tavan etsinn�st�.\n"
+"Käytä --debug -valitsinta nähdäksesi yksityiskohdat käyttötavan etsinnästä.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -6006,7 +5884,7 @@ msgstr "Odotetaan silmukassa KDGHWCLK-ajan muuttumista\n"
 
 #: hwclock/kd.c:58
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "ajan lukeva KDGHWCLK-ioctl ep�onnistui"
+msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui"
 
 #: hwclock/kd.c:79 hwclock/rtc.c:188
 #, c-format
@@ -6015,7 +5893,7 @@ msgstr "Aikakatkaisu odotettaessa ajan muutosta.\n"
 
 #: hwclock/kd.c:83
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "ajan lukeva KDGHWCLK-ioctl ep�onnistui silmukassa"
+msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui silmukassa"
 
 #: hwclock/kd.c:105
 #, c-format
@@ -6024,26 +5902,25 @@ msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
 #: hwclock/kd.c:141
 msgid "ioctl KDSHWCLK failed"
-msgstr "ioctl KDSHWCLK ep�onnistui"
+msgstr "ioctl KDSHWCLK epäonnistui"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Laitetta /dev/tty1 tai /dev/vc/1 ei voi avata"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
-msgstr "KDGHWCLK-ioctl ep�onnistui"
+msgstr "KDGHWCLK-ioctl epäonnistui"
 
 #: hwclock/rtc.c:116 hwclock/rtc.c:209
 #, c-format
 msgid "open() of %s failed"
-msgstr "tiedoston %s avaaminen ep�onnistui"
+msgstr "tiedoston %s avaaminen epäonnistui"
 
 #: hwclock/rtc.c:150
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr "aikaa lukeva ioctl() laitteelle %s ep�onnistui.\n"
+msgstr "aikaa lukeva ioctl() laitteelle %s epäonnistui.\n"
 
 #: hwclock/rtc.c:172
 #, c-format
@@ -6058,34 +5935,35 @@ msgstr "laitteella %s ei ole keskeytysfunktioita. "
 #: hwclock/rtc.c:238
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr "kellon tikityst� odottava luku laitteelle %s ep�onnistui"
+msgstr "kellon tikitystä odottava read()-kutsu laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr "kellon tikityst� odottava luku laitteelle %s ep�onnistui"
+msgstr "kellon tikitystä odottava select()-kutsu laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
-msgstr "kellon tikityst� odottava luku laitteelle %s ep�onnistui"
+msgstr ""
+"kellon tikitystä odottava select()-kutsu laitteelle %s aikakatkaistiin\n"
 
 #: hwclock/rtc.c:268
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr "p�ivityskeskeytykset lopettava ioctl() laitteelle %s ep�onnistui"
+msgstr "päivityskeskeytykset lopettava ioctl() laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"p�ivityskeskeytykset aloittava ioctl() laitteelle %s ep�onnistui "
+"päivityskeskeytykset aloittava ioctl() laitteelle %s epäonnistui "
 "odottamattomasti"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "ajan asettava ioctl() laitteelle %s ep�onnistui.\n"
+msgstr "ajan asettava ioctl() laitteelle %s epäonnistui.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
@@ -6095,7 +5973,7 @@ msgstr "ioctl(%s) onnistui.\n"
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Tiedoston %s avaaminen ep�onnistui"
+msgstr "Tiedoston %s avaaminen epäonnistui"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6104,8 +5982,8 @@ msgid ""
 "device driver via the device special file %s.  This file does not exist on "
 "this system.\n"
 msgstr ""
-"Ytimen epoch-arvon muuttamiseksi on k�ytett�v� Linuxin \"rtc\"-laiteajuria "
-"laitetiedoston %s kautta. T�ss� j�rjestelm�ss� ei ole kyseist� tiedostoa.\n"
+"Ytimen epoch-arvon muuttamiseksi on käytettävä Linuxin \"rtc\"-laiteajuria "
+"laitetiedoston %s kautta. Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -6115,20 +5993,17 @@ msgstr "Laitetta %s ei voi avata"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s ep�onnistui"
+msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s epäonnistui"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:ll� RTC_EPOCH_READ.\n"
+msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:llä RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyynt� oli %ld\n"
+msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyyntö oli %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
@@ -6139,18 +6014,17 @@ msgstr "asetetaan epoch-arvoksi %ld, ioctl RTC_EPOCH_SET laitteelle %s.\n"
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:�� RTC_EPOCH_SET.\n"
+msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:ää RTC_EPOCH_SET.\n"
 
 #: hwclock/rtc.c:447
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s ep�onnistui"
+msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
 msgstr "kutsutaan open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "kutsutaan termio_init\n"
@@ -6159,7 +6033,6 @@ msgstr "kutsutaan termio_init\n"
 msgid "writing init string\n"
 msgstr "kirjoitetaan alustusmerkkijonoa\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "ennen autobaudia\n"
@@ -6173,15 +6046,14 @@ msgstr "odotetaan cr-lf\n"
 msgid "read %c\n"
 msgstr "luettiin %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr "luetaan k�ytt�j�tunnus\n"
+msgstr "luetaan käyttäjätunnus\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: ohjelmaa %s ei voi k�ynnist��: %m"
+msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
@@ -6194,7 +6066,7 @@ msgstr "virheellinen aikakatkaisuarvo: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
-msgstr "getopt-silmukan j�lkeen\n"
+msgstr "getopt-silmukan jälkeen\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
@@ -6220,14 +6092,13 @@ msgstr "poistutaan kohdasta parsespeeds\n"
 #: login-utils/agetty.c:649
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr "/dev: chdir() ep�onnistui: %m"
+msgstr "/dev: chdir() epäonnistui: %m"
 
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ei ole merkkilaite"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6235,19 +6106,17 @@ msgstr "open(2)\n"
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s: ei voi avata vakiosy�tteen�: %m"
+msgstr "/dev/%s: ei voi avata vakiosyötteenä: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: ei ole avoin lukua/kirjoitusta varten"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "kopioidaan tiedostokahva\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6260,12 +6129,12 @@ msgstr "term_io 2\n"
 #: login-utils/agetty.c:937
 #, c-format
 msgid "user"
-msgstr "k�ytt�j�"
+msgstr "käyttäjä"
 
 #: login-utils/agetty.c:937
 #, c-format
 msgid "users"
-msgstr "k�ytt�j��"
+msgstr "käyttäjää"
 
 #: login-utils/agetty.c:1025
 #, c-format
@@ -6275,7 +6144,7 @@ msgstr "%s: luku: %m"
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: sy�tteen ylivuoto"
+msgstr "%s: syötteen ylivuoto"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6285,75 +6154,70 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"K�ytt�: %s [-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I "
-"alustuskomennot] [-H kirjautumisis�nt�] linjanopeus,... linja [term.tyyppi]\n"
+"Käyttö: %s [-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I "
+"alustuskomennot] [-H kirjautumisisäntä] linjanopeus,... linja [term.tyyppi]\n"
 "tai\t[-hiLmw] [-l kirjautumisohjelma] [-t aikakatkaisu] [-I alustuskomennot] "
-"[-H kirjautumisis�nt�] linja linjanopeus,... [term.tyyppi]\n"
+"[-H kirjautumisisäntä] linja linjanopeus,... [term.tyyppi]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: muisti v�hiss�, kirjautuminen voi ep�onnistua\n"
+msgstr "login: muisti vähissä, kirjautuminen voi epäonnistua\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kohteelle ttyclass ei voi varata muistia"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kohteelle grplist ei voi varata muistia"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Kirjautuminen p��tteelle %s osoitteesta %s ev�tty oletuksena.\n"
+msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty oletuksena.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Kirjautuminen p��tteelle %s osoitteesta %s ev�tty.\n"
+msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s: sinua (k�ytt�j� %d) ei ole olemassa.\n"
+msgstr "%s: sinua (käyttäjä %d) ei ole olemassa.\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: k�ytt�j� \"%s\" ei ole olemassa.\n"
+msgstr "%s: käyttäjä \"%s\" ei ole olemassa.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
-"%s: vain paikallisia merkint�j� voi muuttaa; k�yt� sen sijaan komentoa yp%"
+"%s: vain paikallisia merkintöjä voi muuttaa; käytä sen sijaan komentoa yp%"
 "s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
-#, fuzzy
 msgid "Unknown user context"
-msgstr "unknown error in key"
+msgstr "Tuntematon käyttäjäympäristö"
 
 #: login-utils/chfn.c:152
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
+"%s: käyttäjällä %s ei ole valtuutusta muuttaa käyttäjän %s finger-tietoja\n"
 
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: Tiedoston /etc/passwd oletusympäristöä ei voi asettaa"
 
 #: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Vaihdetaan k�ytt�j�n %s finger-tiedot.\n"
+msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
 
 #: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
 #: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
@@ -6361,15 +6225,15 @@ msgstr "Vaihdetaan k�ytt�j�n %s finger-tiedot.\n"
 msgid "Password error."
 msgstr "Salasanavirhe."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Salasana: "
 
 #: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
-msgstr "V��r� salasana."
+msgstr "Väärä salasana."
 
 #: login-utils/chfn.c:217
 #, c-format
@@ -6379,7 +6243,7 @@ msgstr "Finger-tietoja ei muutettu.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "K�ytt�: %s [ -f kokonimi ] [ -o toimisto ] "
+msgstr "Käyttö: %s [ -f kokonimi ] [ -o toimisto ] "
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6407,7 +6271,7 @@ msgstr ""
 #: login-utils/chfn.c:425
 #, c-format
 msgid "field is too long.\n"
-msgstr "kentt� on liian pitk�.\n"
+msgstr "kenttä on liian pitkä.\n"
 
 #: login-utils/chfn.c:433
 #, c-format
@@ -6417,12 +6281,12 @@ msgstr "merkki \"%c\" ei ole sallittu.\n"
 #: login-utils/chfn.c:438
 #, c-format
 msgid "Control characters are not allowed.\n"
-msgstr "Ohjausmerkkej� ei sallita.\n"
+msgstr "Ohjausmerkkejä ei sallita.\n"
 
 #: login-utils/chfn.c:503
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr "Finger-tietoja *EI* muutettu. Yrit� my�hemmin uudelleen.\n"
+msgstr "Finger-tietoja *EI* muutettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/chfn.c:506
 #, c-format
@@ -6431,12 +6295,12 @@ msgstr "Finger-tietoja muutettiin.\n"
 
 #: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
 msgid "malloc failed"
-msgstr "\"malloc\" ep�onnistui"
+msgstr "\"malloc\" epäonnistui"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
+msgstr "%s: käyttäjällä %s ei ole valtuutusta vaihtaa käyttäjän %s kuorta\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6444,16 +6308,18 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: Vallitseva UID ei täsmää muutettavan käyttäjän UID:hen, kuoren vaihto "
+"estetty\n"
 
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: Kuori ei ole tiedostossa /etc/shells, kuoren vaihto ev�tty\n"
+msgstr "%s: Kuori ei ole tiedostossa /etc/shells, kuoren vaihto evätty\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Vaihdetaan k�ytt�j�n %s kuori.\n"
+msgstr "Vaihdetaan käyttäjän %s kuori.\n"
 
 #: login-utils/chsh.c:211
 msgid "New shell"
@@ -6467,7 +6333,7 @@ msgstr "Kuorta ei vaihdettu.\n"
 #: login-utils/chsh.c:225
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "Kuorta *EI* vaihdettu. Yrit� my�hemmin uudelleen.\n"
+msgstr "Kuorta *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/chsh.c:228
 #, c-format
@@ -6480,8 +6346,8 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"K�ytt�: %s [ -s kuori ] [ --list-shells ] [ --help ] [ --version ]\n"
-"       [ k�ytt�j�tunnus ]\n"
+"Käyttö: %s [ -s kuori ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ käyttäjätunnus ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
@@ -6496,17 +6362,17 @@ msgstr "%s: \"%s\" ei ole olemassa.\n"
 #: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr "%s: \"%s\" ei ole k�ynnistett�v�.\n"
+msgstr "%s: \"%s\" ei ole käynnistettävä.\n"
 
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: merkki� \"%c\" ei sallita.\n"
+msgstr "%s: merkkiä \"%c\" ei sallita.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr "%s: Ohjausmerkkej� ei sallita.\n"
+msgstr "%s: Ohjausmerkkejä ei sallita.\n"
 
 #: login-utils/chsh.c:362
 #, c-format
@@ -6521,7 +6387,7 @@ msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: k�yt� -l -valitsinta n�hd�ksesi listan\n"
+msgstr "%s: käytä -l -valitsinta nähdäksesi listan\n"
 
 #: login-utils/chsh.c:372
 #, c-format
@@ -6531,41 +6397,13 @@ msgstr "Varoitus: \"%s\" ei ole listattu tiedostossa /etc/shells.\n"
 #: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "K�yt� %s -l n�hd�ksesi listan.\n"
+msgstr "Käytä %s -l nähdäksesi listan.\n"
 
 #: login-utils/chsh.c:393
 #, c-format
 msgid "No known shells.\n"
 msgstr "Ei tunnettuja kuoria.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "laitetta /dev/urandom ei voitu avata"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "tiedostosta /dev/urandom ei voitu lukea satunnaisdataa"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "tiedostoa %s ei voi avata lukua varten"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "tiedoston %s tilaa ei voi lukea"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "tiedoston %s tila ei ole oikea"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "tiedostosta %s ei voi lukea dataa"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6574,13 +6412,13 @@ msgstr "Tiedostoa %s ei voi lukea, poistutaan."
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
-"k�ytt�: last [-#] [-f tiedosto] [-t tty] [-h is�nt�nimi] [k�ytt�j� ...]\n"
+"käyttö: last [-#] [-f tiedosto] [-t tty] [-h isäntänimi] [käyttäjä ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  edelleen kirjautuneena"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6589,15 +6427,15 @@ msgstr ""
 "\n"
 "wtmp alkaa %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc-virhe.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6606,80 +6444,74 @@ msgstr ""
 "\n"
 "keskeytetty %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "VAKAVAA: p��tett� ei voi avata uudelleen: %s"
+msgstr "VAKAVAA: päätettä ei voi avata uudelleen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr "VAKAVAA: virheellinen p��te"
+msgstr "VAKAVAA: virheellinen pääte"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
-msgstr "login: -h on vain p��k�ytt�j�lle.\n"
+msgstr "login: -h on vain pääkäyttäjälle.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "k�ytt�: login [-fp] [k�ytt�j�nimi]\n"
+msgstr "käyttö: login [-fp] [käyttäjänimi]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM-virhe, keskeytet��n: %s\n"
+msgstr "login: PAM-virhe, keskeytetään: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAMia ei voitu alustaa: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "tunnus: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "EP�ONNISTUNUT K�YTT�J�N %3$s KIRJAUTUMINEN %1$d OSOITTEESTA %2$s, %4$s"
+msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %3$s KIRJAUTUMINEN %1$d OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Kirjautuminen ep�onnistui\n"
+"Kirjautuminen epäonnistui\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
-"LIIAN MONTA (%1$d) K�YTT�J�N %3$s KIRJAUTUMISYRITYST� OSOITTEESTA %2$s, %4$s"
+"LIIAN MONTA (%1$d) KÄYTTÄJÄN %3$s KIRJAUTUMISYRITYSTÄ OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "EP�ONNISTUNUT K�YTT�J�N %2$s ISTUNTO OSOITTEESTA %1$s, %3$s"
+msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %2$s ISTUNTO OSOITTEESTA %1$s, %3$s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Kirjautuminen ep�onnistui\n"
+"Kirjautuminen epäonnistui\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6688,135 +6520,120 @@ msgstr ""
 "\n"
 "Istunnon aloitusongelma, keskeytys.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr "K�ytt�j�nimi on NULL funktiossa %s, rivill� %d. Keskeytys."
+msgstr "Käyttäjänimi on NULL funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Virheellinen k�ytt�j�nimi \"%s\" funktiossa %s, rivill� %d. Keskeytys."
+msgstr "Virheellinen käyttäjänimi \"%s\" funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Muisti lopussa\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
-msgstr "Virheellinen k�ytt�j�nimi"
+msgstr "Virheellinen käyttäjänimi"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "K�ytt�j�n %s kirjautuminen hyl�tty t�ll� p��tteell�.\n"
+msgstr "Käyttäjän %s kirjautuminen hylätty tällä päätteellä.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "K�YTT�J�N %s KIRJAUTUMINEN HYL�TTIIN OSOITTEESTA %s, P��TTEELL� %s"
+msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN OSOITTEESTA %s, PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "K�YTT�J�N %s KIRJAUTUMINEN HYL�TTIIN P��TTEELL� %s"
+msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Virheellinen kirjautuminen\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Liian monta k�ytt�j�� on jo kirjautuneena.\n"
-"Yrit� my�hemmin uudelleen.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Liian monta prosessia k�ynniss�.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "K�YTT�J�N %2$s MODEEMIYHTEYS P��TTEELL� %1$s"
+msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "P��K�YTT�J�N KIRJAUTUMINEN P��TTEELL� %s OSOITTEESTA %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "P��K�YTT�J�N KIRJAUTUMINEN P��TTEELL� %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "K�YTT�J�N %2$s KIRJAUTUMINEN P��TTEELL� %1$s OSOITTEESTA %3$s"
+msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s OSOITTEESTA %3$s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "K�YTT�J�N %2$s KIRJAUTUMINEN P��TTEELL� %1$s"
+msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sinulle on uutta postia.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sinulle on postia.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: virhe haarautettaessa: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr "TIOCSCTTY ep�onnistui: %m"
+msgstr "TIOCSCTTY epäonnistui: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
-msgstr "setuid() ep�onnistui"
+msgstr "setuid() epäonnistui"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ei hakemistoa %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
-msgstr "Kirjaudutaan k�ytt�en kotihakemistona \"/\".\n"
+msgstr "Kirjaudutaan käyttäen kotihakemistona \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ei muistia kuoriskriptille.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: kuoriskripti� ei voitu k�ynnist��: %s.\n"
+msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ei kuorta: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6825,68 +6642,68 @@ msgstr ""
 "\n"
 "%s, kirjautuminen: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "tunnus aivan liian pitk�.\n"
+msgstr "tunnus aivan liian pitkä.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
-msgstr "NIMI liian pitk�"
+msgstr "NIMI liian pitkä"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
-msgstr "tunnukset eiv�t voi alkaa merkill� \"-\".\n"
+msgstr "tunnukset eivät voi alkaa merkillä \"-\".\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
-msgstr "liian monta per�kk�ist� rivinvaihtoa.\n"
+msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "LIIKAA rivinvaihtoja"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "Kirjautuminen aikakatkaistiin %d sekunnin j�lkeen\n"
+msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
-msgstr "p��tteelt� %.*s\n"
+msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "EP�ONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
+msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "EP�ONNISTUNUT KIRJAUTUMINEN P��TTEELT� %s, %s"
+msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d EP�ONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
+msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d EP�ONNISTUNUTTA KIRJAUTUMISTA P��TTEELT� %s, %s"
+msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
 
 #: login-utils/mesg.c:89
 #, c-format
@@ -6901,174 +6718,36 @@ msgstr "on n\n"
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "k�ytt�: mesg [y | n]\n"
+msgstr "käyttö: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
-msgstr "newgrp: Kuka sin� olet?"
+msgstr "newgrp: Kuka sinä olet?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
-msgstr "newgrp: Ryhm�� ei ole."
+msgstr "newgrp: Ryhmää ei ole."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Lupa ev�tty"
+msgstr "newgrp: Lupa evätty"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Ei kuorta"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Salasanassa on oltava v�hint��n kuusi merkki�, yrit� uudelleen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Salasanan merkkien on oltava seuraavista kahdesta ryhm�st�:\n"
-"isot ja pienet kirjaimet, numerot ja ei-alfanumeeriset\n"
-"merkit. Lis�tietoja manuaalisivulla passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Et voi uudelleenk�ytt�� vanhoja salasanoja.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "�l� k�yt� mit��n k�ytt�j�tunnuksesi tapaista salasanana!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "�l� k�yt� mit��n oikean nimesi kaltaista salasanana!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "K�ytt�: passwd [k�ytt�j�tunnus [salasana]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Vain p��k�ytt�j� voi k�ytt�� argumentteja.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "K�ytt�: passwd [-foqsvV] [k�ytt�j� [salasana]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ohjelmaa %s ei voi k�ynnist��: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "K�ytt�j�tunnusta ei l�ydy"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Vain p��k�ytt�j� voi vaihtaa muiden salasanoja.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Liian monta argumenttia.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "K�ytt�j�tunnusta ei l�ydy mist��n. Onko \"%s\" todella k�ytt�j�?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Valitan, pystyn muuttamaan vain paikallisia salasanoja. K�yt� komentoa "
-"yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID ja k�ytt�j�nimi eiv�t vastaa toisiaan, huijari!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Vaihdetaan k�ytt�j�n %s salasana\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Sy�t� vanha salasana: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Virheellinen salasana, huijari."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Sy�t� uusi salasana: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Salasanaa ei vaihdettu."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Sy�t� uusi salasana uudelleen: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Kirjoitit v��rin. Salasanaa ei vaihdettu."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "salasana vaihdettu, k�ytt�j� %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "P��K�YTT�J�N SALASANA VAIHDETTU"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "p��k�ytt�j� vaihtoi k�ytt�j�n %s salasanan"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "kutsutaan setpwnam salasanan asettamiseksi.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Salasanaa *EI* vaihdettu. Yrit� my�hemmin uudelleen.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Salasana vaihdettu.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "K�ytt�: shutdown [-h|-r] [-fqs] [now|hh:mm|+minuutit]\n"
+msgstr "Käyttö: shutdown [-h|-r] [-fqs] [now|hh:mm|+minuutit]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -7077,25 +6756,25 @@ msgstr "Sammutustoiminto keskeytetty"
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: Vain root voi sammuttaa j�rjestelm�n.\n"
+msgstr "%s: Vain root voi sammuttaa järjestelmän.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Tuon t�ytyy olla huomenna, etk� voi odottaa siihen asti?\n"
+msgstr "Tuon täytyy olla huomenna, etkö voi odottaa siihen asti?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
-msgstr "yll�pitoa varten; mars, mars"
+msgstr "ylläpitoa varten; mars, mars"
 
 #: login-utils/shutdown.c:311
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr "aikaraja = %d, hiljaisuus = %d, uudelleenk�ynnistys = %d\n"
+msgstr "aikaraja = %d, hiljaisuus = %d, uudelleenkäynnistys = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "J�rjestelm� sammutetaan 5 minuutin kuluttua"
+msgstr "Järjestelmä sammutetaan 5 minuutin kuluttua"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
@@ -7104,21 +6783,20 @@ msgstr "Kirjautuminen on sen vuoksi estetty"
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr "uudelleenk�ynnisti %s: %s"
+msgstr "uudelleenkäynnisti %s: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
 msgstr "sammutti %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"Miksi olen edelleen elossa uudelleenk�ynnistyksen j�lkeen?"
+"Miksi olen edelleen elossa uudelleenkäynnistyksen jälkeen?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7141,43 +6819,42 @@ msgstr "Virhe virrankatkaisussa\t%s\n"
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "K�ynnistet��n ohjelma \"%s\"...\n"
+msgstr "Käynnistetään ohjelma \"%s\"...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Virhe k�ynnistett�ess�\t%s\n"
+msgstr "Virhe käynnistettäessä\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "KIIREELLIST�: yleisl�hetysviesti k�ytt�j�lt� %s:"
+msgstr "KIIREELLISTÄ: yleislähetysviesti käyttäjältä %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "J�rjestelm� sammuu %d tunnin, %d minuutin kuluttua"
+msgstr "Järjestelmä sammuu %d tunnin, %d minuutin kuluttua"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "J�rjestelm� sammuu 1 tunnin ja %d minuutin kuluttua"
+msgstr "Järjestelmä sammuu 1 tunnin ja %d minuutin kuluttua"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr "J�rjestelm� sammuu %d minuutin kuluttua\n"
+msgstr "Järjestelmä sammuu %d minuutin kuluttua\n"
 
 #: login-utils/shutdown.c:503
 #, c-format
 msgid "System going down in 1 minute\n"
-msgstr "J�rjestelm� sammuu 1 minuutin kuluttua\n"
+msgstr "Järjestelmä sammuu 1 minuutin kuluttua\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
 msgid "System going down IMMEDIATELY!\n"
-msgstr "J�rjestelm� sammuu V�LITT�M�STI!\n"
+msgstr "Järjestelmä sammuu VÄLITTÖMÄSTI!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -7190,25 +6867,25 @@ msgstr "Haarauttaminen komentoa swapoff varten ei onnistu. Aivan sama!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "Komentoa swapoff ei voi k�ynnist��, toivottavasti umount hoitaa asian."
+msgstr "Komentoa swapoff ei voi käynnistää, toivottavasti umount hoitaa asian."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
 msgstr ""
-"Haarauttaminen komentoa umount varten ei onnistu, yritet��n manuaalisesti."
+"Haarauttaminen komentoa umount varten ei onnistu, yritetään manuaalisesti."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "Ohjelmaa %s ei voi k�ynnist��, yritet��n k�ynnist�� umount.\n"
+msgstr "Ohjelmaa %s ei voi käynnistää, yritetään käynnistää umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "Ohjelmaa umount ei voi k�ynnist��, luovutaan irrotusyrityksest�."
+msgstr "Ohjelmaa umount ei voi käynnistää, luovutaan irrotusyrityksestä."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Irrotetaan j�ljell� olevat tiedostoj�rjestelm�t..."
+msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
 #: login-utils/shutdown.c:659
 #, c-format
@@ -7217,15 +6894,15 @@ msgstr "shutdown: Laitetta %s ei voitu irrottaa: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "K�ynnistet��n yhden k�ytt�j�n tilaan.\n"
+msgstr "Käynnistetään yhden käyttäjän tilaan.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr "yhden k�ytt�j�n tilan kuoren k�ynnistys ep�onnistui\n"
+msgstr "yhden käyttäjän tilan kuoren käynnistys epäonnistui\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr "yhden k�ytt�j�n tilan kuoren haarauttaminen ep�onnistui\n"
+msgstr "yhden käyttäjän tilan kuoren haarauttaminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
@@ -7239,7 +6916,6 @@ msgstr "virhe asetettaessa \"close-on-exec\" laitteelle /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "virhe ajettaessa finalprogia\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "virhe haarautettaessa finalprogia\n"
@@ -7250,27 +6926,27 @@ msgid ""
 "Wrong password.\n"
 msgstr ""
 "\n"
-"V��r� salasana.\n"
+"Väärä salasana.\n"
 
 #: login-utils/simpleinit.c:418
 msgid "lstat of path failed\n"
-msgstr "polun tilan lukeminen ep�onnistui\n"
+msgstr "polun tilan lukeminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:426
 msgid "stat of path failed\n"
-msgstr "polun tilan lukeminen ep�onnistui\n"
+msgstr "polun tilan lukeminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:434
 msgid "open of directory failed\n"
-msgstr "hakemiston avaaminen ep�onnistui\n"
+msgstr "hakemiston avaaminen epäonnistui\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
-msgstr "haarauttaminen ep�onnistui\n"
+msgstr "haarauttaminen epäonnistui\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
-msgstr "k�ynnistys ep�onnistui\n"
+msgstr "käynnistys epäonnistui\n"
 
 #: login-utils/simpleinit.c:563
 msgid "cannot open inittab\n"
@@ -7278,21 +6954,21 @@ msgstr "tiedostoa inittab ei voi avata\n"
 
 #: login-utils/simpleinit.c:630
 msgid "no TERM or cannot stat tty\n"
-msgstr "TERM-muuttujaa ei ole tai p��tteen tilaa ei voi lukea\n"
+msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
 
 #: login-utils/simpleinit.c:936
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr "virhe pys�ytett�ess� palvelua: \"%s\""
+msgstr "virhe pysäytettäessä palvelua: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "liian monta iov:t� (muuta koodia tiedostossa wall/ttymsg.c)"
+msgstr "liian monta iov:tä (muuta koodia tiedostossa wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr "liian pitk� riviargumentti"
+msgstr "liian pitkä riviargumentti"
 
 #: login-utils/ttymsg.c:139
 #, c-format
@@ -7317,7 +6993,7 @@ msgstr "%s: salasanatiedosto on varattu.\n"
 #: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: ryhm�tiedosto on varattu.\n"
+msgstr "%s: ryhmätiedosto on varattu.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
@@ -7327,17 +7003,17 @@ msgstr "%s: tiedosto %s on varattu (%s on olemassa)\n"
 #: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: tiedostoa %s ei voi linkitt��: %s\n"
+msgstr "%s: tiedostoa %s ei voi linkittää: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+msgstr "%s: Tiedoston %s ympäristöä ei voi hakea"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+msgstr "%s: Tiedoston %s ympäristöä ei voi asettaa"
 
 #: login-utils/vipw.c:217
 #, c-format
@@ -7364,12 +7040,12 @@ msgstr "%s: muutoksia ei tehty\n"
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr "T�ss� j�rjestelm�ss� k�ytet��n varjoryhmi�.\n"
+msgstr "Tässä järjestelmässä käytetään varjoryhmiä.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr "T�ss� j�rjestelm�ss� k�ytet��n varjosalasanoja.\n"
+msgstr "Tässä järjestelmässä käytetään varjosalasanoja.\n"
 
 #: login-utils/vipw.c:354
 #, c-format
@@ -7379,22 +7055,22 @@ msgstr "Haluatko muokata tiedostoa %s nyt [y/n]? "
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "k�ytt�: %s [tiedosto]\n"
+msgstr "käyttö: %s [tiedosto]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: v�liaikaistiedostoa ei voi avata.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Yleisl�hetysviesti k�ytt�j�lt� %s@%s"
+msgstr "Yleislähetysviesti käyttäjältä %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: ei lueta tiedostoa %s - k�yt� vakiosy�tett�.\n"
+msgstr "%s: ei lueta tiedostoa %s - käytä vakiosyötettä.\n"
 
 #: login-utils/wall.c:209
 #, c-format
@@ -7404,27 +7080,21 @@ msgstr "%s: tiedostoa %s ei voi lukea.\n"
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: v�liaikaistiedoston tilaa ei voi lukea.\n"
+msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: v�liaikaistiedostoa ei voi avata.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "virheellinen kuukauden arvo: k�yt� 1-12"
+msgstr "virheellinen kuukauden arvo: käytä 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "virheellinen vuoden arvo: k�yt� 1-9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "virheellinen vuoden arvo: käytä 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7433,15 +7103,14 @@ msgstr "%s %d"
 #: misc-utils/cal.c:780
 #, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "k�ytt�: cal [-13smjyV] [[kuukausi] vuosi]\n"
+msgstr "käyttö: cal [-13smjyV] [[kuukausi] vuosi]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "k�ytt�: %s [+muoto] [p�iv� kuukausi vuosi]\n"
+msgstr "käyttö: %s [+muoto] [päivä kuukausi vuosi]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
@@ -7453,7 +7122,7 @@ msgstr "%s: tuntematon signaali %s\n"
 #: misc-utils/kill.c:270
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: prosessia \"%s\" ei l�ydy\n"
+msgstr "%s: prosessia \"%s\" ei löydy\n"
 
 #: misc-utils/kill.c:314
 #, c-format
@@ -7463,7 +7132,7 @@ msgstr "%s: tuntematon signaali %s; kelvolliset signaalit:\n"
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "k�ytt�: %s [ -s signaali | -p ]�[ -a ] pid ...\n"
+msgstr "käyttö: %s [ -s signaali | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
@@ -7490,13 +7159,13 @@ msgstr "logger: tuntematon prioriteetin nimi: %s.\n"
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"k�ytt�: logger [-is] [-f tiedosto] [-p pri] [-t tag] [-u pistoke] "
+"käyttö: logger [-is] [-f tiedosto] [-p pri] [-t tag] [-u pistoke] "
 "[ viesti ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "k�ytt�: look [-dfa] [-t merkki] merkkijono [tiedosto]\n"
+msgstr "käyttö: look [-dfa] [-t merkki] merkkijono [tiedosto]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
@@ -7511,22 +7180,22 @@ msgstr "Tiedostosta %2$s saatiin %1$d tavua\n"
 #: misc-utils/namei.c:103
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: nykyist� hakemistoa ei voida hakea - %s\n"
+msgstr "namei: nykyistä hakemistoa ei voida hakea - %s\n"
 
 #: misc-utils/namei.c:116
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: hakemistoon %s ei voi siirty� - %s (%d)\n"
+msgstr "namei: hakemistoon %s ei voi siirtyä - %s (%d)\n"
 
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "k�ytt�: namei [-mx] polku [polku ...]\n"
+msgstr "käyttö: namei [-mx] polku [polku ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: juureen siirtyminen ep�onnistui!\n"
+msgstr "namei: juureen siirtyminen epäonnistui!\n"
 
 #: misc-utils/namei.c:158
 #, c-format
@@ -7541,12 +7210,12 @@ msgstr "namei: puskurin ylivuoto\n"
 #: misc-utils/namei.c:218
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? siirtyminen hakemistoon %s ep�onnistui - %s (%d)\n"
+msgstr " ? siirtyminen hakemistoon %s epäonnistui - %s (%d)\n"
 
 #: misc-utils/namei.c:247
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? ongelmia luettaessa symlinkki� %s - %s (%d)\n"
+msgstr " ? ongelmia luettaessa symlinkkiä %s - %s (%d)\n"
 
 #: misc-utils/namei.c:257
 #, c-format
@@ -7566,14 +7235,14 @@ msgstr "%s: muisti lopussa\n"
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: uudelleennime�minen %s -> %s ep�onnistui: %s\n"
+msgstr "%s: uudelleennimeäminen %s -> %s epäonnistui: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr "k�ytt�: %s l�hde kohde tiedostot...\n"
+msgstr "käyttö: %s lähde kohde tiedostot...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7581,25 +7250,25 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 "Varoitus: \"%s\" on linkki.\n"
-"K�yt� \"%s [valitsimet] %s\" jos todella haluat k�ytt�� sit�.\n"
-"Skripti� ei k�ynnistetty.\n"
+"Käytä \"%s [valitsimet] %s\" jos todella haluat käyttää sitä.\n"
+"Skriptiä ei käynnistetty.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "k�ytt�: script [-a] [-f] [-q] [-t] [tiedosto]\n"
+msgstr "käyttö: script [-a] [-f] [-q] [-t] [tiedosto]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Skripti k�ynnistetty, tiedosto on %s\n"
+msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
-msgstr "Skripti k�ynnistetty %s"
+msgstr "Skripti käynnistetty %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7608,257 +7277,256 @@ msgstr ""
 "\n"
 "Skripti suoritettu %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
-msgstr "openpty ep�onnistui\n"
+msgstr "openpty epäonnistui\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Pty:t lopussa\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: Argumenttivirhe, k�ytt�\n"
+msgstr "%s: Argumenttivirhe, käyttö\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
-msgstr "  [ -term p��tteen_nimi ]\n"
+msgstr "  [ -term päätteen_nimi ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr "  [ -dump   [1-KONSOLIEN_M��R�] ]\n"
+msgstr "  [ -dump   [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr "  [ -append [1-KONSOLIEN_M��R�] ]\n"
+msgstr "  [ -append [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumptiedostonimi ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
-msgstr "virrans��st�tilaa ei voi asettaa (pois)\n"
+msgstr "virransäästötilaa ei voi asettaa (pois)\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-virhe: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Virhe luettaessa %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
-msgstr "Virhe kirjoitettaessa n�ytt�vedosta\n"
+msgstr "Virhe kirjoitettaessa näyttövedosta\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "tiedostoa %s ei voitu lukea, eik� dump-ioctl onnistu\n"
+msgstr "tiedostoa %s ei voitu lukea, eikä dump-ioctl onnistu\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: $TERM ei ole m��ritelty.\n"
+msgstr "%s: $TERM ei ole määritelty.\n"
 
 #: misc-utils/whereis.c:157
 #, c-format
@@ -7868,7 +7536,7 @@ msgstr "whereis [ -sbmu ] [ -SBM hak ... -f ] nimi...\n"
 #: misc-utils/write.c:99
 #, c-format
 msgid "write: can't find your tty's name\n"
-msgstr "write: tty:si nime� ei l�ydy\n"
+msgstr "write: tty:si nimeä ei löydy\n"
 
 #: misc-utils/write.c:110
 #, c-format
@@ -7878,17 +7546,17 @@ msgstr "write: sinulla ei ole kirjoitusoikeutta.\n"
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s ei ole kirjautuneena p��tteell� %s.\n"
+msgstr "write: %s ei ole kirjautuneena päätteellä %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write: %s on est�nyt viestit p��tteell� %s\n"
+msgstr "write: %s on estänyt viestit päätteellä %s\n"
 
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "k�ytt�: write k�ytt�j� [tty]\n"
+msgstr "käyttö: write käyttäjä [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
@@ -7898,7 +7566,7 @@ msgstr "write: %s ei ole kirjautuneena\n"
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write: %s ei vastaanota viestej�\n"
+msgstr "write: %s ei vastaanota viestejä\n"
 
 #: misc-utils/write.c:247
 #, c-format
@@ -7910,12 +7578,12 @@ msgstr ""
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
-"Viesti %4$s:lle kirjautuneelta k�ytt�j�lt� %1$s@%2$s (%3$s), kello %5$s..."
+"Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Viesti %3$s:lle kirjautuneelta k�ytt�j�lt� %1$s@%2$s, kello %4$s..."
+msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
 #: mount/fstab.c:136
 #, c-format
@@ -7931,26 +7599,22 @@ msgstr "virhe: tiedostoa %s ei voi avata: %s"
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
-"mount: tiedostoa %s ei voitu avata - k�ytet��n tiedostoa %s sen sijaan\n"
+"mount: tiedostoa %s ei voitu avata - käytetään tiedostoa %s sen sijaan\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi luoda: %s (k�yt� lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi linkitt��: %s (k�yt� lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "lukkotiedostoa %s ei voi avata: %s (k�yt� lippua -n ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi avata: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:526
 #, c-format
@@ -7972,13 +7636,13 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"Linkki� %s ei voi luoda\n"
-"Ehk� jossakin on vanhentunut lukkotiedosto?\n"
+"Linkkiä %s ei voi luoda\n"
+"Ehkä jossakin on vanhentunut lukkotiedosto?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei p�ivitetty"
+msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei päivitetty"
 
 #: mount/fstab.c:633
 #, c-format
@@ -7993,7 +7657,7 @@ msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 #: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "nime�minen %s -> %s ei onnistu: %s\n"
+msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
 
 #: mount/lomount.c:73
 #, c-format
@@ -8003,7 +7667,7 @@ msgstr "loop: laitetta %s ei voi avata: %s\n"
 #: mount/lomount.c:89
 #, c-format
 msgid ", offset %lld"
-msgstr ", siirtym� %lld"
+msgstr ", siirtymä %lld"
 
 #: mount/lomount.c:92
 #, c-format
@@ -8018,7 +7682,7 @@ msgstr ", salaus %s (tyyppi %d)"
 #: mount/lomount.c:114
 #, c-format
 msgid ", offset %d"
-msgstr ", siirtym� %d"
+msgstr ", siirtymä %d"
 
 #: mount/lomount.c:117
 #, c-format
@@ -8031,29 +7695,29 @@ msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: ei l�ytynyt yht��n laitetta /dev/loop#"
+msgstr "%s: ei löytynyt yhtään laitetta /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
-msgstr ""
+msgstr "%s: ei oikeuksia laitteeseen /dev/loop#"
 
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Ei l�ytynyt yht��n loop-laitetta, ja tiedoston %s mukaan\n"
-"       t�m� ydin ei ole tietoinen loop-laitteesta?\n"
-"       (Jos n�in on, k��nn� uudelleen tai suorita \"modprobe loop\".)"
+"%s: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
+"       loop-laitteista?\n"
+"       (Jos näin on, käännä uudelleen tai suorita \"modprobe loop\".)"
 
 #: mount/lomount.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: ei l�ytynyt yht��n vapaata loop-laitetta"
+msgstr "%s: ei löytynyt yhtään vapaata loop-laitetta"
 
 #: mount/lomount.c:287
 #, c-format
@@ -8061,9 +7725,9 @@ msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): onnistui\n"
+msgstr "set_loop(%s,%s,%llu): onnistui\n"
 
 #: mount/lomount.c:351
 #, c-format
@@ -8078,10 +7742,10 @@ msgstr "del_loop(%s): onnistui\n"
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "T�m� mount on k��nnetty ilman loop-tukea. K��nn� uudelleen.\n"
+msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8089,20 +7753,21 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"k�ytt�:\n"
-"  %s loop-laite                                        # n�yt� tietoja\n"
+"käyttö:\n"
+"  %s loop-laite                                        # näytä tietoja\n"
 "  %s -d loop-laite                                     # poista\n"
-"  %s [ -e salaus ] [ -o siirtym� ] loop-laite tiedosto # aseta\n"
+"  %s -f                                                # etsi vapaa\n"
+"  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
-msgstr "muisti ei riit�"
+msgstr "muisti ei riitä"
 
 #: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "Loop-tukea ei ollut k��nn�ksen aikana. K��nn� uudelleen.\n"
+msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -8116,34 +7781,34 @@ msgstr "[mntent]: rivi %d tiedostossa %s on virheellinen%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
-msgstr "; loput tiedostosta j�tet��n huomioimatta"
+msgstr "; loput tiedostosta jätetään huomioimatta"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: nimi� %s esiintyy sek� paikassa %s ett� %s\n"
+msgstr "%s: nimiö %s esiintyy sekä paikassa %s että %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: liitet��n %s %sn perusteella\n"
+msgstr "mount: liitetään %s UUID:n perusteella\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: liitet��n %s %sn perusteella\n"
+msgstr "mount: liitetään %s nimiön perusteella\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
-"tehd�.\n"
+"%s: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
+"tehdä.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: virheellinen UUID"
+msgstr "%s: virheellinen UUID"
 
 #: mount/mount.c:382
 #, c-format
@@ -8173,16 +7838,16 @@ msgstr "mount: virhe muutettaessa tiedoston %s tilaa: %s"
 #: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s vaikuttaa olevan sivutustilaa - ei liitet�"
+msgstr "%s vaikuttaa olevan sivutustilaa - ei liitetä"
 
 #: mount/mount.c:570
 msgid "mount failed"
-msgstr "liitt�minen ep�onnistui"
+msgstr "liittäminen epäonnistui"
 
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: vain root voi liitt�� %s pisteeseen %s"
+msgstr "mount: vain root voi liittää %s pisteeseen %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
@@ -8200,12 +7865,12 @@ msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 #: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: aiotaan k�ytt�� loop-laitetta %s\n"
+msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
 #: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: loop-laitteen asettaminen ep�onnistui\n"
+msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
 #: mount/mount.c:635
 #, c-format
@@ -8231,83 +7896,74 @@ msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: haarauttaminen ei onnistu: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: t�m� versio on k��nnetty ilman tukea tyypille \"nfs\""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount: ep�onnistui nfs mount -versiolla 4, yritet��n versiolla 3..\n"
+msgstr "mount: epäonnistui nfs mount -versiolla 4, yritetään versiolla 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: Tiedostoj�rjestelm�n tyyppi� ei voitu m��ritt��, eik� tyyppi� ole "
+"mount: Tiedostojärjestelmän tyyppiä ei voitu määrittää, eikä tyyppiä ole "
 "annettu"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: tiedostoj�rjestelm�n tyyppi on annettava"
+msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
-msgstr "mount: liitos ep�onnistui"
+msgstr "mount: liitos epäonnistui"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: liitospiste %s ei ole hakemisto"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
-msgstr "mount: lupa ev�tty"
+msgstr "mount: lupa evätty"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: mountin k�ytt��n vaaditaan p��k�ytt�j�n oikeudet"
+msgstr "mount: mountin käyttöön vaaditaan pääkäyttäjän oikeudet"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s on varattu"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc on jo liitetty"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s on jo liitetty tai %s on varattu"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: liitospiste %s ei ole olemassa"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: liitospiste %s on symlinkki olemattomaan"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: erikoislaite %s ei ole olemassa"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8316,165 +7972,162 @@ msgstr ""
 "mount: erikoislaite %s ei ole olemassa\n"
 "       (polun etuliite ei ole hakemisto)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr "mount: %s ei ole viel� liitetty, tai virheellinen valitsin"
+msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
-"mount: v��r� tiedostoj�rjestelm�tyyppi, virheellinen valitsin, viallinen \n"
-"       superlohko laitteella %s, tai liian monta liitetty� \n"
-"       tiedostoj�rjestelm��"
+"mount: väärä tiedostojärjestelmätyyppi, virheellinen valitsin, viallinen \n"
+"       superlohko laitteella %s, puuttuva koodisivu, tai muu virhe"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
+"       (voisiko tämä olla IDE-laite, joka käyttää ide-scsi-ajuria,\n"
+"       jolloin käytetään sr0:aa tai sda:ta?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"       (etkö yritäkin liittää laajennettua osiota, etkä\n"
+"       sen sisältämää loogista osiota?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       Joissakin tapauksissa järjestelmälokista löytyy hyödyllistä\n"
+"       tietoa - kokeile esim. komentoa \"dmesg | tail\".\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
-msgstr "liitostaulukko t�ynn�"
+msgstr "liitostaulukko täynnä"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superlohkoa ei voi lukea"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: tuntematon laite"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l    listaa tunnetut tiedostoj�rjestelm�tyypit"
+msgstr "mount: tuntematon tiedostojärjestelmän tyyppi \"%s\""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: tarkoitat todenn�k�isesti %s"
+msgstr "mount: tarkoitat todennäköisesti %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: ehk� tarkoitit iso9660?"
+msgstr "mount: ehkä tarkoitit \"iso9660\"?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: ehk� tarkoitit iso9660?"
+msgstr "mount: ehkä tarkoitit \"vfat\"?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: tiedoston %s laitenumero on v��r� tai tiedostoj�rjestelm�tyyppi %s ei "
+"mount: tiedoston %s laitenumero on väärä tai tiedostojärjestelmätyyppi %s ei "
 "ole tuettu"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s ei ole lohkolaite, ja tilan luku ep�onnistuu?"
+msgstr "mount: %s ei ole lohkolaite, ja tilan luku epäonnistuu?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 "mount: ydin ei tunnista tiedostoa %s lohkolaitteeksi\n"
-"       (ehk� \"insmod ajuri\" auttaa?)"
+"       (ehkä \"insmod ajuri\" auttaa?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s ei ole lohkolaite (yrit� \"-o loop\"?)"
+msgstr "mount: %s ei ole lohkolaite (yritä \"-o loop\"?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ei ole lohkolaite"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ei ole kelvollinen lohkolaite"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "lohkolaite "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount: ei voi liitt�� %s%s vain luku -tilassa"
+msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s on kirjoitussuojattu, mutta \"-w\" -lippu on annettu"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr "mount: %s%s on kirjoitussuojattu, liitet��n vain luku -tilassa"
+msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: tyyppi� ei annettu - kaksoispisteen perusteella sen oletetaan olevan "
+"mount: tyyppiä ei annettu - kaksoispisteen perusteella sen oletetaan olevan "
 "nfs\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: tyyppi� ei annettu - //-alkuliitteen perusteella sen oletetaan olevan "
+"mount: tyyppiä ei annettu - //-alkuliitteen perusteella sen oletetaan olevan "
 "smbfs\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: siirret��n taustalle \"%s\"\n"
+msgstr "mount: siirretään taustalle \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: luovutetaan \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-# valitsin -p passwdfd, mit� se tekee???
-#: mount/mount.c:1426
+# valitsin -p passwdfd, mitä se tekee???
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8499,182 +8152,182 @@ msgid ""
 "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"K�ytt�: mount -V                 : n�yt� versio\n"
-"        mount -h                 : n�yt� t�m� ohje\n"
-"        mount                    : n�yt� liitetyt tiedostoj�rjestelm�t\n"
-"        mount -l                 : sama kuin edell�, lis�ksi nimi�t\n"
-"Siin� informatiivinen osuus. Seuraavaksi liitt�minen.\n"
-"Komento kuuluu \"mount [-t tied.j�rj.tyyppi] jotakin jonnekin\".\n"
-"Tiedostossa /etc/fstab olevat yksityiskohdat voi j�tt�� pois.\n"
-"        mount -a [-t|-O] ...     : liit� kaikki tiedostosta /etc/fstab\n"
-"        mount laite              : liit� laite tunnettuun paikkaan\n"
-"        mount hakemisto          : liit� tunnettu laite t�nne\n"
+"Käyttö: mount -V                 : näytä versio\n"
+"        mount -h                 : näytä tämä ohje\n"
+"        mount                    : näytä liitetyt tiedostojärjestelmät\n"
+"        mount -l                 : sama kuin edellä, lisäksi nimiöt\n"
+"Siinä informatiivinen osuus. Seuraavaksi liittäminen.\n"
+"Komento kuuluu \"mount [-t tied.järj.tyyppi] jotakin jonnekin\".\n"
+"Tiedostossa /etc/fstab olevat yksityiskohdat voi jättää pois.\n"
+"        mount -a [-t|-O] ...     : liitä kaikki tiedostosta /etc/fstab\n"
+"        mount laite              : liitä laite tunnettuun paikkaan\n"
+"        mount hakemisto          : liitä tunnettu laite tänne\n"
 "        mount -t tyyppi laite hak: normaali liitoskomento\n"
-"Huomaa, ett� oikeasti ei liitet� laitetta, vaan laitteella oleva\n"
-"(annetun tyypin mukainen) tiedostoj�rjestelm�.\n"
-"Voidaan my�s liitt�� jo n�kyviss� oleva hakemistopuu muualle:\n"
+"Huomaa, että oikeasti ei liitetä laitetta, vaan laitteella oleva\n"
+"(annetun tyypin mukainen) tiedostojärjestelmä.\n"
+"Voidaan myös liittää jo näkyvissä oleva hakemistopuu muualle:\n"
 "        mount --bind vanha_hak uusi_hak\n"
-"tai siirt�� alipuu:\n"
+"tai siirtää alipuu:\n"
 "        mount --move vanha_hak uusi_hak\n"
-"Laite voidaan antaa nimell�, esim. /dev/hda1 tai /dev/cdrom,\n"
-"tai nimi�ll�, k�ytt�en  -L nimi�  tai uuid:lla, k�ytt�en  -U uuid .\n"
+"Laite voidaan antaa nimellä, esim. /dev/hda1 tai /dev/cdrom,\n"
+"tai nimiöllä, käyttäen  -L nimiö  tai uuid:lla, käyttäen  -U uuid .\n"
 "Muut valitsimet: [-nfFrsvw] [-o valitsimet] [-p passwdfd].\n"
-"Paljon lis�tietoja komennolla:  man 8 mount .\n"
+"Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: vain root voi tehd� tuon"
+msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: ei l�ytynyt %s - luodaan se..\n"
+msgstr "mount: ei löytynyt %s - luodaan se..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: osiota ei l�ydy"
+msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: liitet��n %s\n"
+msgstr "mount: liitetään %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
-msgstr "mit��n ei liitetty"
+msgstr "mitään ei liitetty"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: %s ei l�ydy tiedostosta %s"
+msgstr "mount: %s ei löydy tiedostosta %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: %s ei l�ydy tiedostosta %s, eik� %s"
+msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
 
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: virhe arvattaessa tiedostoj�rjestelm�n tyyppi�\n"
+msgstr "mount: virhe arvattaessa tiedostojärjestelmän tyyppiä\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: et antanut tyyppi� tiedostoj�rjestelm�lle %s\n"
+msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppej�\n"
+msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppejä\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
 msgid "       and it looks like this is swapspace\n"
-msgstr "       ja t�m� n�ytt�� olevan sivutustilaa\n"
+msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 
 #: mount/mount_guess_fstype.c:549
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "       Kokeillaan tyyppi� %s\n"
+msgstr "       Kokeillaan tyyppiä %s\n"
 
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kokeillaan %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: liian pitk� is�nt�:hakemisto-argumentti\n"
+msgstr "mount: liian pitkä isäntä:hakemisto-argumentti\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: varoitus: useita is�nt�nimi� ei tueta\n"
+msgstr "mount: varoitus: useita isäntänimiä ei tueta\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: liitett�v� hakemisto ei ole is�nt�:hakemisto-muodossa\n"
+msgstr "mount: liitettävä hakemisto ei ole isäntä:hakemisto-muodossa\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: nimelle %s ei voi hakea osoitetta\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: saatiin virheellinen hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
-msgstr "mount: liian pitk� valitsinargumentti\n"
+msgstr "mount: liian pitkä valitsinargumentti\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varoitus: Tunnistamaton proto= -valitsin.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varoitus: Valitsinta namlen ei tueta.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "tuntematon nfs-liitosparametri: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varoitus: valitsinta nolock ei tueta.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "tuntematon nfs-liitosvalitsin: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: saatiin virheellinen hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS yli TCP:n ei ole tuettu.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
-msgstr "nfs-palvelin ilmoitti, ettei palvelu ole k�ytett�viss�"
+msgstr "nfs-palvelin ilmoitti, ettei palvelu ole käytettävissä"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "k�ytettiin porttikartoitinta NFS-portin etsimiseen\n"
+msgstr "käytettiin porttikartoitinta NFS-portin etsimiseen\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "k�ytet��n porttia %d nfs-palvelimelle\n"
+msgstr "käytetään porttia %d nfs-palvelimelle\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "tuntematon nfs status -paluuarvo: %d"
@@ -8683,231 +8336,227 @@ msgstr "tuntematon nfs status -paluuarvo: %d"
 msgid "bug in xstrndup call"
 msgstr "ohjelmistovirhe xstrndup-kutsussa"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"k�ytt�: %s [-hV]\n"
+"käyttö: %s [-hV]\n"
 "        %s -a [-e] [-v]\n"
-"        %s [-v] [-p prioriteetti] erikoistiedosto ...\n"
+"        %s [-v] [-p prioriteetti] erikoistiedosto|LABEL=levyn_nimiö ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"k�ytt�: %s [-hV]\n"
+"käyttö: %s [-hV]\n"
 "        %s -a [-v]\n"
 "        %s [-v] erikoistiedosto ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: merkkijonoa \"_stext\" ei l�ydy tiedostosta %s\n"
+msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: tiedoston %s tilaa ei voi lukea: %s\n"
+msgstr "%s: tiedoston %s tilaa ei voi lukea: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: varoitus: tiedostolla %s on turvattomat oikeudet %04o, %04o "
-"suositellaan\n"
+"%s: varoitus: tiedostolla %s on turvattomat oikeudet %04o, suositellaan %"
+"04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Ohitetaan tiedosto %s - siin� vaikuttaa olevan reiki�.\n"
+msgstr "%s: Ohitetaan tiedosto %s - siinä vaikuttaa olevan reikiä.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
-msgstr "Et ole p��k�ytt�j�.\n"
+msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi avata: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: k��nnetty ilman tukea valitsimelle -f\n"
+msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: haarauttaminen ei onnistu: %s"
+msgstr "umount: haarauttaminen ei onnistu: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "is�nt�: %s, hakemisto: %s\n"
+msgstr "isäntä: %s, hakemisto: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: nimelle %s ei saada osoitetta\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: saatiin virheellinen hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: virheellinen lohkolaite"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s: ei ole liitettyn�"
+msgstr "umount: %s: ei ole liitettynä"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: laite on varattu"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount: %s: ei l�ydy"
+msgstr "umount: %s: ei löydy"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: vaaditaan p��k�ytt�j�n oikeudet"
+msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount: %s: lohkolaitteita ei sallita tiedostoj�rjestelm�ss�"
+msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
-"kohteen %s irrottaminen ep�onnistui - yritet��n sen sijaan irrottaa %s\n"
+"kohteen %s irrottaminen epäonnistui - yritetään sen sijaan irrottaa %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu - uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
-"umount: kohteen %s uudelleenliitt�minen vain luku -tilassa ep�onnistui\n"
+"umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr "umount: irrotettavien tiedostoj�rjestelmien listaa ei l�ydy"
+msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"K�ytt�: umount [-hV]\n"
-"        umount -a [-f] [-r] [-n] [-v] [-t vtied.j�rj.tyypit] [-O "
+"Käyttö: umount [-hV]\n"
+"        umount -a [-f] [-r] [-n] [-v] [-t vtied.järj.tyypit] [-O "
 "valitsimet]\n"
 "        umount [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Ei voi avata "
+msgstr "Ei voi avata \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "Yritet��n irrottaa %s\n"
+msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "%s ei l�ytynyt tiedostosta mtab\n"
+msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (tiedoston mtab mukaan)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: %s vaikuttaa olevan liitettyn� useita kertoja"
+msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s ei ole tiedostossa fstab (etk� ole root)"
+msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:637
-#, fuzzy, c-format
+#: mount/umount.c:630
+#, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: vain root voi irrottaa laitteen %s paikasta %s"
+msgstr "umount: vain %s voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr "umount: vain root voi tehd� t�m�n"
+msgstr "umount: vain root voi tehdä tämän"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Vain root voi m��ritell� Ctrl-Alt-Del:n vaikutuksen.\n"
+msgstr "Vain root voi määritellä Ctrl-Alt-Del:n vaikutuksen.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "K�ytt�: ctrlaltdel hard|soft\n"
+msgstr "Käyttö: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -8915,8 +8564,8 @@ msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Tiedosto %s, kynnysarvolle %lu, suurin merkkim��r� fifossa oli %d,\n"
-"ja suurin siirtonopeus (merkki�/sekunti) oli %f\n"
+"Tiedosto %s, kynnysarvolle %lu, suurin merkkimäärä fifossa oli %d,\n"
+"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -8926,13 +8575,13 @@ msgid ""
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
 "Tiedosto %s, kynnysarvolle %lu ja aikakatkaisuarvolle %lu, suurin "
-"merkkim��r� fifossa oli %d,\n"
-"ja suurin siirtonopeus (merkki�/sekunti) oli %f\n"
+"merkkimäärä fifossa oli %d,\n"
+"ja suurin siirtonopeus (merkkiä/sekunti) oli %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Virheellinen sis�inen arvo: %s\n"
+msgstr "Virheellinen sisäinen arvo: %s\n"
 
 #: sys-utils/cytune.c:198
 #, c-format
@@ -8960,7 +8609,7 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"K�ytt�: %s [-q [-i v�li]] ([-s arvo]|[-S arvo]) ([-t arvo]|[-T arvo]) [-g|-"
+"Käyttö: %s [-q [-i väli]] ([-s arvo]|[-S arvo]) ([-t arvo]|[-T arvo]) [-g|-"
 "G] tiedosto [tiedosto...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
@@ -8972,17 +8621,17 @@ msgstr "Laitetta %s ei voi avata: %s\n"
 #: sys-utils/cytune.c:258
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "Laitteelle %s ei voi asettaa kynnyst� %d:�%s\n"
+msgstr "Laitteelle %s ei voi asettaa kynnystä %d: %s\n"
 
 #: sys-utils/cytune.c:277
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "Laitteelle %s ei voi asettaa aikakynnyst� %d: %s\n"
+msgstr "Laitteelle %s ei voi asettaa aikakynnystä %d: %s\n"
 
 #: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr "Laitteelle %s ei voi hakea kynnyst�: %s\n"
+msgstr "Laitteelle %s ei voi hakea kynnystä: %s\n"
 
 #: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
 #, c-format
@@ -9001,16 +8650,16 @@ msgstr "%s: %ld oletuskynnys ja %ld oletusaikakatkaisu\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
-msgstr "Signaalik�sittelij�� ei voi asettaa"
+msgstr "Signaalikäsittelijää ei voi asettaa"
 
 #: sys-utils/cytune.c:332 sys-utils/cytune.c:367
 msgid "gettimeofday failed"
-msgstr "gettimeofday ep�onnistui"
+msgstr "gettimeofday epäonnistui"
 
 #: sys-utils/cytune.c:345 sys-utils/cytune.c:377
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "Laitteelle %s ei voi k�ytt�� CYGETMONia: %s\n"
+msgstr "Laitteelle %s ei voi käyttää CYGETMONia: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
@@ -9039,18 +8688,19 @@ msgstr "   %f int/sec; %f rec (char/sec)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "K�ytt�: %s [-c] [-n taso] [-s puskurin_koko]\n"
+msgstr "Käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: tuntematon signaali %s\n"
+msgstr "flock: tuntematon valitsin, keskeytetään.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Käyttö: flock [--shared | --timeout=sekunnit] tiedosto komento {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9060,7 +8710,7 @@ msgstr "virheellinen id: %s\n"
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "id:t� %s ei voi poistaa (%s)\n"
+msgstr "id:tä %s ei voi poistaa (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
@@ -9217,27 +8867,25 @@ msgstr "kernel not configured for shared memory\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Shared Memory Limits --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "max number of segments = %ld\n"
+msgstr "max number of segments = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "max seg size (kbytes) = %ld\n"
+msgstr "max seg size (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "max total shared memory (kbytes) = %ld\n"
+msgstr "max total shared memory (kbytes) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "min seg size (bytes) = %ld\n"
+msgstr "min seg size (bytes) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9716,12 +9364,12 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "k�ytt�: rdev [ -rv ] [ -o SIIRTYM� ] [ KUVA [ VALUE [ SIIRTYM� ] ] ]"
+msgstr "käyttö: rdev [ -rv ] [ -o SIIRTYMÄ ] [ KUVA [ VALUE [ SIIRTYMÄ ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) n�ytt�� nykyisen JUURIlaitteen"
+msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) näyttää nykyisen JUURIlaitteen"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9737,11 +9385,11 @@ msgstr "  rdev -r /dev/fd0 627\t\t  aseta RAM-levyn koko"
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1\t\t  aseta k�ynnistyksen N�YTT�TILA"
+msgstr "  rdev -v /dev/fd0 1\t\t  aseta käynnistyksen NÄYTTÖTILA"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...\t\t\t  k�yt� tavusiirtym�� N"
+msgstr "  rdev -o N ...\t\t\t  käytä tavusiirtymää N"
 
 #: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
@@ -9759,12 +9407,12 @@ msgstr "  vidmode ...\t\t\t  sama kuin rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Huom: N�ytt�tilat ovat: -3=Kysy, -2=Laajennettu, -1=NormaaliVga, 1=avain1, "
+"Huom: Näyttötilat ovat: -3=Kysy, -2=Laajennettu, -1=NormaaliVga, 1=avain1, "
 "2=avain2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      -R 1 liitt�� juuren vain luku -tilaan, -R 0 luku/kirjoitus."
+msgstr "      -R 1 liittää juuren vain luku -tilaan, -R 0 luku/kirjoitus."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9777,7 +9425,7 @@ msgstr "muisti lopussa"
 
 # c-format
 #: sys-utils/readprofile.c:118
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9793,18 +9441,19 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: K�ytt�: \"%s [valitsimet]\n"
+"%s: Käyttö: \"%s [valitsimet]\n"
 "\t -m <karttatied> (oletukset: \"%s\" ja\n"
 "\t\t\t\t    \"%s\")\n"
 "\t -p <profiili>   (oletus: \"%s\")\n"
-"\t -M <mult>       asettaa profilointikertoimeksi <mult>\n"
-"\t -i              n�ytt�� vain tiedon \"sampling step\":ist�\n"
+"\t -M <kerr>       asettaa profilointikertoimeksi <kerr>\n"
+"\t -i              näyttää vain tiedon \"sampling step\":istä\n"
 "\t -v              monisanaisuus\n"
-"\t -a              n�ytt�� kaikki symbolit, vaikka m��r� olisi 0\n"
-"\t -b              n�ytt�� yksitt�iset \"histogram-bin\"-m��r�t\n"
-"\t -r              nollaa kaikki laskurit (vain p��k�ytt�j�lle)\n"
-"\t -n              poistaa k�yt�st� tavuj�rjestyksen automaattitunnistuksen\n"
-"\t -V              n�ytt�� version ja poistuu\n"
+"\t -a              näyttää kaikki symbolit, vaikka määrä olisi 0\n"
+"\t -b              näyttää yksittäiset \"histogram-bin\"-määrät\n"
+"\t -s              näyttää yksittäiset laskurit funktioissa\n"
+"\t -r              nollaa kaikki laskurit (vain pääkäyttäjälle)\n"
+"\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
+"\t -V              näyttää version ja poistuu\n"
 
 #: sys-utils/readprofile.c:197
 #, c-format
@@ -9819,35 +9468,35 @@ msgstr "Sampling_step: %i\n"
 #: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): v��r� kartan rivi\n"
+msgstr "%s: %s(%i): väärä kartan rivi\n"
 
 #: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: merkkijonoa \"_stext\" ei l�ydy tiedostosta %s\n"
+msgstr "%s: merkkijonoa \"_stext\" ei löydy tiedostosta %s\n"
 
 #: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
-"%s: profiiliosoite sallitun v�lin ulkopuolella. V��r� karttatiedosto?\n"
+"%s: profiiliosoite sallitun välin ulkopuolella. Väärä karttatiedosto?\n"
 
 #: sys-utils/readprofile.c:401
 msgid "total"
-msgstr "yhteens�"
+msgstr "yhteensä"
 
 #: sys-utils/renice.c:68
 #, c-format
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"k�ytt�: renice prioriteetti [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
-"k�ytt�j�t ]\n"
+"käyttö: renice prioriteetti [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"käyttäjät ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice: %s: tuntematon k�ytt�j�\n"
+msgstr "renice: %s: tuntematon käyttäjä\n"
 
 #: sys-utils/renice.c:105
 #, c-format
@@ -9870,7 +9519,7 @@ msgstr "%d: vanha prioriteetti %d, uusi prioriteetti %d\n"
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "k�ytt�: %s ohjelma [ arg ...]\n"
+msgstr "käyttö: %s ohjelma [ arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9879,7 +9528,7 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"K�ytt�: %s <laite> [ -i <IRQ> | -t <AIKA> | -c <MERKIT> | -w <ODOTUS> | \n"
+"Käyttö: %s <laite> [ -i <IRQ> | -t <AIKA> | -c <MERKIT> | -w <ODOTUS> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9934,12 +9583,12 @@ msgstr "LPGETIRQ-virhe"
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s k�ytt�� IRQ:ta %d\n"
+msgstr "%s käyttää IRQ:ta %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s k�ytt�� kiertokysely�\n"
+msgstr "%s käyttää kiertokyselyä\n"
 
 #: text-utils/col.c:153
 #, c-format
@@ -9949,7 +9598,7 @@ msgstr "col: virheellinen -l -argumentti %s.\n"
 #: text-utils/col.c:535
 #, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "k�ytt�: col [-bfpx] [-l rivim��r�]\n"
+msgstr "käyttö: col [-bfpx] [-l rivimäärä]\n"
 
 #: text-utils/col.c:541
 #, c-format
@@ -9963,7 +9612,7 @@ msgstr "col: varoitus: varmistaminen ei onnistu %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
-msgstr "ensimm�isest� rivist� eteenp�in"
+msgstr "ensimmäisestä rivistä eteenpäin"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
@@ -9972,16 +9621,16 @@ msgstr "-- rivipuskuri on jo tyhjennetty"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "k�ytt�: %s [ - ] [ -2 ] [ tiedosto ... ]\n"
+msgstr "käyttö: %s [ - ] [ -2 ] [ tiedosto ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
-msgstr "liian pitk� rivi"
+msgstr "liian pitkä rivi"
 
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "k�ytt�: column [-tx] -c sarakkeet] [tiedosto ...]\n"
+msgstr "käyttö: column [-tx] -c sarakkeet] [tiedosto ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10001,17 +9650,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e muoto] [-f muototied] [-n pituus] [-s ohita] "
 "[tiedosto ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "k�ytt�: %s [-dflpcsu] [+rivinumero | +/hahmo] nimi1 nimi2 ...\n"
+msgstr "käyttö: %s [-dflpcsu] [+rivinumero | +/hahmo] nimi1 nimi2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: tuntematon signaali %s\n"
+msgstr "%s: tuntematon valitsin \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10022,8 +9671,7 @@ msgstr ""
 "*** %s: hakemisto ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10034,45 +9682,45 @@ msgstr ""
 "***** %s: Ei ole tekstitiedosto *****\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[K�yt� q tai Q lopettaaksesi]"
+msgstr "[Käytä q tai Q lopettaaksesi]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
-msgstr "--Lis��--"
+msgstr "--Lisää--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Seuraava tiedosto: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[V�lily�nti jatkaa, \"q\" lopettaa.]"
+msgstr "[Välilyönti jatkaa, \"q\" lopettaa.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
-msgstr "...%d sivua taaksep�in"
+msgstr "...%d sivua taaksepäin"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...1 sivu taaksep�in"
+msgstr "...1 sivu taaksepäin"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...ohitetaan yksi rivi"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
-msgstr "...ohitetaan %d rivi�"
+msgstr "...ohitetaan %d riviä"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10082,7 +9730,7 @@ msgstr ""
 "***Takaisin***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10090,12 +9738,12 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"Useimpia komentoja voi edelt�� valinnainen kokonaislukuargumentti k.\n"
+"Useimpia komentoja voi edeltää valinnainen kokonaislukuargumentti k.\n"
 "Oletusasetukset hakasulkeissa.\n"
-"Asteriskilla (*) merkityiss� komennoissa argumentista tulee uusi "
+"Asteriskilla (*) merkityissä komennoissa argumentista tulee uusi "
 "oletusarvo.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10117,74 +9765,74 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<v�li>                  N�yt� seuraavat k rivi� teksti� [nykyinen ruudun "
-"rivim��r�]\n"
-"z                       N�yt� seuraavat k rivi� teksti� [nykyinen ruudun "
-"rivim��r�]*\n"
-"<return>                N�yt� seuraavat k rivi� teksti� [1]*\n"
-"d tai ctrl-D            Vierit� k rivi� [nykyinen vieritysm��r�, alkuarvo 11]"
+"<väli>                  Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]\n"
+"z                       Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]*\n"
+"<return>                Näytä seuraavat k riviä tekstiä [1]*\n"
+"d tai ctrl-D            Vieritä k riviä [nykyinen vieritysmäärä, alkuarvo 11]"
 "*\n"
 "q tai Q or <keskeytys>  Poistu moresta\n"
-"s                       Ohita k rivi� ja siirry eteenp�in [1]\n"
-"f                       Ohita k ruutua teksti� ja siirry eteenp�in [1]\n"
-"b tai ctrl-B            Ohita k ruutua teksti� ja siirry taaksep�in [1]\n"
+"s                       Ohita k riviä ja siirry eteenpäin [1]\n"
+"f                       Ohita k ruutua tekstiä ja siirry eteenpäin [1]\n"
+"b tai ctrl-B            Ohita k ruutua tekstiä ja siirry taaksepäin [1]\n"
 "'                       Palaa kohtaan, josta edellinen haku alkoi\n"
-"=                       N�yt� nykyinen rivinumero\n"
-"/<s��nn�llinen lauseke> Etsi s��nn�llisen lausekkeen k:s esiintym� [1]\n"
-"n                       Etsi edellisen s��nn�llisen lausekkeen k:s esiintym� "
+"=                       Näytä nykyinen rivinumero\n"
+"/<säännöllinen lauseke> Etsi säännöllisen lausekkeen k:s esiintymä [1]\n"
+"n                       Etsi edellisen säännöllisen lausekkeen k:s esiintymä "
 "[1]\n"
-"!<kom> tai :!<kom>      K�ynnist� <kom> alikuoressa\n"
-"v                       K�ynnist� /usr/bin/vi nykyiselle riville\n"
-"ctrl-L                  Piirr� ruutu uudelleen\n"
+"!<kom> tai :!<kom>      Käynnistä <kom> alikuoressa\n"
+"v                       Käynnistä /usr/bin/vi nykyiselle riville\n"
+"ctrl-L                  Piirrä ruutu uudelleen\n"
 ":n                      Siirry k:nteen seuraavaan tiedostoon [1]\n"
 ":p                      Siirry k:nteen edelliseen tiedostoon [1]\n"
-":f                      N�yt� nykyinen tiedostonimi ja rivinumero\n"
+":f                      Näytä nykyinen tiedostonimi ja rivinumero\n"
 ".                       Toista edellinen komento\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
-msgstr "[N�pp�in \"h\" n�ytt�� ohjeita.]"
+msgstr "[Näppäin \"h\" näyttää ohjeita.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rivi %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ei tiedosto] rivi %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Ylivuoto\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...ohitetaan\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
-msgstr "Virhe s��nn�llisess� lausekkeessa"
+msgstr "Virhe säännöllisessä lausekkeessa"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Hahmoa ei l�ydy\n"
+"Hahmoa ei löydy\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
-msgstr "Hahmoa ei l�ydy"
+msgstr "Hahmoa ei löydy"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "haarauttaminen ei onnistu\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10192,26 +9840,26 @@ msgstr ""
 "\n"
 "...Ohitetaan"
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Vaihdetaan tiedostoon "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Palataan tiedostoon "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
-msgstr "Liian pitk� rivi"
+msgstr "Liian pitkä rivi"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
-msgstr "Ei edellist� komentoa korvattavaksi"
+msgstr "Ei edellistä komentoa korvattavaksi"
 
 #: text-utils/odsyntax.c:130
 #, c-format
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od: od(1) on vanhentunut, on suositeltavaa k�ytt�� hexdump(1).\n"
+msgstr "od: od(1) on vanhentunut, on suositeltavaa käyttää hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
@@ -10230,22 +9878,22 @@ msgstr "hexdump: tiedostoa %s ei voi lukea.\n"
 #: text-utils/parse.c:68
 #, c-format
 msgid "hexdump: line too long.\n"
-msgstr "hexdump: liian pitk� rivi.\n"
+msgstr "hexdump: liian pitkä rivi.\n"
 
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: tavum��r� useiden muunnosmerkkien kanssa.\n"
+msgstr "hexdump: tavumäärä useiden muunnosmerkkien kanssa.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr "hexdump: virheellinen tavum��r� muunnosmerkille %s.\n"
+msgstr "hexdump: virheellinen tavumäärä muunnosmerkille %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr "hexdump: %%s vaatii tarkkuuden tai tavum��r�n.\n"
+msgstr "hexdump: %%s vaatii tarkkuuden tai tavumäärän.\n"
 
 #: text-utils/parse.c:496
 #, c-format
@@ -10257,92 +9905,89 @@ msgstr "hexdump: virheellinen muoto {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: virheellinen muunnosmerkki %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: K�ytt�: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
+"%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
 "[tiedostot]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: valitsin vaatii argumentin -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: virheellinen valitsin -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...ohitetaan eteenp�in\n"
+msgstr "...ohitetaan eteenpäin\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...ohitetaan taaksep�in\n"
+msgstr "...ohitetaan taaksepäin\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ei seuraavaa tiedostoa"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "Ei edellist� tiedostoa"
+msgstr "Ei edellistä tiedostoa"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Lukuvirhe tiedostosta %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Odottamaton tiedoston loppu (EOF) tiedostossa %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: V�liaikaistiedostoa ei voi luoda\n"
+msgstr "%s: Väliaikaistiedostoa ei voi luoda\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
-msgstr "Virhe s��nn�llisess� lausekkeessa: "
+msgstr "Virhe säännöllisessä lausekkeessa: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(tiedoston loppu)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ei muistettua hakumerkkijonoa"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ei voi avata "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "tallennettu"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !-komento ei ole sallittu rajoitetussa tilassa.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "fork() ep�onnistui, yrit� my�hemmin uudelleen\n"
+msgstr "fork() epäonnistui, yritä myöhemmin uudelleen\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Seuraava tiedosto: "
 
@@ -10354,22 +9999,22 @@ msgstr "Puskuritilaa ei voi varata\n"
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "k�ytt�: rev [tiedosto ...]\n"
+msgstr "käyttö: rev [tiedosto ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "laitetta %s ei voi avata lukua varten\n"
+msgstr "Tiedostoa \"%s\" ei voi avata lukua varten\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "k�ytt�: %s [tiedosto]\n"
+msgstr "käyttö: tailf lokitiedosto\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "k�ytt�: %s [ -i ] [ -tTerm ] tiedosto...\n"
+msgstr "käyttö: %s [ -i ] [ -tTerm ] tiedosto...\n"
 
 #: text-utils/ul.c:152
 #, c-format
@@ -10379,7 +10024,7 @@ msgstr "ongelma luettaessa terminfoa"
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Tuntematon ohjaussarja sy�tteess�: %o, %o\n"
+msgstr "Tuntematon ohjaussarja syötteessä: %o, %o\n"
 
 #: text-utils/ul.c:425
 #, c-format
@@ -10389,59 +10034,209 @@ msgstr "Puskuria ei voi varata.\n"
 #: text-utils/ul.c:586
 #, c-format
 msgid "Input line too long.\n"
-msgstr "Sy�terivi on liian pitk�.\n"
+msgstr "Syöterivi on liian pitkä.\n"
 
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Virheellinen luku: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaksivirhe: \"%s\"\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Parametria ei ole asetettu: \"%s\"\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] laite nimi\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] laite koko sekt päät raidat venytys väli aste erik1 "
+#~ "fmt_väli\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] laite\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] laite\n"
+
+#~ msgid "version"
+#~ msgstr "versio"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "laitetta /dev/urandom ei voitu avata"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "tiedostosta /dev/urandom ei voitu lukea satunnaisdataa"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "tiedostoa %s ei voi avata lukua varten"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "tiedoston %s tilaa ei voi lukea"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "tiedoston %s tila ei ole oikea"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "tiedostosta %s ei voi lukea dataa"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Liian monta käyttäjää on jo kirjautuneena.\n"
+#~ "Yritä myöhemmin uudelleen.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Liian monta prosessia käynnissä.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Salasanassa on oltava vähintään kuusi merkkiä, yritä uudelleen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Salasanan merkkien on oltava seuraavista kahdesta ryhmästä:\n"
+#~ "isot ja pienet kirjaimet, numerot ja ei-alfanumeeriset\n"
+#~ "merkit. Lisätietoja manuaalisivulla passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Et voi uudelleenkäyttää vanhoja salasanoja.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Älä käytä mitään käyttäjätunnuksesi tapaista salasanana!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Älä käytä mitään oikean nimesi kaltaista salasanana!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Käyttö: passwd [käyttäjätunnus [salasana]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Vain pääkäyttäjä voi käyttää argumentteja.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Käyttö: passwd [-foqsvV] [käyttäjä [salasana]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ohjelmaa %s ei voi käynnistää: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Käyttäjätunnusta ei löydy"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Vain pääkäyttäjä voi vaihtaa muiden salasanoja.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Liian monta argumenttia.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Käyttäjätunnusta ei löydy mistään. Onko \"%s\" todella käyttäjä?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Valitan, pystyn muuttamaan vain paikallisia salasanoja. Käytä komentoa "
+#~ "yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID ja käyttäjänimi eivät vastaa toisiaan, huijari!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Vaihdetaan käyttäjän %s salasana\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Syötä vanha salasana: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Virheellinen salasana, huijari."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Syötä uusi salasana: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Salasanaa ei vaihdettu."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Syötä uusi salasana uudelleen: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Kirjoitit väärin. Salasanaa ei vaihdettu."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "salasana vaihdettu, käyttäjä %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "PÄÄKÄYTTÄJÄN SALASANA VAIHDETTU"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "pääkäyttäjä vaihtoi käyttäjän %s salasanan"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "kutsutaan setpwnam salasanan asettamiseksi.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Salasanaa *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Salasana vaihdettu.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: tämä versio on käännetty ilman tukea tyypille \"nfs\""
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Varoitus: poistetaan osion %d j�lkeiset osiot\n"
+#~ msgstr "Varoitus: poistetaan osion %d jälkeiset osiot\n"
 
 #~ msgid "mount: fs type %s not supported by kernel"
-#~ msgstr "mount: ydin ei tue tiedostoj�rjestelm�tyyppi� %s"
+#~ msgstr "mount: ydin ei tue tiedostojärjestelmätyyppiä %s"
 
 #~ msgid "BLKGETSIZE ioctl failed for %s\n"
-#~ msgstr "BLKGETSIZE-ioctl ep�onnistui laitteelle %s\n"
+#~ msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
 #~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: ei ole k��nnetty minix v2 -tuen kanssa\n"
+#~ msgstr "%s: ei ole käännetty minix v2 -tuen kanssa\n"
 
 #~ msgid "mount: %s duplicate - not mounted"
-#~ msgstr "mount: %s on kaksinkertainen - ei liitet�"
+#~ msgstr "mount: %s on kaksinkertainen - ei liitetä"
 
 #~ msgid "UUID"
 #~ msgstr "UUID:"
 
 #~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-#~ msgstr "mount: nimi� %s esiintyy sek� paikassa %s, ett� %s - ei liitet�\n"
+#~ msgstr "mount: nimiö %s esiintyy sekä paikassa %s, että %s - ei liitetä\n"
 
 #~ msgid "Boot (%02X)"
-#~ msgstr "K�ynnistett�v� (%02X)"
+#~ msgstr "Käynnistettävä (%02X)"
 
 #~ msgid "None (%02X)"
-#~ msgstr "Ei mit��n (%02X)"
+#~ msgstr "Ei mitään (%02X)"
 
 #~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-#~ msgstr "%s: [%04x]:%ld (%s) siirtym� %d, %s-salaus\n"
+#~ msgstr "%s: [%04x]:%ld (%s) siirtymä %d, %s-salaus\n"
 
 #~ msgid ""
 #~ "mount: Could not find any loop device.\n"
 #~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "mount: Yht��n loop-laitetta ei l�ytynyt.\n"
-#~ "       Ehk� tiedostoilla /dev/loop# on v��r� major-arvo?"
+#~ "mount: Yhtään loop-laitetta ei löytynyt.\n"
+#~ "       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
 
 #~ msgid ""
 #~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
 #~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
 #~ "       maybe /dev/loop# has the wrong major number?"
 #~ msgstr ""
-#~ "mount: Ei l�ytynyt yht��n loop-laitetta. Ehk� t�m� ydin ei ole tietoinen\n"
-#~ "       loop-laitteesta (k��nn� uudelleen tai \"insmod loop.o\"), tai\n"
-#~ "       ehk� /dev/loop#:in major-arvo on v��r�?"
+#~ "mount: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
+#~ "       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
+#~ "       ehkä /dev/loop#:in major-arvo on väärä?"
 
 #~ msgid "Init (up to 16 hex digits): "
 #~ msgstr "Alkuarvo (korkeintaan 16 heksanumeroa): "
@@ -10450,7 +10245,7 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgstr "Ei-heksanumero \"%c\".\n"
 
 #~ msgid "Don't know how to get key for encryption system %d\n"
-#~ msgstr "Avaimen haku salausj�rjestelm�lle %d ei ole tuettu\n"
+#~ msgstr "Avaimen haku salausjärjestelmälle %d ei ole tuettu\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Osion %i loppu ei ole sylinterin rajalla:\n"
@@ -10465,6 +10260,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Levy %1$s: %2$d p��t�, %3$d sektoria, %4$d sylinteri�\n"
-#~ "Yksik�t = %6$d * %7$d -tavuiset %5$s\n"
+#~ "Levy %1$s: %2$d päätä, %3$d sektoria, %4$d sylinteriä\n"
+#~ "Yksiköt = %6$d * %7$d -tavuiset %5$s\n"
 #~ "\n"
diff --git a/po/fr.gmo b/po/fr.gmo
new file mode 100644
index 000000000..b24fdafa7
--- /dev/null
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index d9d6b9aed..6d6e90231 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2005-01-02 12:00-0500\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-28 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -117,7 +117,7 @@ msgstr "%s: erreur ioctl() sur %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   D�but Sec    Taille  P�riph�rique\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "usage:\n"
@@ -161,13 +161,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "usage: %s [ -n ] p�riph�rique\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -192,7 +191,7 @@ msgstr "Double"
 msgid "Single"
 msgstr "Simple"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -207,103 +206,103 @@ msgstr ""
 " -v         travailler en mode bavard\n"
 " file       fichier � tester\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: erreur %d lors de la d�compression! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: erreur taille dans le lien symbolique � %s �\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  d�compression du bloc � %ld vers %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: mode bogus sur � %s � (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  trou � %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: (%ld) octets de type non bloc\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: (%ld vs %ld) octets de type non taille\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: cramfs invalide -- longueur invalide du chemin\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: compil� sans support de -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 "%s: AVERTISSEMENT -- incapable de d�terminer la taille du syst�me de "
 "fichiers\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s n'est pas un p�riph�rique de type bloc ou de fichiers\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: cramfs invalide -- longueur du fichier trop courte\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: cramfs invalide -- nombre magique erron�\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 "%s: AVERTISSEMENT - longueur du fichier trop longue, remplissage de "
 "l'image?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: cramfs invalide -- erreur CRC\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: AVERTISSEMENT -- vieille image cramfs, sans CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: cramfs invalide -- superbloc erron�\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: cramfs invalide -- fin des donn�es du r�pertoire (%ld) != d�but des "
 "donn�es du fichier (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: cramfs invalide -- d�calage invalide des donn�es du fichier\n"
@@ -785,7 +784,7 @@ msgstr "trop d'inodes - maximum est 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pas suffisamment d'espace, a besoin au moinds de %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "P�riph�rique: %s\n"
@@ -854,20 +853,20 @@ msgstr "erreur d'�criture de l'entr�e � .. �"
 msgid "error closing %s"
 msgstr "erreur de fermeture %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Usage: mkfs [-V] [-t type-syst�me-de-fichiers] [options] p�ridph�rique "
 "[taille]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: m�moire �puis�e!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -933,7 +932,6 @@ msgstr ""
 "D�passement de MAXENTRIES. Augmenter la valeur dans mkcramfs.c et "
 "recompiler. Fin d'ex�cution.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -988,10 +986,6 @@ msgstr "pas assez d'espace allou� pour l'image ROM (%Ld allou�, %d utilis�)\n"
 msgid "ROM image write failed (%d %d)\n"
 msgstr "�chec de l'�criture de l'image dans le ROM (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1072,7 +1066,6 @@ msgstr "incapable d'�crire les inodes"
 msgid "write failed in write_block"
 msgstr "�chec d'�criture dans write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1108,7 +1101,7 @@ msgstr "�ched de rep�rage durant l'examen des blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeur �tranges dans do_check: probablement un bug\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "�chec de rep�rage dans check_blocks"
 
@@ -1151,109 +1144,111 @@ msgstr "incapable d'�valuer par stat() %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "n'essayera pas de cr�er un syst�me de fichiers sur � %s �"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Taille de page erron�e tel que sp�cifi�e par l'usager %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Utilise la taille de page sp�cifi�e par l'usager %d, au lieu de %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "On assume des pages de taille %d (pas %d)\n"
+msgstr "On assume des pages de taille %d (et non pas de %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Taille erron�e d'en-t�te de swap, aucune �tiquette n'a �t� �crite.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "L'�tiquette a �t� tronqu�e.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "�tiquette"
+msgstr "pas d'�tiquette, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "pas de uuid\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr "Usage: %s [-c] [-v0|-v1] [-pTAILLE-PAGES] /dev/name [blocs]\n"
+msgstr ""
+"Usage: %s [-c] [-v0|-v1] [-pTAILLE-PAGES][-L �tiquette] /dev/name [blocs]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "trop de pages corrompus"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "M�moire �puis�e"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "une page corrompue\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pages corrompues\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: erreur: aucun endroit pour d�finir un espace d'�change (swap)?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: erreur: taille %lu est plus grande que la taille du p�riph�rique %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: erreur: version inconnue %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 "%s: erreur: zone d'�change (swap) a besoin d'une taille d'au moins %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: AVERTISSEMENT: truncation de la zone d'�change (swap) � %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: erreur: aucun endroit pour d�finir un espace d'�change (swap)?\n"
+msgstr ""
+"%s: erreur: �tiquette avec seulement un espace d'�changer (swap) de type v1\n"
 
 # disk-utils/mkswap.c:566
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Ne tentera pas de cr�er un p�riph�rique de type swap sur � %s �"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ERREUR FATALE: la premi�re page est illisible"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1269,127 +1264,88 @@ msgstr ""
 "pour forcer sa cr�ation.\n"
 
 # disk-utils/mkswap.c:605
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Incapable de fixer l'espace de swap: illisible"
 
 # disk-utils/mkswap.c:606
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr ""
 "Initialisation de la version de l'espace de swap %d, taille = %llu kB\n"
 
 # disk-utils/mkswap.c:612
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "incapable de rembobiner le p�riph�rique de swap"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "incapable d'�crire la page de signature"
 
 # disk-utils/mkswap.c:623
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "�chec de la synchronisation du syst�me de fichiers par fsync"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Nombre invalide: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Erreur de syntaxe: � %s �\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Aucun param�tre de ce type initialis�: � %s �\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] p�riph�rique nom\n"
-
-# disk-utils/setfdprm.c:101
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] p�riph�rique taille sect t�tes pistes stretch intervalle taux "
-"spec1 format_de_intervalle\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] p�riph�rique\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] p�riph�rique\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilisable"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espace libre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disque a �t� chang�.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "R�amorcer le syst�me pour s'assurer que la table de partition a �t� "
 "correctement mise � jour.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1402,327 +1358,308 @@ msgstr ""
 "partition DOS 6.x, svp consulter les pages du manuel\n"
 "de cfdisk pour de plus amples informations.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERREUR FATALE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Appuyer n'importe quelle cl� pour quitter cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Ne peut effectuer de rep�rage sur l'unit� de disque"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Ne peut lire � partir de l'unit� de disque"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Ne peut lire de l'unit� de disque"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Trop de partitions"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partition d�bute avant le secteur 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partition se termine avant le secteur 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partition d�bute apr�s la fin du disque"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partition se termine apr�s la fin du disque"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition se termine dans le cylindre final"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "partitions logiques ne sont pas en ordre sur le disque"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "chevauchement des partitions logiques"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "chevauchement des partitions logiques qui ont �t� grossies"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Erreur interne cr�ant un disque logique sans partition �tendue !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Ne peut cr�er un disque logique ici -- cela cr�erait 2 partitions �tendues"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu trop long. Le menu pourrait para�tre erron�."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sans direction. Mis en horizontal par d�faut."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Cl� ill�gale"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Appuyer sur une touche pour continuer"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Cr�er une nouvelle partition primaire"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logique"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Cr�er une nouvelle partition logique"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annuler"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Ne pas cr�er une partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Erreur interne !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Taille (en MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "D�but"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Ajouter une partition au d�but de l'espace libre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Ajouter une partition � la fin de l'espace libre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Pas d'espace pour cr�er une partition �tendue"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Aucune table de partitions.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Aucune table de partitions. On commence avec une table � z�ro."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Signature erron�e dans la table de partitions"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Type inconnu de table de partitions"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Voulez-vous d�buter avec une table � z�ro [y (pour oui)/N (pour non)]"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Vous avez sp�cifi� plus de cylindres que le disque ne peut contenir"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Ne peut ouvrir l'unit� de disque"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disque ouvert en mode lecture seulement - aucune permission d'�criture"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Ne peut obtenir la taille du disque"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partition primaire erron�e"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partition logique erronn�e"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "AVERTISSEMENT!!  Cela pourrait d�truire les donn�es sur votre disque!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "�tes-vous certain de vouloir �crire la table de partitions sur le disque? "
 "yes (pour oui) ou no (pour non)"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "non"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "N'a pas �crit la table de partitions sur le disque"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "oui"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "SVP r�pondre � yes � (pour oui) ou � no � (pour non)"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "�criture de la table de partitions sur le disque..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Table de partitions �crite sur le disque"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Table de partitions �crite, �chec de la relecture. R�amorcer pour mettre � "
 "jour la table."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr "Aucune partition primaire marqu� amor�able. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Plus d'une partition primaire marqu� amor�able. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Entrer le nom du fichier ou appuyer � RETURN � pour affichage � l'�cran:"
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ne peut ouvrir le fichier � %s �"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unit� de disque: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Secteur 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Secteur %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Aucun   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primaire"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logique"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Amorce"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Aucun"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Table de partitions de %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Premier     Dernier\n"
 
 # fdisk/cfdisk.c:1969
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1730,7 +1667,7 @@ msgstr ""
 " # Type       Secteur     Secteur  Offset    Longueur Sys.FichierType (ID) "
 "Fanions\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1738,481 +1675,478 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- D�but  ---      ---- Fin  ----    D�but     Num�ro de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Fan.  T�te Sect Cyl   ID  T�te Sect Cyl     Secteur   Secteurs\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Brut"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Afficher le contenu de la table en format brut"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Secteurs"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Afficher le contenu de la table ordonn� par secteurs"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Table"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Afficher juste le contenue de la table de partitions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Ne pas afficher le contenu de la table"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "�cran d'aide pour cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk, est un programme de partionnement bas� sur curses. cfdisk"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permet de cr�er, d�truire et modifier les partitions de votre unit� de"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "disque dur."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Commande     Signification"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          basculer le fanion d'amorce sur la partition courante"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          d�truire la partition courante"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          modifier les param�tres: cylindres, t�tes, secteurs par piste"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVERTISSEMENT: cette option ne doit pas �tre utilis� par"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             des gens qui ne savent pas ce qu'ils font."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          afficher cet �cran d'aide"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          maximiser l'usage du disque de la partition courante"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Note: cela peut rendre la partition incompatible avec"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          cr�er une nouvelle partition � partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          afficher le contenu de la table de partitions � l'�cran ou dans "
 "un fichier"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Il y a plusieurs formats diff�rents pour la partition"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             que vous d�sirez:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - donn�es brutes (exactement ce que vous �crivez sur le "
 "disque)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - table ordonn�e par secteurs"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - table en format brut"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          quitter le programme sans �crire la table de partitions"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          modifier le type de syst�me de fichiers"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          modifier les unit�s d'affichage de la taille des partition"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             faire la rotation avec MB, secteurs et cylindres"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          �crire la table de partitions sur le disque (taper W en "
 "majuscule)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "             �tant donn� que cela peut d�truire des donn�es sur le disque, "
 "vous devez"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             confirmer ou annuler la commande par la r�ponse � yes � (pour "
 "oui) ou"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             � no � (pour non)"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Fl�che-haut  d�placer le curseur vers la partition pr�c�dente"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Fl�che-bas   d�placer le curseur vers la partition suivante"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       r�afficher le contenu � l'�cran"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          afficher cet �cran d'aide"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Note: toutes les commandes peuvent �tre soumises en lettres"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "majuscules ou minuscules (sauf pour les �critures)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindres"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Modifier la g�om�trie des cylindres"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "T�tes"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Modifier la g�om�trie de t�te"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Modifier la g�om�trie de secteur"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Compl�t�"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Modification de la g�om�trie compl�t�"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Entrer le nombre de cylindres: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valeur ill�gale pour les cylindres"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Entrer le nombre de t�tes: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valeur ill�gale pour les t�tes"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Entrer le nombre de secteurs par piste: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valeur ill�gale pour les secteurs"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Entrer le type de syst�me de fichiers:"
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Ne peut modifier le type de SF pour aucun type"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Ne peut modifier le type de SF � �tendu"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Inconnu (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unit� de disque: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Taille: %lld octets,  %lld Mo"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Taille: %lld octets,  %lld.%lld Go"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "T�tes: %d   Secteurs par piste: %d  Cylindres: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Fanions"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part Type"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Type SF"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[�tiq.]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Secteurs"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindres"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Taille (Mo)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Taille (Go)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Amor�able"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Basculer le fanion d'amorce pour la partition courante"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "D�truire"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "D�truire la partition courante"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "G�om�trie"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Modifier la g�om�trie du disque (pour expert seulement)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Aide"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Afficher l'�cran d'aide"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiser l'usage du disque de la partition courante (experts seulement)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nouveau"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Cr�er une nouvelle partition � partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Afficher"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 "Afficher le contenu de la table de partitions � l'�cran (ou dans un fichier)"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Quitter"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Quitter le programme sans �crire la table de partitions"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Modifier le type de syst�me de fichier (DOS, Linux, OS/2, etc)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unit�s"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mofifier les unit�s d'affichage des taille des partitions (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "�crire"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "�Crire la table de partitions sur le dsique (cela peut d�truire les donn�es)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Ne peut cr�er cette partition comme �tant amor�able"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Ne peut d�truire une partition vide"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Ne peut maaximiser cette partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Cette partition est inutilisable"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Cette partition est d�j� en usage"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Ne peut changer le type d'une partition vide"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Pas de partition disponible"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Commande ill�gale"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright � 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2287,9 +2221,9 @@ msgstr ""
 "\n"
 "�tiquette BSD sur le p�riph�rique: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Commande action"
 
@@ -2309,10 +2243,9 @@ msgstr "   i   installer une amorce"
 msgid "   l   list known filesystem types"
 msgstr "   l   lister les types de syst�me de fichiers connus"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   afficher ce menu"
 
@@ -2324,14 +2257,14 @@ msgstr "   n   ajouter une nouvelle partition BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   afficher la table de partitions BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   quitter sans faire de sauvegarde"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   retourner au menu principal"
 
@@ -2374,13 +2307,13 @@ msgstr "Il n'y a pas de partition *BSD sur %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Commande d'�tiquetage BSD (m pour de l'aide): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
@@ -2425,8 +2358,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " mauvais secteur"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2527,8 +2458,8 @@ msgstr "secteurs/piste"
 msgid "tracks/cylinder"
 msgstr "pistes/cylindre"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindres"
 
@@ -2585,7 +2516,7 @@ msgstr "Amorce install�e sur %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Le nombre maximum de partitions a �t� cr��\n"
@@ -2609,7 +2540,7 @@ msgstr ""
 "\n"
 "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2630,7 +2561,7 @@ msgstr ""
 "-u: donne le D�but et la Fin en unit�s de secteurs (au lieu de cylindres)\n"
 "-b 2048: (pour certains disques MO) utilise 2048-octets par secteur\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2647,198 +2578,184 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Incapable d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Incapable de lire %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Incapable de rep�rage sur %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Incapable d'�crire %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "�chec de BLKGETSIZE ioctl sur %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Incapable d'allouer de la m�moire additionnelle\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "ERREUR FATALE\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   basculer le fanion de lecture seulement"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �diter l'�tiquette BSD du disque"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   basculer le fanion mount"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   d�truire la partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lister les types de partitions connues"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ajouter une nouvelle partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cr�er une nouvelle table vide de partitions DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   afficher la table de partitions"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cr�er une nouvelle �tiquette vide pour disque de type Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   modifier l'identificateur de la partition syst�me"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   modifier l'affichage et la saisie des unit�s"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   v�rifier la table de partitions"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   �crire la table sur le disque et quitter"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fonctionnalit� additionnelle (pour experts seulement)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   s�lectionner une partition amor�able"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   �ditier l'entr�e du fichier d'amorce"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   s�lectionner une partition swap ppour SGI"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   bascule le fanion d'amorce"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   basculer le fanion de compatibilit� DOS"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifier le nombre de cylindres alternatifs"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   modifier le nombre de cylindres"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   afficher les donn�es brutes de la table de partition"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifier le nombre de secteurs additionnels par cylindre"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   modifier le nombre de t�tes"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   changer le facteur d'inter-feuillage"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifier la vitesse de rotation en tour par minute (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifier le nombre de secteurs par piste"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifier le nombre de cylindres physiques"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   d�placer le d�but des donn�es dans une partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   lister les partitions �tendues"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   cr�er une table de partitions de type IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   fixer l'ordonnancement des partitions"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Vous devez initialiser"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "t�tes"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "secteurs"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2847,11 +2764,11 @@ msgstr ""
 "%s%s.\n"
 "Vous pouvez faire cela � partir du menu des fonctions additionnelles.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " et "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2872,12 +2789,12 @@ msgstr ""
 "2) logiciels d'amor�age et de partitionnement pour d'autres SE\n"
 "   (i.e., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "D�calage erron�e dans la partition primaire �tendue\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2886,18 +2803,18 @@ msgstr ""
 "AVERTISSEMENT: omission des partitions apr�s #%d.\n"
 "Elles seront d�truites si vous sauvegardez cette table de partition.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "AVERTISSEMENT: pointeur additionnel dans la table de partitions %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "AVERTISSEMENT: donn�es surperflues ignor�es dans la table de partition %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2912,17 +2829,17 @@ msgstr ""
 "ne sera par r�cup�rable.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Note: taille de secteur est %d (et non pas %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Vous ne serez pas capable d'�crire la table de partitions.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2931,7 +2848,7 @@ msgstr ""
 "Ce disque a des nombres magiques � la fois DOS et BSD.\n"
 "Ex�cuter la commande 'b' pour passer en mode BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2940,17 +2857,17 @@ msgstr ""
 "Le p�riph�rique ne contient ni une partition ni une �tiquette DOS, Sun, SGI "
 "ou OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Erreur interne\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Partition additionnelle �tendue ignor�e %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2959,7 +2876,7 @@ msgstr ""
 "AVERTISSEMENT: fanion 0x%04x invalide de la table de partitions %d sera "
 "corrig� par w(�criture)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2968,83 +2885,83 @@ msgstr ""
 "\n"
 "a obtenu EOF 3 fois - fin du programme...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Code Hex (taper L pour lister les codes): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, par d�faut %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Utilisation de la valeur par d�faut %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valeur hors limites.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Num�ro de partition"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "AVERTISSEMENT: partition %d a un type vide\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition s�lectionn�e %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Aucune partition n'est d�finie encore!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Toutes les partitions primaires ont d�j� �t� d�finies!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "secteur"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modification des unit�s d'affichage/saisie � %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVERTISSEMENT: Partition %d est une partition �tendue\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Fanion de compatibilit� DOS est initialis�\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Fanion de compatibilit� DOS n'est initialis�\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d n'existe pas encore!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3057,7 +2974,7 @@ msgstr ""
 "type 0 n'est pas recommand�. Vous pouvez d�truire\n"
 "la partition en utilisant la commande � d �.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3066,7 +2983,7 @@ msgstr ""
 "Vous ne pouvez la modifier en partition �tendue et vice versa.\n"
 "Vous devez la d�truire d'abord.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3077,7 +2994,7 @@ msgstr ""
 "tel que SunOS/Solaris l'exige et tel que qu'il est pr�f�rable  pour Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3088,52 +3005,52 @@ msgstr ""
 "et la partition 11 comme un volume entier (6) tel que IRIX l'exige.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Type de partition syst�me modifi� de %d � %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d a des d�buts diff�rents physique/logique (non Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logique=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d a des fins diff�rentes physique/logique:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i ne d�bute pas sur une fronti�re de cylindre:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "devrait �tre (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partition %i ne se termine pas sur une fronti�re de cylindre.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "devrait �tre (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3142,7 +3059,7 @@ msgstr ""
 "\n"
 "Disque %s: %ld Mo, %lld octets\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3151,17 +3068,17 @@ msgstr ""
 "\n"
 "Disque %s: %ld.%ld Go, %lld octets\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d t�tes, %d secteurs/piste, %d cylindres"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu secteurs"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3170,7 +3087,7 @@ msgstr ""
 "Unit�s = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3179,7 +3096,7 @@ msgstr ""
 "Rien � faire. L'ordonnancement est d�j� correct.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3190,16 +3107,16 @@ msgstr ""
 "Probablement vous avez s�lectionn� le mauvais p�riph�rique.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Amorce    D�but         Fin      Blocs    Id  Syst�me\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "P�riph�rique"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3208,7 +3125,7 @@ msgstr ""
 "\n"
 "Les entr�es de la table de partitions ne sont pas dans l'ordre du disque\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3219,84 +3136,84 @@ msgstr ""
 "Disq %s: %d t�tes, %d secteurs, %d cylindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     D�but      Tail.ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "AVERTISSEMENT: partition %d contient un secteur 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: t�te %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: secteur %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitions %d: cylindre %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: secteurs pr�c�dents %d ne concorde pas avec le total %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "AVERTISSEMENT: start-of-data erron� dans la partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "AVERTISSEMENT: la partition %d chevauche la partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "AVERTISSEMENT: la partition %d est vide\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partition logique %d n'est pas enti�rement dans la partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Nombre total de secteurs allou�s %d est plus grand que le maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld secteurs non-allou�s\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d est d�j� d�fini.  La d�truire avant de la rajouter.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Secteur %d est d�j� allou�\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Aucun secteur disponible\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3310,24 +3227,24 @@ msgstr ""
 "\tune nouvelle table de partition DOS vide. (Utiliser o.)\n"
 "\tAVERTISSEMENT: cela va d�truire le contenu du disque pr�sent.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Vous devez d�truire quelques partitions et ajouter une partition �tendue "
 "d'abord\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Toutes les partitions logiques sont utilis�es\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Ajout d'une partition primaire\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3338,20 +3255,20 @@ msgstr ""
 "   %s\n"
 "   p   partition primaire (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logique (5 ou plus)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   �tendue"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Num�ro invalide de partition pour le type � %c �\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3360,12 +3277,12 @@ msgstr ""
 "La table de partitions a �t� alt�r�e!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Appel de ioctl() pour relire la table de partitions.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3379,7 +3296,7 @@ msgstr ""
 "Le kernel va continuer d'utiliser l'ancienne table.\n"
 "La nouvelle table sera utilis� lors du prochain r�amor�age.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3392,7 +3309,7 @@ msgstr ""
 "svp consulter les pages du manuel de fdisk pour des informations\n"
 "additionnelles.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3401,68 +3318,68 @@ msgstr ""
 "\n"
 "Erreur de fermeture du fichier\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d n'a pas de zone de donn�es\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nouveau d�but des donn�es"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Commande pour experts (m pour de l'aide): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Numbre de cylindres"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Numbre de t�tes"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Numbre de secteurs"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "AVERTISSEMENT: initialisation du d�calage de secteur pour compatibilit� DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disque %s ne contient pas une table de partition valide\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: commande inconnue\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Ce kernel rep�re lui-m�me la taille des secteurs - -b option ignor�e\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3471,19 +3388,18 @@ msgstr ""
 "AVERTISSEMENT: l'option -b (initialis� la taille de secteur) doit �tre "
 "utilis� avec le p�riph�rique sp�cifi�\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "D�tection d'une �tiquette de disque pour OSF/1 sur %s, passage en mode "
 "d'�dition d'�tiquette.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Commande (m pour l'aide): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3492,16 +3408,16 @@ msgstr ""
 "\n"
 "Le fichier courant d'amor�age est: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "SVP entrer le nom du nouveau fichier d'amor�age: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Fichier d'amor�age n'a pas �t� modifi�\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3569,15 +3485,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3657,7 +3573,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s secteur%5u taille%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3715,7 +3630,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Plus d'une entr�e enti�re de disque pr�sente.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Aucune partition d�finie\n"
@@ -3802,7 +3717,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVous avez choisi un nom de fichier d'amorce inhabituel.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3824,11 +3738,10 @@ msgstr ""
 "Taper YES (pour oui) si vous �tes certain de l'�tiquetage diff�rent de cette "
 "partition.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES (pour oui)\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3909,45 +3822,44 @@ msgstr "Tentative de conservation des param�tres de la partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tD�BUT=%d\tLONGUEUR=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vide"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disque entier"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
 # fdisk/fdisksunlabel.c:132
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3960,12 +3872,12 @@ msgstr ""
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "L'autoconfiguration a rep�r� %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3979,7 +3891,7 @@ msgstr ""
 "sera irr�cup�rable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3990,74 +3902,74 @@ msgstr ""
 "   0   configuration manuelle (� l'aide de la d�tection\n"
 "        mat�rielle des param�tres par d�faut)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 "S�lectionner le type (? pour autoconfiguration, 0 pour configuration "
 "manuelle)"
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "�chec d'autoconfiguration.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Secteurs/piste"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cylindres physiques"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Facteur d'inter-feuillage"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs additionnels par cylindre"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Vous pouvez modifier toues les param�tres du disque � partir du menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" disquette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Configuration Linux"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partition %d ne se termine pas sur une fronti�re de cylindre\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partition %d en chevauche d'autres dans les secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espace inutilis� - secteurs 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espace inutilis� - secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4066,7 +3978,7 @@ msgstr ""
 "D'autres partitions couvrent d�j� le disque entier.\n"
 "En d�truire/r�duire quelques unes avant de r�-essayer.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4077,7 +3989,7 @@ msgstr ""
 "mais la valeur %d %s en couvre d'autres. Votre entr�e a �t� modifi�e\n"
 "� %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4087,7 +3999,7 @@ msgstr ""
 "laisser cette\n"
 "partition comme disque entier (5), d�butant � 0, avec les secteurs %u\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4103,7 +4015,7 @@ msgstr ""
 "soit �tiquet�e 82 (Linux swap): "
 
 # fdisk/fdisksunlabel.c:656
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4122,7 +4034,7 @@ msgstr ""
 "Unit�s = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4135,16 +4047,16 @@ msgstr ""
 "Unit�s = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Fanions D�but       Fin    Blocs    Id  Syst�me\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -4168,32 +4080,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4202,7 +4108,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4295,12 +4200,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4321,8 +4224,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4332,7 +4233,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD or SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4353,12 +4253,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
@@ -4387,12 +4285,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4401,7 +4297,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4466,30 +4361,22 @@ msgstr "Non-FS data"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4498,119 +4385,112 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erreur de rep�rage sur %s - ne peut rep�rer %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erreur de rep�rage: d�sir� 0x%08x%08x, obtenu 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "m�moire �puis�e - abandon\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erreur de lecture sur %s - ne peut lire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERREUR: secteur %lu n'a pas un signature MS-DOS\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Erreur d'�criture sur %s - ne peut �crire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ne peut ouvrir le fichier de sauvegarde de secteur de partition (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "erreur d'�criture sur %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 "ne peut �valuer par stat() le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "le fichier de recouvrement de partition a une taille erron�e - pas de "
 "recouvrement\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "m�moire �puis�e?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "ne peut ouvrir le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "erreur de lecture %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ne peut ouvrir le p�riph�rique %s pour �criture\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erreur d'�criture du secteur %lu sur %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disque %s: ne peut obtenir la g�om�trie\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disque %s: ne peut obtenir sa taille\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4621,23 +4501,23 @@ msgstr ""
 "un disque entier. Utiliser fdisk n'aurait probablement pas de sens.\n"
 "[Utiliser l'option --force si vous d�sirez faire cela]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il a %lu t�tes\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il y a %lu secteurs\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "AVERTISSEMENT: BLKGETSIZE/HDIO_GETGEO indique qu'il y a %lu cylindres\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4647,7 +4527,7 @@ msgstr ""
 "Cela occasionnera des probl�mes avec tous les logiciels qui utilisent un "
 "adressage C/H/S.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4656,7 +4536,7 @@ msgstr ""
 "\n"
 "Disque %s: %lu cylindres, %lu t�tes, %lu secteurs/piste\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4664,7 +4544,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour la t�te: %lu (devrait "
 "�tre 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4673,7 +4553,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le secteur: %lu (devrait "
 "�tre 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4682,7 +4562,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour les cylindres: %lu "
 "(devrait �tre 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4691,12 +4571,12 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relecture de la table de partitions ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4704,31 +4584,31 @@ msgstr ""
 "La commande de relecture de la table de partitions a �chou�e.\n"
 "R�-amorcer le syst�me maintenant, avant d'utiliser mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erreur de fermeture %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: pas de telle partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "format non reconnu - utilisation de secteurs\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# table de partitions de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format non implant� - using %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4738,12 +4618,12 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   P�riph Amor D�but     Fin   #cyls    #blocs    Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4752,12 +4632,12 @@ msgstr ""
 "Unit�s= secteurs de 512 octets, d�compte � partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   P�riph Amorce  D�but       Fin   #secteurs Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4766,12 +4646,12 @@ msgstr ""
 "Unit�s= blocs de 1024 octets, d�compte � partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   P�riph Amorce D�but       Fin    #blocs    Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4781,32 +4661,32 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   P�riph Amor D�but   Fin     Mo    #blocs    Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\td�but: (c,h,s) expect� (%ld,%ld,%ld) trouv� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tfin: (c,h,s) expect� (%ld,%ld,%ld) trouv� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition se termine sur le cylindre %ld, au del� de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Aucune partition rep�r�e\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4817,54 +4697,54 @@ msgstr ""
 "  pour C/H/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
 "Pour ce rapport, la g�om�trie suivante sera assum�e.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "aucune table de partitions pr�sente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "�trange, seulement %d partitions d�finies.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 mais n'est pas marqu�e Empty\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "AVERTISSEMENT: partition %s a une taille 0 et est amor�able\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 et une adresse de d�but non � "
 "z�ro\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "AVERTISSEMENT: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n'est par contenue dans la partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "AVERTISSEMENT: partitions %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "et %s se chevauchent\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4874,17 +4754,17 @@ msgstr ""
 "(secteur %lu),\n"
 "et cela la d�truira lorsqu'elle se remplira\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "AVERTISSEMENT: la partition %s d�bute au secteur 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "AVERTISSEMENT: la partition %s s'�tend au del� de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4892,20 +4772,20 @@ msgstr ""
 "Parmi les partitions primaires, au plus une seule peut �tre �tendue\n"
 " (quoique cela ne soit pas un probl�me sous Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 "AVERTISSEMENT: la partition %s ne d�bute pas sur une fronti�re de cylindre\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 "AVERTISSMENT: la partition %s ne se termine pas sur une fronti�re de "
 "cylindre\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4914,7 +4794,7 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "ce disque.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4922,7 +4802,7 @@ msgstr ""
 "AVERTISSEMENT: habituellement une seule permet l'amor�age � partir d'une\n"
 "partition primaire LILO ne s'occupe pas du fanion d'amor�age.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4931,33 +4811,33 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "pas ce disque.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "d�but"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: d�but: (c,h,s) esp�r� (%ld,%ld,%ld) trouv� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "fin"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "partition %s: fin: (c,h,s) esp�r� (%ld,%ld,%ld) trouv� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition %s se termine sur le cylindre %ld, au del� de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4966,7 +4846,7 @@ msgstr ""
 "AVERTISSEMENT: d�but d�cal� de la partition �tendue de %ld � %ld\n"
 "(pour fins d'affichage seulement. Ne modifier pas le contenu.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4974,134 +4854,133 @@ msgstr ""
 "AVERTISSEMENT: la partition �tendue ne d�bute pas sur une fronti�re de.\n"
 "cylindres DOS et Linux interpr�teront les contenus diff�remment.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "top de partitions - celles au del� de nr (%d) sont ignor�es\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "arbre de partitions?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gestionnaire de disque d�tect� - incapable de traiter cela\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "signature DM6 signature rep�r� - abandon\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "�trange..., une partition �tendue de taille 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "�trange..., une partition BSD de taille 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: type non reconnu de table de partition\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flag a �t� utilis�: rien n'a chang�\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "�chec de sauvegarde des vieux secteurs - abandon\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "�chec de l'�criture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "ligne d'entr�e longue ou incompl�te - abandon\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erreur d'entr�e: � = � esp�r� apr�s le champ %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erreur d'entr�e: caract�re inattendu %c apr�s le champ %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entr�e non reconnu: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "numbre trop grand\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "rebut apr�s le nombre\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "aucun espace pour le descripteur de partition\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "ne peut construire autour de la partition �tendue\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "trop de champs � l'entr�e\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Aucun espace pour en accepter d'avantage\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Type ill�gal\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "AVERTISSEMENT: la taille donn�e (%lu) exc�de la taille maximale allouable (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "AVERTISSEMENT: partition vide\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "AVERTISSEMENT: d�but de partition corrompu (auparavant %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "fanion d'amor�age non reconnu - choisir � - � ou � * �\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "sp�cification partielle c,h,s?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Partition �tendue par � l'endroit attendu\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entr�e erron�e\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "trop de partitions\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5113,47 +4992,43 @@ msgstr ""
 "Habituellement vous n'avez besoin que de sp�cifier:\n"
 "<d�but> et <taille> (et parfois <type>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Usage: %s [options] p�riph�rique ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "p�riph�rique: quelque chose comme /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "options utiles:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lister la taille d'une partition"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [ou --id]:        afficher ou modifier l'identificateur de partition"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lister les partitions de chaque p�riph�rique"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      identique, mais dans un format utile pour une "
 "saisie ult�rieure"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [ou --increment]: numbre de cylindres etc. de 1 au lieu de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5161,68 +5036,67 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accepter/reporter en unit�s de secteurs/blocs/"
 "cylindres/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lister les types de partitions connus"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       pour la compatibilit� DOS: perte d'un peu d'espace"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [ou --re-read]:   forcer le kernel � relire la table de partitions"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                modifier seulement la partition ayant le num�ro #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ne pas �crire sur le disque"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichier :         sauvegarder les secteurs qui seront �cras�s dans le "
 "fichier"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichier :         restaurer ces secteurs � nouveau"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   afficher la version"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      afficher l'aide m�moire"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "options dangereuses:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: afficher les donn�es contenues dans le\n"
 "                             kernel de la g�om�trie"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [ou --show-geometry]: afficher les donn�es contenues dans le\n"
-"                             kernel de la g�om�trie"
+"    -G [ou --show-pt-geometry]: afficher la g�om�trie estim�e � partir de la "
+"table de partitions"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5231,121 +5105,121 @@ msgstr ""
 "                             ou les descripteurs attendus � l'entr�e pour "
 "ellest"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      ne pas afficher de message qui ne concerne pas "
 "Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      supprimer tous les messages d'avertissement"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Vous pouvez �craser la g�om�trie en utilisant:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [ou --cylinders #]:initialiser le nombre de cylindres � utiliser"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    initialiser le nombre de t�tes � utiliser"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [ou --sectors #]:  initialiser le numbre de secteurs � utiliser"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Vous pouvez d�sactiver toutes les v�rifications de consistence avec:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      ex�cuter aveugl�ment la commande donn�e"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Usage:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s p�riph�rique\t\t lister les partitions actives du p�riph�rique\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s p�riph�rique n1 n2 ... activer les partitions n1 ..., d�sactiver les "
 "autres\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An pr�iph�rique\t activer la partition n, d�sactiver les autres\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "pas de commande?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "usage: sfdisk --print-id p�riph�rique num�ro-de-partition\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "usage: sfdisk --change-id p�riph�rique num�ro-de-partition Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "usage: sfdisk --id p�riph�rique num�ro-de-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "vous ne pouvez sp�cifier seulement un p�riph�rique (sauf avec -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ne peut ouvrir %s en lecture-�criture\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ne peut ouvrir %s en lecture\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindres, %ld t�tes, %ld secteurs/piste\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ne peut obtenir la taille de %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actif erron�: 0x%x au lieu de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5353,7 +5227,7 @@ msgstr ""
 "Compl�t�\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5363,35 +5237,35 @@ msgstr ""
 "mais en a un pour DOS MBR qui ne pourra amorcer un disque qu'avec une seule "
 "partition active.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s a un identificateur %x qui n'est pas cach�\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identifcateur erron� %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Le disque est pr�sentement en usage.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale: ne peut trouver %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "AVERTISSEMENT: %s n'est pas un p�riph�rique fonctionnant par blocs\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "V�rification qu'aucun autre n'utilise le disque en ce moment ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5405,30 +5279,30 @@ msgstr ""
 "partitions swap sur ce disque.\n"
 "Utiliser le fanion --no-reread pour supprimer cette v�rification.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utiliser l'option --force pour annuler toutes les v�rifications.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vieille situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partition %d n'existe pas, ne peut la modifer\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nouvelle situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5436,23 +5310,23 @@ msgstr ""
 "Ces partitions sont questionnables -- rien n'a chang�.\n"
 "(Si vous d�sirez cela, utiliser l'option --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "Cette situation n'est pas recommandable -- vous devriez probablement "
 "r�pondre Non\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�tes-vous satisfait avec cela? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous �crire cela sur le disque? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5461,16 +5335,16 @@ msgstr ""
 "\n"
 "sfdisk: fin pr�matur�e de l'entr�e\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Abandon - rien n'a chang�\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "SVP fournir une r�ponse suivante: y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5479,7 +5353,7 @@ msgstr ""
 "Succ�s d'�criture de la nouvelle table de partitions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5590,139 +5464,139 @@ msgstr "getopt (am�lior�) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "erreur interne, contacter l'auteur."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "amorc� � partir de MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Horloge Ruffian BCD\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "le port d'horloge a �t� ajust� � 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "dr�le de TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomic %s a �chou� pour 1000 it�rations!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Ne peut ouvrir le port /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
 "�chec d'obtention des permissions parce qu'aucun essai n'a �t� tent�.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s incapable d'obtenir un port d'acc�s d'E/S :  l'appel � iopl(3) a �chou�.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probablement que vous avez besoin des privil�ges de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr ""
 "On assume que l'horloge mat�rielle est conserv�e dans le temps de %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "locale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr ""
 "%s: AVERTISSEMENT: 3e ligne non reconnue dans le fichier d'ajustement de "
 "l'heure\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Attendu: � UTC � ou � LOCAL � ou nothing.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Le dernier ajustement de d�rive a �t� fait %ld secondes apr�s 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "La derni�re calibration a �t� faite %ld secondes apr�s 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "L'horloge mat�rielle fonctionne selon le temps %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "inconnu"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "En attente d'un tic d'horloge...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...a obtenu un tic d'horloge\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "valeurs invalides dans l'horloge mat�rielle: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Heure de l'horloge mat�rielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes "
 "depuis 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Heure lu de l'horloge mat�rielle: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Initialiser l'horloge mat�rielle � %.2d:%.2d:%.2d = %ld secondes depuis "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Horloge n'est pas modifi�e - test seulement.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5731,7 +5605,7 @@ msgstr ""
 "Le temps �coul� depuis le temps de r�f�rence a �t� de %.6f secondes.\n"
 "Delai en cours pour atteindre la prochaine seconde compl�te.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5741,22 +5615,22 @@ msgstr ""
 "soit invalides (i.e. 50e jour du mois) ou en dehors de la plage\n"
 "pouvant �tre trait�e (i.e. ann�e 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondes\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Aucune option --date sp�cifi�.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument trop long\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5765,22 +5639,22 @@ msgstr ""
 "La valeur de l'option --date n'est pas une date valide.\n"
 "En particulier, elle contient des guillemets.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "�mission de la commande de date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "�chec de popen(), incapable d'ex�cuter � date � � partir de /bin/sh shell"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "r�ponse de la commande date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5795,7 +5669,7 @@ msgstr ""
 "Le r�sultat est:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5812,12 +5686,12 @@ msgstr ""
 "Le r�sultat est:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "la cha�ne de date %s �quivaut � %ld secondes depuis 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5826,38 +5700,38 @@ msgstr ""
 "L'horloge mat�rielle ne contient de temps valide, aussi on ne peut pas "
 "initialis� l'heure du syst�me � partir d'elle.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Appel de settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "Ne peut initialiser l'horloge syst�me parce que le programme tourne en mode "
 "test.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Vous devez �tre le super-usager pour initialiser l'horloge syst�me.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "�chec de settimeofday()"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5866,7 +5740,7 @@ msgstr ""
 "Pas d'ajustement du facteur de d�rive parce l'horloge mat�rielle contient "
 "d�j� des donn�ez corrompues.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5876,7 +5750,7 @@ msgstr ""
 "calibration indique z�ro.\n"
 "L'hitorique �tant erron� une recalibration est n�cessaire.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5885,7 +5759,7 @@ msgstr ""
 "Pas d'ajustement du facteur de d�rive parce qu'elle est moins qu'un jour "
 "depuis la derni�re calibration.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5896,25 +5770,25 @@ msgstr ""
 "d�pit d'un facteur de d�rive de %f secondes/jour.\n"
 "Ajustement du facteur de d�rive de %f secondes/jour\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "L'heure depuis le dernier ajustement est de %d secondes\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Besoin d'ins�rer %d secondes et de faire une r�f�rence arri�re dans le temps "
 "de %.6f secondes\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 "Pas de mise � jour du fichier de temps d'ajustement en raison du mode test.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5923,41 +5797,41 @@ msgstr ""
 "Devrait avoir �crit ce qui suit dans %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Ajustement des param�tres de d�rive n'ont pas �t� mis � jour.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "L'horloge mat�rielle ne contient pas une heure valide, on ne peut l'ajuster\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "L'ajustement requis est inf�rieur � une seconde, pas d'initialisation de "
 "l'horloge.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilisant %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Aucune interface d'horloge utilisable n'a �t� rep�r�e.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Incapable d'initialiser l'horloge syst�me.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5972,17 +5846,17 @@ msgstr ""
 "(et pr�sum�ment ne tournant pas sur un Alpha maintenant).  Aucune action n'a "
 "�t� ex�cut�e.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Incapable d'obtenir la valeur d'�poque � partir du kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Le kernel assume une valeur d'�poque de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5991,20 +5865,25 @@ msgstr ""
 "Pour initialiser la valeur d'�poque, vous devez utiliser l'option � epoch � "
 "pour y mettre la valeur voulue.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "La valeur d'�poque %d n'est pas utilis�e pour initialisation - test "
 "seulement.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Incapable d'initialiser la valeur d'�poque dans le kernel.\n"
 
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
 # hwclock/hwclock.c:1108
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6068,7 +5947,7 @@ msgstr ""
 "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
 "                either --utc or --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6078,14 +5957,14 @@ msgstr ""
 "                indiquer hwclock le type de alpha en usage (voir hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s ne peut pas prendre des arguments d'options qui n'en sont pas. Vous avez "
 "fourni %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6094,7 +5973,7 @@ msgstr ""
 "Vous avez sp�cif� de multiples options de fonctions.\n"
 "Vous ne pouvez qu'en ex�cuter une � la fois.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6103,7 +5982,7 @@ msgstr ""
 "%s: les options --utc et --localtime sont mutuellement exclusives. Vous avez "
 "soumis les deux.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6112,28 +5991,28 @@ msgstr ""
 "%s: les options --adjust et --noadjfile sont mutuellement exclusives. Vous "
 "avez soumis les deux.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: avec --noadjfile, vous devez sp�cifier soit --utc ou --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Pas utilisable pour initialiser l'heure.  Ne peut initialiser l'horloge.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "D�sol�, seul le super usager peut modifier l'horloge mat�rielle.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "D�sol�, seul le super usager peut modifier l'horloge syst�me.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6142,13 +6021,13 @@ msgstr ""
 "D�sole, seul le super usager peut modifier l'�poque de l'horloge mat�rielle "
 "dans le kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Ne peut acc�der l'horloge mat�rielle par le biais d'une m�thode connue.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6185,7 +6064,6 @@ msgstr "�chec de ioctl() lors de la lecture de l'heure depuis %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "�chec de ioctl KDSHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Ne peut ouvrir /dev/tty1 ou /dev/vc/1"
@@ -6286,9 +6164,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "l'�poque %ld a �t� lu � partir de %s � l'aide de RTC_EPOCH_READ ioctl().\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6319,7 +6194,6 @@ msgstr "�chec de ioctl(RTC_EPOCH_SET) vers %s"
 msgid "calling open_tty\n"
 msgstr "appel de open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "appel de termio_init\n"
@@ -6328,7 +6202,6 @@ msgstr "appel de termio_init\n"
 msgid "writing init string\n"
 msgstr "cha�ne d'initialisation en �criture\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "avant le mode autobaud\n"
@@ -6342,7 +6215,6 @@ msgstr "en attente de cr-lf\n"
 msgid "read %c\n"
 msgstr "lire %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lecture du nom de login\n"
@@ -6396,7 +6268,6 @@ msgstr "/dev: chdir() a �chou�: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: n'est pas p�riph�rique pour caract�res"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6411,12 +6282,10 @@ msgstr "/dev/%s: ne peut ouvrir en tant qu'entr�es standard: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: n,est pas ouvert pour lecture/�criture"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dup() en cours\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6459,30 +6328,25 @@ msgstr ""
 "ou\t[-hiLmw] [-l programme-de-login] [-t minuterie-d-expiration] [-I cha�ne-"
 "init] [-H h�te-cible] ligne vitesse-en-bauds,... [type-de-terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: bas en espace m�moire, login peut �chouer\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ne peut ex�cuter malloc() pour ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "ne peut ex�cuter malloc() pour grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login sur %s de %s n'est pas permis par d�faut.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login sur %s de %s n'est pas permis.\n"
@@ -6529,8 +6393,8 @@ msgstr "Modification de l'information de finger pour %s.\n"
 msgid "Password error."
 msgstr "Erreur de mot de passe"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Mot de passe: "
@@ -6710,34 +6574,6 @@ msgstr "Utiliser %s -l pour afficher la liste.\n"
 msgid "No known shells.\n"
 msgstr "Aucun shell connu.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "ne peut ouvrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "ne peut lire des donn�es au hasard � partir de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "ne peut ouvrir %s pour lecture"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "ne peut �valuer par stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s n'a pas les modes d'acc�s corrects"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "nepeut lire les donn�es � partir de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6748,11 +6584,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "usage: last [-#] [-f fichier] [-t tty] [-h nom-de-l'h�te] [usager ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  encore logg� au syst�me"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6761,15 +6597,15 @@ msgstr ""
 "\n"
 "wtmp d�bute %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: �chec de malloc().\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: obtention du nom de l'h�te"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6778,51 +6614,45 @@ msgstr ""
 "\n"
 "interruption %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Erreur fatale: ne peut r�ouvrir tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "Erreur fatale: tty erron�"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h pour le super usager seulement.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "usage: login [-fp] [nom-d-usager]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "�chec de login: PAM, arr�t de l'ex�cution: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ne peut initialiser PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "�CHEC DE LOGIN %d � PARTIR DE %s POUR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6831,17 +6661,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TROP DE TENTATIVES DE LOGIN (%d) DE %s POUR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "�CHEC DE LOGIN POUR UNE SESSION DE %s POUR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6850,7 +6680,7 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6859,136 +6689,121 @@ msgstr ""
 "\n"
 "Probl�me d'initialisation de la session, abandon.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nom d'usager null dans %s:%d. Abandon."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nom d'usager invalide � %s � dans %s:%d. Abandon."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: m�moire �puis�e\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nom d'usager ill�gal"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login refus� sur ce terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUS� DE %s SUR TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUS� SUR TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Trop d'usagers pr�sentement.\n"
-"Essayer plus tard.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Vous avez trop de processus actifs.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "APPEL � %s fait par %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN DE %s � PARTIR DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN SUR %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN SUR %s PAR %s � PARTIR DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN SUR %s PAR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Vous avez du courrier.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Vous avez du courrier.\n"
 
 # login-utils/login.c:1087too many bare linefeeds.\n"
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: �chec d'�tablissement de relais par fork(): %s "
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "�ched de TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "�chec de setuid()"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Pas de r�pertoire %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login avec un r�pertoire home = � / �.\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: m�moire �puis�e pour le script du shell.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ne peut ex�cuter le script du shell: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: pas de shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6997,65 +6812,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nom du compte usager login trop long.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "noms de login ne peuvent d�buter avec � - �.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "trop de sauts de page (linefeeds)\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Nombre escessif de sauts de page (linefeeds)"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Expiration du d�lai de gr�ce lors du login apr�s %d secondes\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Dernier login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "� partir de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "�chec de login � partir de %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "�chec de login � partir de %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d login en �chec � partir de %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d login en �chec sur %s, %s"
@@ -7075,173 +6890,30 @@ msgstr "est n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "usage: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Qui �tes-vous?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: pas de tel groupe."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permission refus�e"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Pas de shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Le mot de passe doit avoir au moins 6 caract�res, essayer encore.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Le mot de passe doit contenir des caract�res en dehors des classes\n"
-"suivantes: majuscules et minuscules, chiffres et caract�res non\n"
-"alphanu�riques. Consulter passwd(1) pour plus d'informations.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Vous ne pouvez pas r�utiliser votre ancien mot de passe.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"SVP ne pas utiliser quelque choses comme votre nom de compte usager comme "
-"mot de passe!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-"SVP ne pas utiliser quelque chose comme votre vrai nom comme mot de passe!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Usage: passwd [nom-d-usager [mot-de-passe]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Seul le super usager peut utiliser une des deux formes d'arguments.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Usage: passwd [-foqsvV] [usager [mot-de-passe]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ne peut ex�cuter %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Ne peut rep�rer le nom de login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Seul le super usager peut modifier le mot de passe des autres.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Trop d'arguments.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Ne peut rep�rer le nom de l'usager.Est-ce que � %s � est r�ellement un "
-"usager?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"D�sol�, seuls les mots de passe locaux peuvent �tre modifi�s. Utiliser "
-"ypasswd � la place."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Le nom de l'usager et le UID ne concordent pas, imposteur!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Changement du mot de passe pour %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Entrer le vieux mot de passe: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Mot de passe ill�gal, imposteur."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Entrer le nouveau mot de passe: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Le mot de passe n'a pas �t� modifi�."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Re-taper le nouveau mot de passe: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Vous l'avez mal epel�. Le mot de passe n'a pas �t� chang�."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "mot de passe modifi�. usager %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "Mot de passe du compte ROOT modifi�"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "mot de passe modifi� par root, usager %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "appel de setpwnam() pour initialiser le mot de passe.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Mot de passe *NON* modifi�. Essayer � nouveau plus tard.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Mot de passe modifi�.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7288,7 +6960,6 @@ msgstr "r�amor�� par %s: %s"
 msgid "halted by %s: %s"
 msgstr "stopp� par %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7325,7 +6996,6 @@ msgstr "Ex�cution du programme � %s � ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Erreur d'ex�cution\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7415,7 +7085,6 @@ msgstr "erreur d'initialisaton close-on-exec sur /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "erreur d'ex�cution de finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "erreur de fork() de finalprog\n"
@@ -7444,7 +7113,7 @@ msgstr "�chec d'ouverture du r�pertoire\n"
 msgid "fork failed\n"
 msgstr "�chec de fork()\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "�chec de exec()\n"
 
@@ -7594,12 +7263,6 @@ msgstr "valeur de mois ill�gal: utiliser 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "valeur d'ann�e ill�gale: utiliser 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7610,13 +7273,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "usage: cal [-13smjyV] [[mois] ann�e]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "usage: %s [+format] [jour mois ann�e]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Jour de la St. Tib"
 
@@ -7748,7 +7410,7 @@ msgstr "%s: changer le nom de %s vers %s a �chou�: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s vers les fichiers...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7759,22 +7421,22 @@ msgstr ""
 "Utiliser � %s [options] %s � si vous d�sirez r�ellement l'utiliser.\n"
 "Le script n'a pas �t� d�marr�.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "usage: script [-a] [-f] [-q] [-t] [fichier]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a d�but�, le fichier est %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Le script a d�but� sur %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7783,254 +7445,253 @@ msgstr ""
 "\n"
 "Script compl�t� sur %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script compl�l�, le fichier est %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "�chec de openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Manque de pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: erreur d,arguement, usage\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom-de-terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nom-de-fichier-de-vidange ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq nombre-de-la-fr�quence ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "ne peut ex�cuter le mode (un)set powersave\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erreur klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erreur de lecture %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Erreur lors de l'�criture du screendump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "ne peut lire %s et ne peut peut faire un dump via ioctl()\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM n'est pas d�fini.\n"
@@ -8105,10 +7766,6 @@ msgstr "AVERTISSEMENT: ne peut ouvrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ne peut ouvrir %s - on utilise %s � la place\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8302,31 +7959,31 @@ msgid "; rest of file ignored"
 msgstr "; reste du fichier est ignor�"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: l'�tiquette %s appara�t � la fois sur %s et %s\n"
+msgstr "%s: erreur: l'�tiquette %s appara�t � la fois sur %s et %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: on va monter %s par %s\n"
+msgstr "mount: on va monter %s par UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: on va monter %s par %s\n"
+msgstr "mount: on va monter %s par l'�tiquette\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: ne peut ouvrir %s, la conversion de UUID et LABEL ne peut �tre "
-"faite.\n"
+"%s: ne peut ouvrir %s, aussi la conversion de UUID et de l'�TIQUETTE ne peut "
+"�tre faite.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID erron�"
+msgstr "%s: UUID erron�"
 
 #: mount/mount.c:382
 #, c-format
@@ -8414,85 +8071,76 @@ msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ne peut initialiser la vitesse: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ne peut �tablir un relais fork(): %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: cette version a �t� compil� sans support pour le type � nfs �"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: �chec avec la version 4 de mount nfs, on tente la 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: je ne peux d�terminer le type de syst�me de fichiers et aucun n'a �t� "
 "sp�cifi�"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: vous devez sp�cifier le type de syst�me de fichiers"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: �chec de mount"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: le point de montage %s n'est pas un r�pertoire"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permission refus�e"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: doit �tre le super usager pour utiliser mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est occup�"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc d�j� mont�"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s est d�j� mont� ou %s est occup�"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: le point de montage %s n'existe pas"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 "mount: le point de montage %s est un lien symbolique qui pointe vers nulle "
 "part"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: p�riph�rique sp�cial %s n'existe pas"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8501,12 +8149,12 @@ msgstr ""
 "mount: le p�riph�rique sp�cial %s n'existe pas\n"
 "       (un pr�fixe de chemin n'est pas un r�pertoire)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s n'est pas d�j� mont� ou option erron�e"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8516,7 +8164,7 @@ msgstr ""
 "sur %s,\n"
 "       codepage manquante ou autre erreur"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8524,7 +8172,7 @@ msgstr ""
 "       (cela pourrait �tre le p�riph�rique IDE o� vous utilisez\n"
 "       ide-scsi alors que sr0 ou sda ou autre serait requis?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8532,7 +8180,7 @@ msgstr ""
 "       (tentez-vous de monter une partition �tendue,\n"
 "       au lieu d'une partition logique � l'int�rieur?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8541,52 +8189,51 @@ msgstr ""
 "essayez\n"
 "       dmesg | tail  ou quelque chose du genre\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "table de p�riph�riques mont�s est pleine"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ne peut lire le super bloc"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: p�riph�rique inconnnu"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: type inconnu de syst�me de fichiers '%s'"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement vous voulez dire %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: peut-�tre voulez-vous dire 'iso9660'?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: peut-�tre voulez-vous dire 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s a un nombre de p�riph�rique erron� ou le type du syst. de fichiers "
 "%s n'est pas support�"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s n'est pas un p�riph�rique de type bloc et stat() a �chou�?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8595,76 +8242,71 @@ msgstr ""
 "mount: le kernel ne reconna�t pas %s comme un p�riph�rique de type bloc\n"
 "       (peut-�tre un pilote � insmod �?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s n'est pas un p�riph�rique de type bloc (essayer � -o loop � ?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n'est pas un p�riph�rique de type bloc"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s n'est pas un p�riph�rique valide de type bloc"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "p�riph�rique de type bloc"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ne peut monter %s%s en lecture seulement"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s est prot�g� en �criture mais l'option � -w � a �t� fournie"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s est prot�g� en �criture, on le monte en lecture seulement"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: aucun type n'a �t� donn� - ja vais assumer nfs en raison du � : �\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: aucun type n'a �t� fourni - je vais assumer smbfs en raison du "
 "pr�fixe //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: mise en arri�re plan de \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: abandon \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s est d�j� mont� sur %s\n"
 
 # mount/mount.c:1323
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8715,34 +8357,34 @@ msgstr ""
 "Autres options: [-nfFrsvw] [-o options] [-p mot_de_passe].\n"
 "Pour plus de d�tails ex�cuter:  man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s n'a pas �t� rep�r� - on le cr�e..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: pas de telle partition rep�r�e"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: on monte %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "rien n'a �t� mont�"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: ne peut rep�rer %s dans %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut rep�rer %s dans %s ou %s"
@@ -8779,99 +8421,99 @@ msgstr "       Je vais essayer le type %s\n"
 msgid "Trying %s\n"
 msgstr "On tente %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argument excessivement long  pour h�te:r�pertoire\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: AVERTISSEMENT: multiples noms d'h�tes non support�s\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: le r�pertoire � monter n'utilise pas le format h�te:r�pertoire\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: ne peut obtenir l'adresse de %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: a obtenu un hp->h_length erron�\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argument excessivement long pour une option\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "AVERTISSEMENT: l'option proto= n'est pas reconnue.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "AVERTISSEMENT: l'option namlen n'est pas support�e.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "param�tre mount nfs inconnu: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "AVERTISSEMENT: l'option nolock n'est pas support�e.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "option mount nfs inconnue: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: a obtenu un hp->h_length erron�?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sur TCP n'est pas support�.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "socket nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "bindresvport nfs"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "serveur nfs rapporte que le service n'est pas disponible"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "utilisation du portmapper pour rep�rer le port NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "utilisation du port %d pour le d�mon nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "connexion nfs"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valeur d'�tat retourn�e nfs inconnue: %d"
@@ -8880,8 +8522,8 @@ msgstr "valeur d'�tat retourn�e nfs inconnue: %d"
 msgid "bug in xstrndup call"
 msgstr "probl�me dans l'appel de xstrndup"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8890,10 +8532,10 @@ msgid ""
 msgstr ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priorit�] sp�cial ...\n"
+"       %s [-v] [-p priorit�] sp�cial|�TIQUETTE=nom_du_volume ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8904,141 +8546,139 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] sp�cial ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s sur %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: ne peut rep�rer � _stext � dans %s\n"
+msgstr "%s: ne peut rep�rer le p�riph�rique pour %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: ne peut �valuer pas stat() %s: %s\n"
+msgstr "%s: ne peut �valuer pas stat() %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: AVERTISSEMENT: %s a des permissions non s�curitaires %04o, %04o est "
+"%s: AVERTISSEMENT: %s a des permissions non s�curitaires %04o, %04o est "
 "sugg�r�\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: escamotage du fichier %s - il semble avoir des trous.\n"
+msgstr "%s: escamotage du fichier %s - il semble avoir des trous.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "N'est pas super usager.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: ne peut ouvrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compil� sans support pour -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: ne peut faire un fork(): %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "h�te: %s, r�pertoire: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: ne peut obtenir l'adresse pour %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: a obtenu un hostp->h_length erron�\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: p�riph�rique de type bloc invalide"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n'est pas mont�"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ne peut �crire sur le super bloc"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: p�riph�rique occup�"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n'a pas �t� trouv�"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: doit �tre le super usager pour utiliser umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: p�riph�rique de type bloc non autoris� sur le syst�me de fichiers"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "ne peut d�monter %s - essayer %s � la place\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occup� - remont� en lecture seulement\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s d�mont�\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ne peut rep�rer la liste des syst�mes de fichiers � d�monter"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -9049,47 +8689,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t type-vfs] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] sp�cial | noeud...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "Ne peut d�monter \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative pour d�monter %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut rep�rer %s dans mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas mont� (selon mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: il semble que %s ait �t� mont� plusieurs fois"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n'est pas dans fstab (et vous n'�tes pas l'usager ROOT)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en d�saccord avec fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: seul %s peut d�monter %s de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut ex�cuter la commande"
 
@@ -9238,15 +8877,17 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Usage: %s [-c] [-n niveau] [-s taille-de-tampon]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: option inconnue \"-%c\"\n"
+msgstr "flock: option inconnue, annulation de l'op�ration \n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Usage flock [--shared | --timeout=secondes] nom_de_fichier commandes {arg "
+"arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9414,8 +9055,6 @@ msgstr "kernel n'est pas configur� pour traiter la m�moire partag�e\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limites de la m�moire partag� --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10209,17 +9848,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e format] [-f fichier-format] [-n longueur] [-s saut] "
 "[fichier ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "usage: %s [-dflpcsu] [+no-de-ligne | +/patron] nom1 nom2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: option inconnue \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10230,8 +9869,7 @@ msgstr ""
 "*** %s: r�pertoire ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10242,46 +9880,46 @@ msgstr ""
 "******** %s: N'est pas un fichier texte ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Utiliser q ou Q pour quitter]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Plus--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Prochain fichier: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 "[Appuyer sur la barre d'espacement pour continuer, � q � pour quitter.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...recul� de %d pages"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...recul� de 1 page"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...escamotage d'une ligne"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...escamotage de %d ligne(s)"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10291,7 +9929,7 @@ msgstr ""
 "***Arri�re***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10303,7 +9941,7 @@ msgstr ""
 "Par d�faut entre crochets.\n"
 "L'�toile \"*\" indique que l'arguement devient le nouveau d�faut.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10354,34 +9992,34 @@ msgstr ""
 "ligne\n"
 ".                        r�p�ter la commande pr�c�dente\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Appuyer � h � pour obtenir les instructions.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "� %s � ligne %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Pas un fichier] ligne %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  D�bordement\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...escamotage\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Expression r�guli�re b�cl�e"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10389,15 +10027,15 @@ msgstr ""
 "\n"
 "Patron non rep�r�\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patron non rep�r�"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "ne peut �tablir un relais fork()\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10405,19 +10043,19 @@ msgstr ""
 "\n"
 "...Escamotage en cours "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Escamotage vers le fichier "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Escamotage arri�re vers le fichier "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Ligne trop longue"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Aucune commande pr�c�dente pour subsitution"
 
@@ -10471,7 +10109,7 @@ msgstr "hexdumpo: format erron� {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: conversion erron�e de caract�res %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10479,84 +10117,81 @@ msgstr ""
 "%s: Usage: %s [-num�ro] [-p cha�ne] [-cefnrs] [+ligne] [+/patron/] "
 "[fichiers]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: l'option requiert un argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: option ill�gale -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...escamotage avant\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...escamotage arri�re\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Pas de prochain fichier"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Pas de fichier pr�c�dent"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erreur de lecture � partir du fichier %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inattendue dans le fichier %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erreur inconnue dans le fichier %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ne peut cr�er le fichier temporaire\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "erreur RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Pas de cha�ne de recherche m�moris�e"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ne peut ouvrir"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "sauvegarder"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !commande non autoiris�e en mode rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "�chec du fork(), essayer � nouveau plus tard.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Prochain fichier: "
 
@@ -10571,14 +10206,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "usage: rev [fichier ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "ne peut ouvrir %s en lecture\n"
+msgstr "Ne peut ouvrir \"%s\" en lecture\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "usage: %s [fichier]\n"
+msgstr "usage: tailf fichier_journal\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10610,6 +10245,165 @@ msgstr "Ligne d'entr�e trop longue.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "M�moire �puis�e lors de l'accroissement du tampon.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Nombre invalide: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Erreur de syntaxe: � %s �\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Aucun param�tre de ce type initialis�: � %s �\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] p�riph�rique nom\n"
+
+# disk-utils/setfdprm.c:101
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] p�riph�rique taille sect t�tes pistes stretch intervalle "
+#~ "taux spec1 format_de_intervalle\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] p�riph�rique\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] p�riph�rique\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "ne peut ouvrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "ne peut lire des donn�es au hasard � partir de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "ne peut ouvrir %s pour lecture"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "ne peut �valuer par stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s n'a pas les modes d'acc�s corrects"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "nepeut lire les donn�es � partir de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Trop d'usagers pr�sentement.\n"
+#~ "Essayer plus tard.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Vous avez trop de processus actifs.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Le mot de passe doit avoir au moins 6 caract�res, essayer encore.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Le mot de passe doit contenir des caract�res en dehors des classes\n"
+#~ "suivantes: majuscules et minuscules, chiffres et caract�res non\n"
+#~ "alphanu�riques. Consulter passwd(1) pour plus d'informations.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Vous ne pouvez pas r�utiliser votre ancien mot de passe.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "SVP ne pas utiliser quelque choses comme votre nom de compte usager comme "
+#~ "mot de passe!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "SVP ne pas utiliser quelque chose comme votre vrai nom comme mot de "
+#~ "passe!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Usage: passwd [nom-d-usager [mot-de-passe]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Seul le super usager peut utiliser une des deux formes d'arguments.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Usage: passwd [-foqsvV] [usager [mot-de-passe]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ne peut ex�cuter %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Ne peut rep�rer le nom de login"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Seul le super usager peut modifier le mot de passe des autres.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Trop d'arguments.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Ne peut rep�rer le nom de l'usager.Est-ce que � %s � est r�ellement un "
+#~ "usager?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "D�sol�, seuls les mots de passe locaux peuvent �tre modifi�s. Utiliser "
+#~ "ypasswd � la place."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Le nom de l'usager et le UID ne concordent pas, imposteur!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Changement du mot de passe pour %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Entrer le vieux mot de passe: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Mot de passe ill�gal, imposteur."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Entrer le nouveau mot de passe: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Le mot de passe n'a pas �t� modifi�."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Re-taper le nouveau mot de passe: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Vous l'avez mal epel�. Le mot de passe n'a pas �t� chang�."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "mot de passe modifi�. usager %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "Mot de passe du compte ROOT modifi�"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "mot de passe modifi� par root, usager %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "appel de setpwnam() pour initialiser le mot de passe.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Mot de passe *NON* modifi�. Essayer � nouveau plus tard.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Mot de passe modifi�.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: cette version a �t� compil� sans support pour le type � nfs �"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "AVERTISSEMENT: omission de partitions apr�s %d\n"
 
diff --git a/po/insert-header.sin b/po/insert-header.sin
new file mode 100644
index 000000000..b26de01f6
--- /dev/null
+++ b/po/insert-header.sin
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/po/it.gmo b/po/it.gmo
new file mode 100644
index 000000000..bb6f58130
--- /dev/null
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index c9b392d43..7a600d7d0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,83 +1,85 @@
-# Italian translation of the util-linux messages.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# <support@turbolinux.com>, 2000.
-msgid ""
-msgstr ""
-"Project-Id-Version: util-linux 2.10f\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2000-04-04 21:52-0800\n"
-"Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
-"Language-Team: <support@turbolinux.com>\n"
+# Italian messages for util-linux.
+# Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the util-linux package.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2005.
+# Beth Powell <bpowell@turbolinux.com>, 2000.
+#
+# partition table: tavola delle partizioni? tabella delle partizioni?
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-02-25 12:33+0000\n"
+"Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: disk-utils/blockdev.c:62
 msgid "set read-only"
-msgstr "impostare sola lettura"
+msgstr "imposta sola lettura"
 
 #: disk-utils/blockdev.c:63
 msgid "set read-write"
-msgstr "impostare lettura-scrittura"
+msgstr "imposta lettura-scrittura"
 
 #: disk-utils/blockdev.c:66
 msgid "get read-only"
-msgstr "visualizzare sola-lettura"
+msgstr "visualizza sola lettura"
 
 #: disk-utils/blockdev.c:69
 msgid "get sectorsize"
-msgstr "visualizzare la dimensione del settore"
+msgstr "visualizza la dimensione del settore"
 
 #: disk-utils/blockdev.c:72
-#, fuzzy
 msgid "get blocksize"
-msgstr "visualizzare la dimensione"
+msgstr "visualizza la dimensione del blocco"
 
 #: disk-utils/blockdev.c:75
-#, fuzzy
 msgid "set blocksize"
-msgstr "visualizzare la dimensione"
+msgstr "imposta la dimensione del blocco"
 
 #: disk-utils/blockdev.c:78
 msgid "get 32-bit sector count"
 msgstr ""
 
+# FIXME
 #: disk-utils/blockdev.c:81
-#, fuzzy
 msgid "get size in bytes"
-msgstr "visualizzare la dimensione"
+msgstr "visualizza la dimensione in byte"
 
 #: disk-utils/blockdev.c:84
 msgid "set readahead"
-msgstr "impostare readahead"
+msgstr "imposta readahead"
 
 #: disk-utils/blockdev.c:87
 msgid "get readahead"
-msgstr "visualizzare readahead"
+msgstr "visualizza readahead"
 
 #: disk-utils/blockdev.c:90
 msgid "flush buffers"
-msgstr "scaricamento buffer"
+msgstr "scarica i buffer"
 
 #: disk-utils/blockdev.c:94
 msgid "reread partition table"
-msgstr "rilettura della tabella delle partizioni"
+msgstr "rileggi la tabella delle partizioni"
 
 #: disk-utils/blockdev.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "Usage:\n"
-msgstr "Utilizzo:"
+msgstr "Uso:\n"
 
 #: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
-msgstr ""
+msgstr "  %s --report [dispositivi]\n"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "  %s [-v|-q] commands devices\n"
-msgstr "Utilizzo: %s [-V] [-v|-q] dispositivi comandi\n"
+msgstr "  %s [-v|-q] comandi dispositivi\n"
 
 #: disk-utils/blockdev.c:107
 #, c-format
@@ -87,7 +89,7 @@ msgstr "Comandi disponibili:\n"
 #: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr "%s: comando sconosciuto: %s\n"
+msgstr "%s: Comando sconosciuto: %s\n"
 
 #: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
@@ -97,32 +99,32 @@ msgstr "%s richiede un argomento\n"
 #: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
-msgstr ""
+msgstr "%s riuscito.\n"
 
 #: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: impossibile aprire %s: %s\n"
+msgstr "%s: impossibile aprire %s\n"
 
 #: disk-utils/blockdev.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di ioctl su %s\n"
 
 #: disk-utils/blockdev.c:391
 #, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
-#, fuzzy, c-format
+#: disk-utils/elvtune.c:50
+#, c-format
 msgid "usage:\n"
-msgstr "Utilizzo:"
+msgstr "Uso:\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
 msgid "Formatting ... "
-msgstr "Formattazione in corso ... "
+msgstr "Formattazione in corso... "
 
 #: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 #, c-format
@@ -132,7 +134,7 @@ msgstr "fatto\n"
 #: disk-utils/fdformat.c:60
 #, c-format
 msgid "Verifying ... "
-msgstr "Verifica in corso ... "
+msgstr "Verifica in corso... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
@@ -155,22 +157,21 @@ msgstr ""
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "utilizzo: dispositivo %s [ -n ]\n"
+msgstr "Uso:  %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s da %s\n"
 
 #: disk-utils/fdformat.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a block device\n"
-msgstr "%s: non si tratta di un dispositivo floppy\n"
+msgstr "%s: non si tratta di un dispositivo a blocchi\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
@@ -179,17 +180,19 @@ msgstr "Impossibile determinare il tipo di formato attuale"
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%s-completo, tracce %d , %d sec/traccia. Capacit� totale %d kB.\n"
+msgstr "faccia %s, %d tracce, %d sec/traccia. Capacità totale %d kB.\n"
 
+# Questo messaggio e quello successivo concordano con "faccia" del messaggio 
+# sopra.
 #: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr "Doppio"
+msgstr "doppia"
 
 #: disk-utils/fdformat.c:142
 msgid "Single"
-msgstr "Singolo"
+msgstr "singola"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -198,98 +201,104 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
+"Uso: %s [-hv] [-x dir] file\n"
+" -h         mostra questo aiuto\n"
+" -x dir     estrai nella directory dir\n"
+" -v         sii più prolisso\n"
+" file       file da verificare\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr ""
+msgstr "%s: errore %d durante la decompressione! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:250
+#, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di dimensione nel link simbolico `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:326
+#, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "dovrebbe essere (%d, %d, %d)\n"
+msgstr "  buco in %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:479
+#, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
+msgstr "%s: è stato compilato senza il supporto per -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
+"%s: attenzione -- impossibile determinare la dimensione del filesystem \n"
 
-#: disk-utils/fsck.cramfs.c:518
-#, fuzzy, c-format
+#: disk-utils/fsck.cramfs.c:515
+#, c-format
 msgid "%s is not a block device or file\n"
-msgstr "mount: %s non � un dispositivo di blocchi"
+msgstr "%s non è un dispositivo a blocchi o un file\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -297,12 +306,12 @@ msgstr ""
 #: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Utilizzo: %s [-larvsmf] /dev/name\n"
+msgstr "Uso: %s [-larvsmf] /dev/nome\n"
 
 #: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
-msgstr "%s � montato.\t"
+msgstr "%s è montato.\t"
 
 #: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
@@ -314,28 +323,28 @@ msgid "check aborted.\n"
 msgstr "controllo interrotto.\n"
 
 #: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr " Zona n. < FIRSTZONE nel file `"
+msgstr " N. zona < FIRSTZONE nel file `%s'"
 
 #: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
-#, fuzzy, c-format
+#, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "N. Zona >= ZONES nel file `"
+msgstr "N. Zona >= ZONES nel file `%s'"
 
 #: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Rimuovere blocco"
 
 #: disk-utils/fsck.minix.c:368
-#, fuzzy, c-format
+#, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Errore di lettura: ricerca del blocco nel file' impossibile"
+msgstr "Errore di lettura: ricerca del blocco nel file '%s' impossibile\n"
 
 #: disk-utils/fsck.minix.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Errore di lettura: blocco danneggiato nel file '"
+msgstr "Errore di lettura: blocco danneggiato nel file '%s'\n"
 
 #: disk-utils/fsck.minix.c:389
 #, c-format
@@ -351,9 +360,9 @@ msgid "seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
 #: disk-utils/fsck.minix.c:398
-#, fuzzy, c-format
+#, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Errore di scrittura: blocco danneggiato nel file '"
+msgstr "Errore di scrittura: blocco danneggiato nel file '%s'\n"
 
 #: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
@@ -389,7 +398,7 @@ msgstr "numero magico danneggiato in super-block"
 
 #: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
-msgstr "� supportato solamente 1k blocchi/zone"
+msgstr "È supportato solamente 1k blocchi/zone"
 
 #: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
@@ -472,18 +481,19 @@ msgstr ""
 "\n"
 
 #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
-#, fuzzy, c-format
+#, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "Inode %d contrassegnato non utilizzato, ma utilizzato per il file '"
+msgstr ""
+"Inode %d contrassegnato non utilizzato, ma utilizzato per il file '%s'\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Segno in uso"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
-#, fuzzy, c-format
+#, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr "ha modalit� %05o\n"
+msgstr "Il file `%s' ha modalità %05o\n"
 
 #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 #, c-format
@@ -492,12 +502,12 @@ msgstr "Attenzione: conteggio inode troppo grande.\n"
 
 #: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "l'inode di root non � una directory"
+msgstr "l'inode radice non è una directory"
 
 #: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
-#, fuzzy, c-format
+#, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Il blocco � stato utilizzato in precedenza. Ora nel file  `"
+msgstr "Il blocco è stato utilizzato in precedenza. Ora nel file `%s'"
 
 #: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
 #: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
@@ -506,51 +516,52 @@ msgid "Clear"
 msgstr "Cancella"
 
 #: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
-#, fuzzy, c-format
+#, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "' � marcato come non in uso."
+msgstr "Il blocco %d nel file `%s' è marcato come non in uso."
 
 #: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Corretto"
 
 #: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
-#, fuzzy, c-format
+#, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
-msgstr "contiene un numero inode non corretto per il file '"
+msgstr ""
+"La directory '%s' contiene un numero inode non corretto per il file '%.*s'."
 
 #: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
-msgstr "Rimuovere"
+msgstr " Rimuovere"
 
 #: disk-utils/fsck.minix.c:956
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr ": directory danneggiata: '.' non � la prima\n"
+msgstr "`%s': directory danneggiata: '.' non è la prima\n"
 
 #: disk-utils/fsck.minix.c:964
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr ": directory danneggiata: '..' non � la seconda\n"
+msgstr "`%s': directory danneggiata: '..' non è la seconda\n"
 
 #: disk-utils/fsck.minix.c:1023
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr ": directory danneggiata: '.' non � la prima\n"
+msgstr "%s: directory danneggiata: '.' non è la prima\n"
 
 #: disk-utils/fsck.minix.c:1032
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr ": directory danneggiata: '..' non � la seconda\n"
+msgstr "%s: directory danneggiata: '..' non è la seconda\n"
 
 #: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "errore interno"
 
 #: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: size < 32"
-msgstr ": directory danneggiata: dimensione < 32"
+msgstr "%s: directory danneggiata: dimensione < 32"
 
 #: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
@@ -559,7 +570,7 @@ msgstr "ricerca in bad_zone non riuscita"
 #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "Modalit� dell'inode %d non cancellata."
+msgstr "Modalità dell'inode %d non cancellata."
 
 #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
@@ -574,7 +585,7 @@ msgstr "Inode %d utilizzato, inode contrassegnato non utilizzato in bitmap."
 #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr "Inode %d (modalit� = %07o), i_nlinks=%d, conteggiati=%d."
+msgstr "Inode %d (modalità = %07o), i_nlinks=%d, conteggiati=%d."
 
 #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
@@ -590,18 +601,18 @@ msgid "Unmark"
 msgstr "Non contrassegnata"
 
 #: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
+msgstr "Zona %d: utilizzata, conteggiati=%d\n"
 
 #: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
+msgstr "Zona %d: non in uso, conteggiati=%d\n"
 
 #: disk-utils/fsck.minix.c:1181
 msgid "Set"
-msgstr "Impostare"
+msgstr "Imposta"
 
 #: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
 #: disk-utils/mkfs.minix.c:633
@@ -624,7 +635,7 @@ msgstr "impossibile aprire '%s'"
 #: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr "'%s' � corretto, non controllare.\n"
+msgstr "'%s' è corretto, non controllare.\n"
 
 #: disk-utils/fsck.minix.c:1305
 #, c-format
@@ -634,7 +645,7 @@ msgstr "Forzatura controllo filesystem su %s in corso.\n"
 #: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr "Il filesystem su %s � danneggiato, controllo necessario.\n"
+msgstr "Il filesystem su %s è danneggiato, controllo necessario.\n"
 
 #: disk-utils/fsck.minix.c:1333
 #, c-format
@@ -666,8 +677,8 @@ msgstr ""
 "\n"
 "%6d file regolari\n"
 "%6d directory\n"
-"%6d file di dispositivo di caratteri\n"
-"%6d file di dispositivo di blocchi\n"
+"%6d file di dispositivo a caratteri\n"
+"%6d file di dispositivo a blocchi\n"
 "%6d link\n"
 "%6d link simbolici\n"
 "------\n"
@@ -680,24 +691,24 @@ msgid ""
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
-"----------------------------\n"
-"IL FILE SYSTEM � STATO MODIFICATO\n"
-"----------------------------\n"
+"---------------------------------\n"
+"IL FILE SYSTEM È STATO MODIFICATO\n"
+"---------------------------------\n"
 
 #: disk-utils/isosize.c:129
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "Impossibile aprire %s\n"
+msgstr "%s: impossibile aprire: %s\n"
 
 #: disk-utils/isosize.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "%s: seek error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di posizionamento su %s\n"
 
 #: disk-utils/isosize.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "%s: read error on %s\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: errore di lettura su %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
@@ -707,12 +718,12 @@ msgstr ""
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: errore di comprensione dell'opzione\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "Uso: %s [-x] [-d <num>] iso9660-image\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -720,52 +731,52 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
+"Uso: %s [-v] [-N n-di-inode] [-V nome-volume]\n"
+"        [-F nome-filessystem] dispositivo [numero-blocchi]\n"
 
 #: disk-utils/mkfs.bfs.c:135
-#, fuzzy
 msgid "volume name too long"
-msgstr "linea troppo lunga"
+msgstr "nome di volume troppo lungo"
 
 #: disk-utils/mkfs.bfs.c:142
-#, fuzzy
 msgid "fsname name too long"
-msgstr "Linea troppo lunga"
+msgstr "nome del filesystem troppo lungo"
 
 #: disk-utils/mkfs.bfs.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stat device %s"
-msgstr "impossibile eseguire stat(%s)"
+msgstr "impossibile eseguire stat sul dispositivo %s"
 
 #: disk-utils/mkfs.bfs.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a block special device"
-msgstr "mount: %s non � un dispositivo di blocchi"
+msgstr "%s non è un dispositivo speciale a blocchi"
 
 #: disk-utils/mkfs.bfs.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s"
-msgstr "impossibile aprire %s\n"
+msgstr "impossibile aprire %s"
 
 #: disk-utils/mkfs.bfs.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get size of %s"
-msgstr "Impossibile ottenere la dimensione del disco"
+msgstr "impossibile ottenere la dimensione di %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr ""
+msgstr "argomento dei blocchi troppo largo, il massimo è %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "troppi inode - il massimo è 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr ""
+msgstr "spazio insufficiente, sono necessari almeno %lu blocchi"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -773,32 +784,32 @@ msgstr "Dispositivo: %s\n"
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr ""
+msgstr "Volume: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "Nome filesystem: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "BlockSize: %d\n"
-msgstr "bloccato"
+msgstr ""
 
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr ""
+msgstr "Inode: %d (in 1 blocco)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr ""
+msgstr "Inode: %d (in %ld blocchi)\n"
 
 #: disk-utils/mkfs.bfs.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %ld\n"
-msgstr "trackskew: %d\n"
+msgstr "Blocchi: %ld\n"
 
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
@@ -806,53 +817,46 @@ msgid "Inode end: %d, Data end: %d\n"
 msgstr ""
 
 #: disk-utils/mkfs.bfs.c:244
-#, fuzzy
 msgid "error writing superblock"
-msgstr "impossibile scrivere in super-block"
+msgstr "errore durante la scrittura del superblocco"
 
 #: disk-utils/mkfs.bfs.c:264
-#, fuzzy
 msgid "error writing root inode"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura dell'inode radice"
 
 #: disk-utils/mkfs.bfs.c:269
-#, fuzzy
 msgid "error writing inode"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura dell'inode"
 
 #: disk-utils/mkfs.bfs.c:272
-#, fuzzy
 msgid "seek error"
-msgstr ", errore"
+msgstr "errore di posizionamento"
 
 #: disk-utils/mkfs.bfs.c:278
-#, fuzzy
 msgid "error writing . entry"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura di `.'"
 
 #: disk-utils/mkfs.bfs.c:282
-#, fuzzy
 msgid "error writing .. entry"
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore durante la scrittura di `..'"
 
 #: disk-utils/mkfs.bfs.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "error closing %s"
-msgstr "Errore durante la chiusura di %s\n"
+msgstr "errore durante la chiusura di %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr ""
-" Utilizzo: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
+msgstr "Uso: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "%s: Memoria esaurita!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "versione mkfs %s (%s)\n"
@@ -886,7 +890,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
 msgid "filesystem too big.  Exiting.\n"
-msgstr ""
+msgstr "filesystem troppo grande. Uscita.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
@@ -895,7 +899,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -904,7 +907,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
-msgstr ""
+msgstr "%6.2f%% (%+d byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
@@ -914,58 +917,55 @@ msgid ""
 msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "Including: %s\n"
-msgstr "Numero non valido: %s\n"
+msgstr "Incluso: %s\n"
 
 #: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
-msgstr ""
+msgstr "Dati directory: %d byte\n"
 
 #: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
-msgstr ""
+msgstr "Tutto: %d kilobyte\n"
 
 #: disk-utils/mkfs.cramfs.c:879
-#, fuzzy, c-format
+#, c-format
 msgid "Super block: %d bytes\n"
-msgstr "spazio utilizzato = %d byte\n"
+msgstr "Superblocco: %d byte\n"
 
 #: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
-msgstr ""
+msgstr "CRC: %x\n"
 
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
+"spazio insufficiente allocato per l'immagine ROM (%Ld allocati, %d usati)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr ""
+msgstr "Scrittura dell'immagine ROM non riuscita (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
-#, fuzzy, c-format
+#, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "Attenzione: conteggio inode troppo grande.\n"
+msgstr "attenzione: nomi di file troncati a 255 byte.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
 msgid "warning: files were skipped due to errors.\n"
-msgstr ""
+msgstr "attenzione: alcuni file sono stati ignorati a causa di errori.\n"
 
 #: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr ""
+msgstr "attenzione: dimensioni dei file troncate a %luMB (meno 1 byte).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
@@ -989,12 +989,12 @@ msgstr ""
 #: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr " Utilizzo: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
+msgstr " Uso: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
 
 #: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s � montata; qui non verr� creato un filesystem!"
+msgstr "%s è montata; qui non verrà creato un filesystem!"
 
 #: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
@@ -1025,7 +1025,6 @@ msgstr "impossibile scrivere inode"
 msgid "write failed in write_block"
 msgstr "scrittura in write_block non riuscita"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1061,7 +1060,7 @@ msgstr "ricerca non riuscita durante il controllo dei blocchi"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valori strani in do_check: probabilmente sono presenti dei bug\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
@@ -1072,7 +1071,7 @@ msgstr "blocchi danneggiati prima dell'area dati: impossibile creare fs"
 #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "blocchi danneggiati %d\n"
+msgstr "%d blocchi danneggiati\n"
 
 #: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 #, c-format
@@ -1096,116 +1095,116 @@ msgstr "impossibile aprire %s"
 #: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
-msgstr "impossibile avviare %s"
+msgstr "impossibile fare stat di %s"
 
 #: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "non si tenter� di creare un filesystem su '%s'"
+msgstr "non si tenterà di creare un filesystem su '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "dimensione pagina %d specificata dall'utente non corretta\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Utilizzo della dimensione pagina %d specificata dall'utente, al posto dei "
 "valori del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Si presuppone che le pagine siano di dimensione %d (non %d)\n"
+msgstr "Si assume che le pagine siano di dimensione %d (non %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "L'etichetta è stata troncata.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "etichetta"
+msgstr "nessuna etichetta, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
-msgstr " Utilizzo: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocchi]\n"
+msgstr ""
+"Uso: %s [-c] [-v0|-v1] [-pDIMPAGINA] [-L etichetta] /dev/nome [blocchi]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
-#: disk-utils/mkswap.c:438
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "%lu bad pages\n"
-msgstr "%d pagine danneggiate\n"
+msgstr "%lu pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s: errore: non � possibile impostare swap in nessuna posizione?\n"
+msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
 
-#: disk-utils/mkswap.c:592
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:591
+#, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
-"%s: errore: la dimensione %ld � maggiore rispetto a quella del dispositivo %"
-"d\n"
+"%s: errore: la dimensione %lu è maggiore di quella del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: errore: non � possibile impostare swap in nessuna posizione?\n"
+msgstr ""
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Non si cercher� di creare uno swapdevice su '%s'"
+msgstr "Non si cercherà di creare uno swapdevice su '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "errore irreversibile: impossibile leggere la prima pagina"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1219,125 +1218,84 @@ msgstr ""
 "Nessuno swap creato. Se si desidera creare uno swap v0 su quel dispositivo,\n"
 "utilizzare l'opzione -f per forzare l'operazione.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:700
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:699
+#, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Impostazione spazio di swap versione %d, dimensione = %ld byte\n"
+msgstr "Impostazione spazio di swap versione %d, dimensione = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Numero non valido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Errore di sintassi: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Parametro non impostato: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "utilizzo: %s [ -p ] dev name\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] dev\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] dev\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutilizzabile"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Spazio disponibile"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
-#, fuzzy
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
-msgstr "Linux ext2"
+msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
-#, fuzzy
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
-msgstr "Linux"
+msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
-#, fuzzy
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
-msgstr "Linux"
+msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
-#, fuzzy
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
-msgstr "Linux"
+msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
-msgstr "Il disco � stato cambiato.\n"
+msgstr "Il disco è stato cambiato.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
 "aggiornata correttamente.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1350,339 +1308,312 @@ msgstr ""
 "partizione DOS 6.x, consultare la pagina del manuale cfdisk\n"
 "per ulteriori informazioni.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERRORE IRREVERSIBILE"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Premere qualsiasi tasto per uscire da cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
-msgstr "Ricerca sull'unit� disco impossibile"
+msgstr "Ricerca sull'unità disco impossibile"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
-msgstr "Impossibile leggere l'unit� disco"
+msgstr "Impossibile leggere l'unità disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
-msgstr "Impossibile scrivere sull'unit� disco"
+msgstr "Impossibile scrivere sull'unità disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Troppe partizioni"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "La partizione inizia prima del settore 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "La partizione termina prima del settore 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "La partizione inizia dopo la fine del disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "La partizione termina dopo la fine del disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "le partizioni logiche non sono nell'ordine del disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche ampliate"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Errore interno durante la creazione di un'unit� logica con partizione "
+"!!!! Errore interno durante la creazione di un'unità logica con partizione "
 "non estesa !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"Impossibile creare un'unit� logica in questo caso - si creerebbero due "
+"Impossibile creare un'unità logica in questo caso - si creerebbero due "
 "partizioni estese"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
-msgstr "Voce di menu troppo lunga. Il menu pu� apparire strano."
+msgstr "Voce di menu troppo lunga. Il menu può apparire strano."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Menu senza direzione. � predefinita quella orizzontale."
+msgstr "Menu senza direzione. È predefinita quella orizzontale."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tasto non valido"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Premere un tasto per continuare"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Creare una nuova partizione primaria"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Creare una nuova partizione logica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annulla"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Non creare una partizione"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Errore interno !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Dimensione (in MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Inizio"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Aggiungere la partizione all'inizio dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Aggiungere la partizione alla fine dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
-msgstr "Non c'� spazio per creare una partizione estesa"
+msgstr "Non c'è spazio per creare una partizione estesa"
 
-#: fdisk/cfdisk.c:1565
-#, fuzzy
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
-msgstr "nessuna tabella delle partizioni presente.\n"
+msgstr "Nessuna tabella delle partizioni.\n"
 
-#: fdisk/cfdisk.c:1569
-#, fuzzy
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
-msgstr "Firma danneggiata sulla tabella delle partizioni"
+msgstr "Nessuna tavola delle partizioni. Si inizia con una tavola vuota."
 
-#: fdisk/cfdisk.c:1579
-#, fuzzy
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
-msgstr "Stampare la tabella delle partizioni"
+msgstr "Segnatura danneggiata nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:1583
-#, fuzzy
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
-msgstr "nessuna tabella delle partizioni presente.\n"
+msgstr "Tipo di tabella delle partizioni sconosciuto"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr ""
+msgstr "Si vuole iniziare con una tabella vuota [y/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
-"Si � specificato un numero di cilindri superiore a quelli contenuti su disco"
+"Si è specificato un numero di cilindri superiore a quelli contenuti su disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
-msgstr "Impossibile aprire l'unit� disco"
+msgstr "Impossibile aprire l'unità disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aperto in sola lettura - scrittura non autorizzata"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Partizione primaria danneggiata"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Partizione logica danneggiata"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Attenzione!!  I dati sul disco potrebbero venire eliminati!"
+msgstr "Attenzione!! I dati sul disco potrebbero venire eliminati!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Scrivere la tabella delle partizioni su disco? (si o no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Scrittura tabella delle partizioni su disco non effettuata"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Inserire `si' (senza accento) o `no'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Scrittura tabella delle partizioni su disco in corso..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Eseguita l'operazione di scrittura tabella delle partizioni su disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"Eseguita l'operazione di scrittura tabella delle partizioni, ma non � "
-"riuscita la rilettura della tabella. Riavviare per aggiornare la tabella."
+"Tabella scritta, ma la rilettura è fallita. Riavviare per aggiornare la "
+"tabella."
 
-#: fdisk/cfdisk.c:1916
-#, fuzzy
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Non � possibile avviare in modo preciso una partizione primaria. DOS MBR non "
-"pu� avviarla."
+"Nessuna partizione primaria è impostata come avviabile. DOS MBR non può\n"
+"avviarla."
 
-#: fdisk/cfdisk.c:1918
-#, fuzzy
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Non � possibile avviare in modo preciso una partizione primaria. DOS MBR non "
-"pu� avviarla."
+"Più di una partizione primaria è impostata come avviabile. DOS MBR non può\n"
+"avviarla."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Inserire il nome del file o premere RETURN (INVIO) per visualizzare sullo "
 "schermo:"
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossibile aprire il file '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
-msgstr "Unit� disco: %s\n"
+msgstr "Unità disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Settore 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Settore %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Nessuno   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primario"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logico"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Avvio"
 
-#: fdisk/cfdisk.c:2077
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2075
+#, c-format
 msgid "(%02X)"
-msgstr "Unk(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
-#, fuzzy
+#: fdisk/cfdisk.c:2077
 msgid "None"
-msgstr "Fine"
+msgstr "Nessuno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabella delle partizioni per %s\n"
 
-#: fdisk/cfdisk.c:2116
-#, fuzzy
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
-msgstr "           Primo    Ultimo\n"
+msgstr ""
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1691,7 +1622,7 @@ msgstr ""
 " # Tipo     settore   settore   offset  lunghezza   tipo di filesystem  "
 "(ID)   flag\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1700,493 +1631,483 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
-#, fuzzy
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
-msgstr "         ---Avvio---      ----Chiusura----    Numero avvio di\n"
+msgstr ""
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr ""
 " # Flag testina sett. cil.   ID  testina sett. cil.    settore  settori\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Grezzo"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Stampare la tabella utilizzando il formato dati grezzi"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Settori"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Stampare la tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabella"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Stampare la tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Non stampare la tabella"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Schermata Guida per cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
-"Questo � cfdisk, un programma per la partizione dei dischi basato su curses"
+"Questo è cfdisk, un programma per la partizione dei dischi basato su curses"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "consente di creare, cancellare e modificare le partizioni sul disco fisso"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
-msgstr "unit� disco."
+msgstr "unità disco."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Comando     significato"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr " b          Cambia flag avviabile per la partizione corrente"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr " d          Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr " g          cambio cilindri, testine, parametri settori-per-traccia"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "            ATTENZIONE: questa opzione dovrebbe essere utilizzata solo da "
 "persone"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
-msgstr "            esperte."
+msgstr "            esperti."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr " h          Stampare questa schermata"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 " m          Massimizzare l'utilizzo del disco della partizione corrente"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
-msgstr "            Nota: questo pu� rendere la partizione incompatibile con"
+msgstr "            Nota: questo può rendere la partizione incompatibile con"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "            DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr " n          Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr " p          Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "            Vi sono diversi altri formati per la partizione"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "            tra i quali scegliere:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"               r - dati grezzi (esattamente ci� che verrebbe scritto sul "
+"               r - dati grezzi (esattamente ciò che verrebbe scritto sul "
 "disco)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "               t - Tabella in formato grezzo"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr " t          Cambia il tipo di filesystem"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
-" u          Modifica l'unit� di visualizzazione della dimensione della "
+" u          Modifica l'unità di visualizzazione della dimensione della "
 "partizione"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Ruota attraverso MB, settori e cilindri"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 " W          Scrittura della tabella di partizione sul disco (si deve "
 "inserire la W maiuscola)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
-"            Dato che in questo modo � possibile eliminare dati sul disco, si "
+"            Dato che in questo modo è possibile eliminare dati sul disco, si "
 "deve"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "            confermare o negare la scrittura inserendo `s�' o"
+msgstr "            confermare o negare la scrittura inserendo 'sì' o"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
-msgstr "             `no'"
+msgstr "             'no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Freccia Su      sposta il cursore alla partizione precedente"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Freccia Gi�   sposta il cursore alla partizione successiva"
+msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ridisegna lo schermo"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Stampa questa schermata"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Nota: � possibile immettere tutti i comandi in maiuscolo o minuscolo"
+msgstr "Nota: è possibile immettere tutti i comandi in maiuscolo o minuscolo"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindri"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Testine"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Modifica la geometria delle testine"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Modifica la geometria dei settori"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Modifica della geometria eseguita"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Immettere il numero di cilindri: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valore cilindri non valido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Immettere il numero delle testine: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valore testine non valido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Immettere il numero dei settori per traccia: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valore settori non valido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Immettere il tipo di filesystem: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Impossibile cambiare il tipo FS in vuoto"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Impossibile cambiare il tipo FS in espanso"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
-msgstr "NC"
+msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Sconosciuto (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
-msgstr "Unit� disco: %s"
+msgstr "Unità disco: %s"
 
-#: fdisk/cfdisk.c:2650
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2648
+#, c-format
 msgid "Size: %lld bytes, %lld MB"
-msgstr "Dimensione: %lld byte"
+msgstr "Dimensioni: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2653
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2651
+#, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
-msgstr "Dimensione: %lld byte"
+msgstr "Dimensioni: %lld byte, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2655
+#, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
-msgstr "Testine: %d   settori per traccia: %d   cilindri: %d"
+msgstr "Testine: %d   Settori per traccia: %d   Cilindri: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
-msgstr "Tipo di partiz."
+msgstr "Tipo part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo FS"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etichetta]"
 
-#: fdisk/cfdisk.c:2667
-#, fuzzy
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
-msgstr "  Settori"
+msgstr "    Settori"
 
-#: fdisk/cfdisk.c:2669
-#, fuzzy
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
-msgstr "Cilindri"
+msgstr "  Cilindri"
 
-#: fdisk/cfdisk.c:2671
-#, fuzzy
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
-msgstr "Dimensione (MB)"
+msgstr "  Dim. (MB)"
 
-#: fdisk/cfdisk.c:2673
-#, fuzzy
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
-msgstr "Dimensione (GB)"
+msgstr "  Dim. (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr " Cambia flag avviabile per la partizione corrente "
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Elimina"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Modifica della geometria del disco (solo per esperti)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Guida"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
-msgstr "Stampa della schermata della guida"
+msgstr "Mostra della schermata della guida"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Massimi."
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
-"Massimizzare l'utilizzo del disco della partizione corrente (solo per "
-"esperti)"
+"Massimizza l'utilizzo del disco della partizione corrente (solo per esperti)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nuova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Stampa"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Esci"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
-msgstr "Esce dal programma senza scrivere nella tabella delle partizioni"
+msgstr "Esci dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Modificare il tipo di filesystem (DOS, Linux, OS/2 e cos� via)"
+msgstr "Modifica il tipo di filesystem (DOS, Linux, OS/2, ecc.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
-msgstr "Unit�"
+msgstr "Unità"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
-"Cambia l'unit� di visualizzazione della dimensione della partizione (MB, "
+"Cambia l'unità di visualizzazione della dimensione della partizione (MB, "
 "sett., cil.)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Scrivi"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
-"Scrivere la tabella delle partizioni sul disco (i dati potrebbero venir "
-"eliminati)"
+"Scrivi la tabella delle partizioni sul disco (i dati potrebbero venir persi)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Impossibile rendere questa partizione avviabile"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Impossibile cancellare una partizione vuota"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Impossibile massimizzare questa partizione"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
-msgstr "Questa partizione � utilizzabile"
+msgstr "Questa partizione è utilizzabile"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
-msgstr "Questa partizione � gi� in uso"
+msgstr "Questa partizione è già in uso"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossibile modificare il tipo di una partizione vuota"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Nessun'altra partizione"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Comando non valido"
 
-#: fdisk/cfdisk.c:2892
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2890
+#, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2206,18 +2127,18 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Utilizzo:\n"
+"Uso:\n"
 "Stampa versione:\n"
 "        %s -v\n"
 "Stampa tabella delle partizioni:\n"
 "        %s -P {r|s|t} [opzioni] dispositivo\n"
-"Utilizzo interattivo:\n"
+"Uso interattivo:\n"
 "        %s [opzioni] dispositivo\n"
 "\n"
 "Opzioni:\n"
-"-a: Utilizzo della freccia al posto dell'evidenziazione;\n"
-"-z: Inizio con una tabella delle partizioni vuota, anzich� lettura di pt dal "
-"disco;\n"
+"-a: Usa freccia al posto dell'evidenziazione;\n"
+"-z: Inizia con una tabella delle partizioni vuota, anziché leggere la \n"
+"    partizione dal disco;\n"
 "-c C -h H -s S: Sostituisce l'idea del kernel riguardo al numero di "
 "cilindri,\n"
 "                al numero di testine e di settori/traccia.\n"
@@ -2240,12 +2161,12 @@ msgid ""
 msgstr ""
 "\n"
 "\tEsiste un'etichetta AIX valida su questo disco.\n"
-"\tSfortunatamente, in questo momento Linux non � in grado di gestire questi\n"
-"\tdischi.  Ci� nonostante seguono alcuni\n"
+"\tSfortunatamente, in questo momento Linux non è in grado di gestire questi\n"
+"\tdischi.  Ciò nonostante seguono alcuni\n"
 "\tconsigli:\n"
-"\t1. fdisk elimier� il suo contenuto alla scrittura.\n"
+"\t1. fdisk elimierà il suo contenuto alla scrittura.\n"
 "\t2. Assicurarsi che questo disco NON sia ancora\n"
-"\t   una parte vitale del gruppo di volume (altrimenti � possibile\n"
+"\t   una parte vitale del gruppo di volume (altrimenti è possibile\n"
 "\t   che si cancellino anche gli altri dischi, se non soggetti a "
 "mirroring.)\n"
 "\t3. Prima di eliminare questo volume fisico assicurarsi\n"
@@ -2261,9 +2182,9 @@ msgstr ""
 "\n"
 "Etichetta BSD per dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Azione comando"
 
@@ -2273,7 +2194,7 @@ msgstr "   d   eliminanazione di una partizione BSD"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr "   e   modifica dei dati dell'unit�"
+msgstr "   e   modifica dei dati dell'unità"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
@@ -2283,10 +2204,9 @@ msgstr "   i   installazione di bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   elenco dei tipi di filesystem conosciuti"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   stampa di questo menu"
 
@@ -2298,14 +2218,14 @@ msgstr "   n   aggiunta di una nuova partizione BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   stampa della tabella delle partizioni BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   uscita senza salvataggio delle modifiche"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   ritorno al menu principale"
 
@@ -2318,9 +2238,8 @@ msgid "   t   change a partition's filesystem id"
 msgstr "   t   modifica dell'id del filesystem di una partizione"
 
 #: fdisk/fdiskbsdlabel.c:141
-#, fuzzy
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   c   modifica del numero di cilindri"
+msgstr "   c   cambia unità (cilindri/settori)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
@@ -2331,14 +2250,14 @@ msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   collegamento della partizione BSD a una non-BSD"
 
 #: fdisk/fdiskbsdlabel.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "La partizione %s%d ha settore di inizio 0: dato non valido.\n"
+msgstr "La partizione %s ha settore di inizio 0 non valido.\n"
 
 #: fdisk/fdiskbsdlabel.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Lettura del disklabel di %s%d al settore %d.\n"
+msgstr "Lettura del disklabel di %s al settore %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
@@ -2349,13 +2268,13 @@ msgstr "Non esiste partizione *BSD su %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando disklabel BSD (m per richiamare la guida): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
@@ -2400,8 +2319,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2435,7 +2352,7 @@ msgstr "rpm: %d\n"
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr " interleave: %d\n"
+msgstr "interleave: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
@@ -2460,7 +2377,7 @@ msgstr "ricerca traccia-a-traccia: %ld\t# millisecondi\n"
 #: fdisk/fdiskbsdlabel.c:346
 #, c-format
 msgid "drivedata: "
-msgstr "datiunit�:"
+msgstr "datiunità:"
 
 #: fdisk/fdiskbsdlabel.c:355
 #, c-format
@@ -2472,9 +2389,9 @@ msgstr ""
 "%d partizioni:\n"
 
 #: fdisk/fdiskbsdlabel.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#        size   offset    fstype   [fsize bsize   cpg]\n"
+msgstr "#       inizio     fine      size     fstype   [fsize bsize   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
@@ -2502,8 +2419,8 @@ msgstr "settori/traccia"
 msgid "tracks/cylinder"
 msgstr "tracce/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindri"
 
@@ -2560,20 +2477,20 @@ msgstr "Bootstrap installato su %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partizione (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
-msgstr "� stato creato il numero massimo di partizioni\n"
+msgstr "È stato creato il numero massimo di partizioni\n"
 
 #: fdisk/fdiskbsdlabel.c:630
 #, c-format
 msgid "This partition already exists.\n"
-msgstr "Questa partizione esiste gi�.\n"
+msgstr "Questa partizione esiste già.\n"
 
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Attenzione: troppe partizioni (%d, il massimo � %d).\n"
+msgstr "Attenzione: troppe partizioni (%d, il massimo è %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 #, c-format
@@ -2584,8 +2501,7 @@ msgstr ""
 "\n"
 "Sincronizzazione dei dischi.\n"
 
-#: fdisk/fdisk.c:188
-#, fuzzy
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2596,18 +2512,17 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Utilizzo: fdisk [-b SSZ] [-u] DISK     Modifica la tabella delle partizioni\n"
-"       fdisk -l [-b SSZ] [-u] DISK  Elenca la(e) tabella(e) delle "
-"partizioni\n"
-"       fdisk -s PARTITION           Indica la(e) dimensione(i) della "
-"partizione in blocchi\n"
-"       fdisk -v                     Indica la versione di fdisk\n"
-"In questo caso DISK � simile a /dev/hdb o /dev/sda\n"
-"e PARTITION assomiglia a /dev/hda7\n"
-"-u: indica Inizio e Fine con unit� di misura settore (invece di cilindro)\n"
-"-b 2048: (per alcune unit� MO) utilizzare i settori a 2048 byte\n"
+"Uso:  fdisk [-b SSZ] [-u] DISCO     Modifica la tabella delle partizioni\n"
+"      fdisk -l [-b SSZ] [-u] DISCO  Elenca la tabella delle partizioni\n"
+"      fdisk -s PARTIZIONE           Mostra la dimensione della partizione\n"
+"                                    in blocchi\n"
+"      fdisk -v                      Mostra la versione di fdisk\n"
+"In questo caso DISCO è qualcosa come /dev/hdb o /dev/sda\n"
+"e PARTIZIONE è qualcosa come /dev/hda7\n"
+"-u: indica Inizio e Fine in numero di settori (invece che in cilindri)\n"
+"-b 2048: (per alcune unità MO) usa settori a 2048 byte\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2616,221 +2531,205 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Utilizzo: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
+"Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
 "Per es.: fdisk /dev/hda  (per il primo disco IDE)\n"
 "  o: fdisk /dev/sdc  (per il terzo disco SCSI)\n"
-"  o: fdisk /dev/eda  (per la prima unit� PS/2 ESDI)\n"
+"  o: fdisk /dev/eda  (per la prima unità PS/2 ESDI)\n"
 "  o: fdisk /dev/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossibile leggere %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ricerca impossibile su %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossibile scrivere su %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossibile allocare altra memoria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Errore irreversibile\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   attivazione/disattivazione di un flag di sola lettura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modifica di bsd disklabel"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   attivazione/disattivazione del flag montabile"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   cancellazione di una partizione"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   elenco dei tipi di partizione conosciuti"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   aggiunta di una nuova partizione"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   creazione di una nuova tabella delle partizioni DOS vuota"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   creazione di una nuova disklabel Sun vuota"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
-msgstr "   t   modifica dell'id di sistema di una partizione"
+msgstr "   t   modifica l'id di sistema di una partizione"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
-msgstr "   u   modifica delle unit� di visualizzazione/di immissione"
+msgstr "   u   modifica delle unità di visualizzazione/di immissione"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
-msgstr "   v   verifica della tabella delle partizioni"
+msgstr "   v   verifica la tabella delle partizioni"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
-msgstr "   w   scrittura della tabella su disco e uscita"
+msgstr "   w   scrivi la tabella su disco ed esci"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr " x   ulteriori funzioni (solo per esperti)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
-msgstr "   a   selezione della partizione che � possibile avviare"
+msgstr "   a   selezione della partizione che è possibile avviare"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   modifica della voce bootfile"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   selezione della partizione swap sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a  Cambia bootable flag"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   cambia il flag compatibile con il dos"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifica del numero di cilindri alternativi"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   modifica del numero di cilindri"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   stampa dei dati grezzi nella tabella delle partizioni"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifica del numero dei settori supplementari per cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   modifica del numero di testine"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   modifica del fattore di interleave"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   modifica della velocit� di rotazione (rpm)"
+msgstr "   o   modifica della velocità di rotazione (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifica del numero di settori/traccia"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifica del numero di cilindri fisici"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   spostamento dell'inizio di dati in una partizione"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   elenco delle partizioni estese"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
-#, fuzzy
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr "   g   creazione di una tabella delle partizioni IRIX"
+msgstr "   g   crea una tabella delle partizioni IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
-#, fuzzy
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
-msgstr "   p   stampa della tabella delle partizioni"
+msgstr "   f   aggiusta l'ordine delle partizioni"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Si devono impostare"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"� possibile effettuare questa operazione dal menu delle funzioni "
+"È possibile effettuare questa operazione dal menu delle funzioni "
 "supplementari.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2842,33 +2741,33 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Offset errato nella partizione estesa primaria\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "Attenzione: puntatore di collegamento supplementare nella tabella delle "
 "partizioni %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Attenzione: i dati supplementari nella tabella delle partizioni %d vengono "
 "ignorati\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2877,56 +2776,56 @@ msgid ""
 "\n"
 msgstr ""
 "Creazione di una nuova disklabel DOS. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodich�, ovviamente, il\n"
-"contenuto precedente non potr� essere recuperato.\n"
+"solamente fino a quando si decide di scriverle. Dopodiché, ovviamente, il\n"
+"contenuto precedente non potrà essere recuperato.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Nota: la dimensione del settore � %d (non %d)\n"
+msgstr "Nota: la dimensione del settore è %d (non %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Impossibile scrivere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
-#, fuzzy, c-format
+#: fdisk/fdisk.c:964
+#, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
-"Il dispositivo non contiene n� una tabella delle partizioni DOS, n� una "
-"disklabel Sun o SGI valide\n"
+"Il dispositivo non contiene né una tabella delle partizioni DOS valida, né "
+"una disklabel Sun, SGI od OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "La partizione estesa supplementare viene ignorata %d\n"
+msgstr "Partizione estesa supplementare ignorata %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 "Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
-"verr� corretto con w(rite)\n"
+"verrà corretto con w(rite)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2935,83 +2834,83 @@ msgstr ""
 "\n"
 "ricevuto EOF tre volte - uscita in corso..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
-#: fdisk/fdisk.c:1105
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1107
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, predefinito %d): "
+msgstr "%s (%u-%u, predefinito %u): "
 
-#: fdisk/fdisk.c:1172
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1174
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Utilizzo del valore predefinito %d\n"
+msgstr "Utilizzo del valore predefinito %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
+#, c-format
 msgid "Selected partition %d\n"
-msgstr "La partizione estesa supplementare viene ignorata %d\n"
+msgstr "Partizione selezionata %d\n"
 
-#: fdisk/fdisk.c:1222
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1224
+#, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Tutte le partizioni primarie sono state già definite!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Modifica delle unit� di visualizzazione/immissione su %s\n"
+msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "ATTENZIONE: la partizione %d � una partizione estesa\n"
+msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr "Il flag compatibile con DOS non � impostato\n"
+msgstr "Il flag compatibile con DOS non è impostato\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3021,19 +2920,19 @@ msgid ""
 msgstr ""
 "Tipo 0 significa spazio disponibile per diversi sistemi\n"
 "(ma non per Linux). Avere partizioni di\n"
-"tipo 0 probabilmente non � consigliabile. � possibile eliminare\n"
+"tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
 "una partizione utilizzando il comando `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Non � possibile trasformare una partizione in una estesa o viceversa\n"
+"Non è possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3041,10 +2940,10 @@ msgid ""
 "\n"
 msgstr ""
 "Poniamo di lasciare la partizione 3 come disco intero (5),\n"
-"poich� SunOS/Solaris lo prevede e ci� � gradito anche a Linux.\n"
+"poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3052,124 +2951,128 @@ msgid ""
 "\n"
 msgstr ""
 "Poniamo di lasciare la partizione 9 come intestazione di volume (0),\n"
-"e la partizione 11 come volume intero (6) poich� IRIX lo prevede.\n"
+"e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Modificato il tipo di sistema della partizione %d in %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partizione %d ha diversi elementi iniziali fisici/logici (non Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partizione %d ha diversi elementi finali fisici/logici:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partizione %i non inizia al limite del cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1518
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "La partizione %d non termina al limite del cilindro.\n"
+msgstr "La partizione %i non termina al limite del cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
+"\n"
+"Disco %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1537
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disco %s: %d testine, %d settori, %d cilindri\n"
+"Disco %s: %ld.%ld GB, %lld byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1539
+#, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr ""
-"\n"
-"Disco %s: %d testine, %d settori, %d cilindri\n"
-"\n"
+msgstr "%d testine, %d settori/tracce, %d cilindri"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
-msgstr ""
+msgstr ", totale %llu settori"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Unità = %s di %d * %d = %d byte\n"
+"\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
-msgstr ""
+msgstr "Niente da fare. L'ordine è già corretto.\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"Questo non sembra una tavola delle partizioni.\n"
+"Probabilmente è stato scelto il dispositivo sbagliato.\n"
+"\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1759
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1761
+#, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
-msgstr "le partizioni logiche non sono nell'ordine del disco"
+msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3180,83 +3083,83 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partizione %d: testina %d pi� grande del massimo %d\n"
+msgstr "Partizione %d: testina %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partizione %d: settore %d pi� grande del massimo %d\n"
+msgstr "Partizione %d: settore %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partizione %d: cilindro %d pi� grande del massimo %d\n"
+msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partizione %d: dissenso dei settori precedenti %d con il totale %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Attenzione: la partizione %d � vuota\n"
+msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
-msgstr "La partizione logica %d non � interamente nella partizione %d\n"
+msgstr "La partizione logica %d non è interamente nella partizione %d\n"
 
-#: fdisk/fdisk.c:1900
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1902
+#, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
+msgstr "Numero totale dei settori allocati %d superiore al massimo %lld\n"
 
-#: fdisk/fdisk.c:1903
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1905
+#, c-format
 msgid "%lld unallocated sectors\n"
-msgstr "%d settori non allocati\n"
+msgstr "%lld settori non allocati\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
-"La partizione %d � gi� definita.  Cancellarla prima di riaggiungerla.\n"
+"La partizione %d è già definita.  Cancellarla prima di riaggiungerla.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
-msgstr "Il settore %d � gi� allocato\n"
+msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3265,24 +3168,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Si devono eliminare alcune partizioni e aggiungere anzitutto una partizione "
 "estesa\n"
 
-#: fdisk/fdisk.c:2093
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2095
+#, c-format
 msgid "All logical partitions are in use\n"
-msgstr "le partizioni logiche non sono nell'ordine del disco"
+msgstr "Tutte le partizioni logiche sono usate\n"
 
-#: fdisk/fdisk.c:2094
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2096
+#, c-format
 msgid "Adding a primary partition\n"
-msgstr "Partizione primaria danneggiata"
+msgstr "Aggiunta di una partizione primaria\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3293,34 +3196,34 @@ msgstr ""
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"La tabella delle partizioni � stata alterata!\n"
+"La tabella delle partizioni è stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3328,8 +3231,13 @@ msgid ""
 "The kernel still uses the old table.\n"
 "The new table will be used at the next reboot.\n"
 msgstr ""
+"\n"
+"ATTENZIONE: Rilettura della tabella delle partizioni fallita con errore %d: %"
+"s.\n"
+"Il kernel usa ancora la tabella precedente.\n"
+"La nuova tabella sarà usata al prossimo riavvio.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3342,78 +3250,80 @@ msgstr ""
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:2197
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2199
+#, c-format
 msgid ""
 "\n"
 "Error closing file\n"
-msgstr "Errore durante la chiusura di %s\n"
+msgstr ""
+"\n"
+"Errore durante la chiusura del file\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
-"Attenzione: impostare l'offset di settore per assicurare compatibilit� con "
+"Attenzione: impostare l'offset di settore per assicurare compatibilità con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2458
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2460
+#, c-format
 msgid "%c: unknown command\n"
-msgstr "%s: comando sconosciuto: %s\n"
+msgstr "%c: comando sconosciuto\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Questo kernel trova la dimensione del settore in maniera indipendente - - "
 "opzione b ignorata\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3422,35 +3332,34 @@ msgstr ""
 "Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Il file d'avvio corrente �: %s\n"
+"Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3506,37 +3415,32 @@ msgid "SGI xfs"
 msgstr "SGI xfs"
 
 #: fdisk/fdisksgilabel.c:91
-#, fuzzy
 msgid "SGI xfslog"
-msgstr "SGI xfs"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:92
-#, fuzzy
 msgid "SGI xlv"
-msgstr "SGI xlvol"
+msgstr "SGI xlv"
 
 #: fdisk/fdisksgilabel.c:93
-#, fuzzy
 msgid "SGI xvm"
-msgstr "SGI xlvol"
+msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativo"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
-#, fuzzy
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
-msgstr "Linux"
+msgstr "Linux LVM"
 
 #: fdisk/fdisksgilabel.c:97
-#, fuzzy
 msgid "Linux RAID"
-msgstr "Linux"
+msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
@@ -3544,8 +3448,8 @@ msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"Secondo la ditta MIPS Computer Systems, Inc l'etichetta non deve contenere "
-"pi� di512 byte\n"
+"Secondo MIPS Computer Systems, Inc l'etichetta non deve contenere più di 512 "
+"byte\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3553,7 +3457,7 @@ msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Rilevato un disklabel sgi con checksum errato.\n"
 
 #: fdisk/fdisksgilabel.c:200
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors\n"
@@ -3568,11 +3472,11 @@ msgstr ""
 "%d cilindri, %d cilindri fisici\n"
 "%d sett/cil supplementari, interleave %d:1\n"
 "%s\n"
-"Unit� = %s di %d * 512 byte\n"
+"Unità = %s di %d * %d byte\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
@@ -3581,17 +3485,17 @@ msgid ""
 msgstr ""
 "\n"
 "Disco %s (disk label SGI): %d testine, %d settori, %d cilindri\n"
-"Unit� = %s di %d * 512 byte\n"
+"Unità = %s di %d * %d byte\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:220
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "----- partitions -----\n"
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- partizioni -----\n"
-"%*s  Info      Inizio       Fine   Settori  Id  Sistema\n"
+"Pt# %*s  Info     Inizio      Fine  Settori  Id  Sistema\n"
 
 #: fdisk/fdisksgilabel.c:242
 #, fuzzy, c-format
@@ -3609,7 +3513,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s settore%5u dimensione%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3651,7 +3554,7 @@ msgstr ""
 "\n"
 "\tSi tenga conto del fatto che non viene verificata l'esistenza del file di "
 "avvio.\n"
-"\tL'impostazione predefinita di SGI � \"/unix\" e per il backup \"/unix.save"
+"\tL'impostazione predefinita di SGI è \"/unix\" e per il backup \"/unix.save"
 "\".\n"
 
 #: fdisk/fdisksgilabel.c:348
@@ -3666,9 +3569,9 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:438
 #, c-format
 msgid "More than one entire disk entry present.\n"
-msgstr "Presente pi� di una voce disco intero.\n"
+msgstr "Presente più di una voce disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nessuna partizione definita\n"
@@ -3693,8 +3596,8 @@ msgid ""
 "The entire disk partition is only %d diskblock large,\n"
 "but the disk is %d diskblocks long.\n"
 msgstr ""
-"La partizione del disco intero � solamente di %d blocchi,\n"
-"ma il disco � di %d blocchi.\n"
+"La partizione del disco intero è solamente di %d blocchi,\n"
+"ma il disco è di %d blocchi.\n"
 
 #: fdisk/fdisksgilabel.c:465
 #, c-format
@@ -3717,9 +3620,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Le partizioni %d e %d si sovrappongono di %d settori.\n"
 
 #: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Intervallo di %8d settori non utilizzato - settori %8d-%d\n"
+msgstr "Intervallo di %8u settori non utilizzato - settori %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:525
 #, c-format
@@ -3737,7 +3640,7 @@ msgid ""
 "The swap partition does not exist.\n"
 msgstr ""
 "\n"
-"La partizione swap non esiste.\n"
+"La partizione di swap non esiste.\n"
 
 #: fdisk/fdisksgilabel.c:532
 #, c-format
@@ -3746,18 +3649,17 @@ msgid ""
 "The swap partition has no swap type.\n"
 msgstr ""
 "\n"
-"La partizione swap non ha tipo swap.\n"
+"La partizione di swap non ha tipo swap.\n"
 
 #: fdisk/fdisksgilabel.c:535
 #, c-format
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tSi � selezionato un nome file di avvio non comune.\n"
+msgstr "\tSi è selezionato un nome file di avvio non comune.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "� possibile modificare solamente il tag delle partizioni non vuote.\n"
+msgstr "È possibile modificare solamente il tag delle partizioni non vuote.\n"
 
 #: fdisk/fdisksgilabel.c:550
 msgid ""
@@ -3768,22 +3670,21 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 "Si raccomanda che la partizione in offset 0\n"
-"sia di tipo \"SGI volhdr\", il sistema IRIX si baser� su di essa per\n"
+"sia di tipo \"SGI volhdr\", il sistema IRIX si baserà su di essa per\n"
 "recuperare dalla directory gli strumenti standalone come sash e fx.\n"
-"Solamente la sezione dell'intero disco \"SGI volume\" pu� violarla.\n"
-"Digitare YES (s�) se si � certi di voler codificare questa partizione in "
+"Solamente la sezione dell'intero disco \"SGI volume\" può violarla.\n"
+"Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
-"Si � a conoscenza del fatto che sul disco esiste una sovrapposizione di "
+"Si è a conoscenza del fatto che sul disco esiste una sovrapposizione di "
 "partizioni?\n"
 
 #: fdisk/fdisksgilabel.c:637
@@ -3796,7 +3697,7 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:642
 #, c-format
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "L'intero disco � gi� coperto da partizioni.\n"
+msgstr "L'intero disco è già coperto da partizioni.\n"
 
 #: fdisk/fdisksgilabel.c:646
 #, c-format
@@ -3818,7 +3719,7 @@ msgstr ""
 #, c-format
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
-"Si avr� una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
+"Si avrà una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
 "questo problema.\n"
 
 #: fdisk/fdisksgilabel.c:676
@@ -3827,16 +3728,16 @@ msgid " Last %s"
 msgstr " Ultimo %s"
 
 #: fdisk/fdisksgilabel.c:706
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Creazione di una nuova disklabel SGI. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodich�, ovviamente, il\n"
-"contenuto precedente sar� definitivamente perso.\n"
+"Creazione di una nuova disklabel SGI. Le modifiche rimarranno in memoria\n"
+"fino a quando si decide di scriverle. Dopodiché, ovviamente, il contenuto\n"
+"precedente sarà definitivamente perso.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:728
@@ -3857,44 +3758,43 @@ msgstr "Tentativo di mantenere i parametri della partizione %d in corso.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINIZIO=%d\tLUNGHEZZA=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vuoto"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco intero"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Autorilevamento raid di Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3907,12 +3807,12 @@ msgstr ""
 "per es. testine, settori, cilindri e partizioni\n"
 "o forzare un'etichetta nuova (comando s nel menu principale)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "L'autoconfigurazione ha trovato un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3920,116 +3820,116 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Creazione di una nuova disklabel DOS. Le modifiche rimarranno memorizzate\n"
-"solamente fino a quando si decide di scriverle. Dopodich�, chiaramente, il\n"
-"contenuto precedente non sar� recuperabile.\n"
+"Creazione di una nuova disklabel sun. Le modifiche rimarranno memorizzate\n"
+"solamente fino a quando si decide di scriverle. Dopodiché, chiaramente, il\n"
+"contenuto precedente non sarà recuperabile.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
-"Tipo di unit�\n"
+"Tipo di unità\n"
 "   ?   auto configure\n"
 "   0   custom (con le impostazioni predefinite rilevate dell'hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selezione tipo (? per auto, 0 per custom): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Autoconfigurazione non riuscita.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Settori/traccia"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindri fisici"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
-msgstr "Velocit� di rotazione (rpm)"
+msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
-msgstr "� possibile modificare tutti i parametri disco dal menu x"
+msgstr "È possibile modificare tutti i parametri disco dal menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "floppy da 3,5\""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partizione %d non finisce al limite del cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partizione %d si sovrappone ad altre nei settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervallo inutilizzato - settori 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
-"Altre partizioni coprono gi� il disco intero.\n"
+"Altre partizioni coprono già il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
 "%d %s covers some other partition. Your entry has been changed\n"
 "to %d %s\n"
 msgstr ""
-"Non si � coperto l'intero disco con la terza partizione, ma il valore\n"
-"%d %s copre alcune altre partizioni. La voce immessa � stata cambiata\n"
+"Non si è coperto l'intero disco con la terza partizione, ma il valore\n"
+"%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Se si vuole mantenere la compatibilit� con SunOS/Solaris, prendere\n"
+"Se si vuole mantenere la compatibilità con SunOS/Solaris, prendere\n"
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4042,10 +3942,10 @@ msgstr ""
 "posizione dello swap Linux\n"
 "potrebbe provocare l'eliminazione della tabelle delle partizioni e del "
 "bootblock.\n"
-"Digitare YES  (s�) se si � certi di volere che quella partizione\n"
+"Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4061,10 +3961,10 @@ msgstr ""
 "%d cilindri, %d cilindri alternativi, %d cilindri fisici\n"
 "%d sett./cil. supplementari, interleave %d:1\n"
 "%s\n"
-"Unit� = %s di %d * 512 byte\n"
+"Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4074,19 +3974,19 @@ msgid ""
 msgstr ""
 "\n"
 "Disco %s (etichetta disco Sun): %d testine, %d settori, %d cilindri\n"
-"Unit� = %s di %d * 512 byte\n"
+"Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -4110,52 +4010,41 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Esteso"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX avviabile"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-#, fuzzy
 msgid "W95 FAT32"
-msgstr "Win95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-#, fuzzy
 msgid "W95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-#, fuzzy
 msgid "W95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-#, fuzzy
 msgid "W95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgstr "W95 Esteso (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4183,22 +4072,19 @@ msgstr "HPFS/NTFS nascosto"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr ""
+msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-#, fuzzy
 msgid "Hidden W95 FAT32"
-msgstr "Win95 FAT32 nascosto"
+msgstr "W95 FAT32 nascosto"
 
 #: fdisk/i386_sys_types.c:29
-#, fuzzy
 msgid "Hidden W95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA) nascosto"
+msgstr "W95 FAT32 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:30
-#, fuzzy
 msgid "Hidden W95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA) nascosto"
+msgstr "W95 FAT16 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4206,7 +4092,7 @@ msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
 msgid "Plan 9"
-msgstr ""
+msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
@@ -4244,12 +4130,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4270,8 +4154,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4281,7 +4163,6 @@ msgstr " SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4302,16 +4183,13 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Vecchio Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / vecchio Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
-#, fuzzy
 msgid "Linux swap / Solaris"
-msgstr "Linux swap"
+msgstr "Linux swap / Solaris"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
@@ -4326,9 +4204,8 @@ msgid "NTFS volume set"
 msgstr "set volume NTFS"
 
 #: fdisk/i386_sys_types.c:62
-#, fuzzy
 msgid "Linux plaintext"
-msgstr "Linux ext2"
+msgstr "Linux plaintext"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba"
@@ -4338,22 +4215,18 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
-#, fuzzy
 msgid "BSD/OS"
-msgstr "BSD/386"
+msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Ibernazione IBM Thinkpad"
 
 #: fdisk/i386_sys_types.c:68
 msgid "FreeBSD"
-msgstr ""
+msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4364,16 +4237,15 @@ msgstr "NeXTSTEP"
 
 #: fdisk/i386_sys_types.c:71
 msgid "Darwin UFS"
-msgstr ""
+msgstr "Darwin UFS"
 
 #: fdisk/i386_sys_types.c:72
-#, fuzzy
 msgid "NetBSD"
-msgstr "OpenBSD"
+msgstr "NetBSD"
 
 #: fdisk/i386_sys_types.c:73
 msgid "Darwin boot"
-msgstr ""
+msgstr "Darwin boot"
 
 #: fdisk/i386_sys_types.c:74
 msgid "BSDI fs"
@@ -4385,15 +4257,15 @@ msgstr "BSDI swap"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Boot Wizard hidden"
-msgstr ""
+msgstr "Boot Wizard hidden"
 
 #: fdisk/i386_sys_types.c:77
 msgid "Solaris boot"
-msgstr ""
+msgstr "Solaris boot"
 
 #: fdisk/i386_sys_types.c:78
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #: fdisk/i386_sys_types.c:79
 msgid "DRDOS/sec (FAT-12)"
@@ -4413,194 +4285,178 @@ msgstr "Syrinx"
 
 #: fdisk/i386_sys_types.c:83
 msgid "Non-FS data"
-msgstr ""
+msgstr "Non-FS data"
 
 #: fdisk/i386_sys_types.c:84
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
-msgstr ""
+msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 #, fuzzy
 msgid "BootIt"
 msgstr "Avvio"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "accesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #: fdisk/i386_sys_types.c:94
 msgid "EFI GPT"
-msgstr ""
+msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
-msgstr ""
+msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
-msgstr ""
+msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondario"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "errore di ricerca su %s - impossibile ricercare a %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "errore di ricerca: si voleva 0x%08x%08x, si � ottenuto 0x%08x%08x\n"
+msgstr "errore di ricerca: si voleva 0x%08x%08x, si è ottenuto 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "memoria insufficiente - termina\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "errore in lettura su %s - impossibile leggere il settore %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRORE: il settore %lu non ha una firma msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "errore di scrittura su %s - impossibile scrivere il settore %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "impossibile aprire il file di salvataggio settore partizione (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "impossibile eseguire stat del file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "il file di ripristino partizione ha una dimensione errata - il ripristino "
 "non viene effettuato\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "memoria insufficiente?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "impossibile aprire il file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "errore durante la lettura di %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "impossibile aprire il dispositivo %s per scrivere\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "errore durante la scrittura del settore %lu su %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: impossibile ottenere la geometria\n"
 
-#: fdisk/sfdisk.c:470
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:468
+#, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disco %s: impossibile ottenere la geometria\n"
+msgstr "Disco %s: impossibile ottenere la dimensione\n"
 
-#: fdisk/sfdisk.c:503
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:501
+#, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Attenzione: inizio=%d - sembra una partizione piuttosto che\n"
+"Attenzione: inizio=%lu - sembra una partizione piuttosto che\n"
 "l'intero disco. Utilizzare fdisk su di esso probabilmente non ha senso.\n"
 "[Utilizzare l'opzione --force se lo si desidera davvero]\n"
 
-#: fdisk/sfdisk.c:510
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:508
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
+msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu testine\n"
 
-#: fdisk/sfdisk.c:513
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:511
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
+msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu settori\n"
 
-#: fdisk/sfdisk.c:517
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:515
+#, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d cilindri\n"
+msgstr "Attenzione: BLKGETSIZE/HDIO_GETGEO dice che vi sono %lu cilindri\n"
 
-#: fdisk/sfdisk.c:522
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:520
+#, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Attenzione: numero improbabile di settori (%d) - solitamente sono al massimo "
+"Attenzione: numero improbabile di settori (%lu) - di solito sono al massimo "
 "63\n"
-"Questo creer� problemi con tutto il software che utilizza l'indirizzamento C/"
-"H/S.\n"
+"Questo creerà problemi con i software che utilizza l'indirizzamento C/H/S.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4609,33 +4465,33 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindri, %lu testine, %lu settori/traccia\n"
 
-#: fdisk/sfdisk.c:608
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:606
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per la testina: %d "
-"(dovrebbeessere compreso nell'intervallo 0-%d)\n"
+"%s della partizione %s ha un valore impossibile per la testina: %lu "
+"(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:613
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:611
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per il settore: %d "
-"(dovrebbeessere compreso nell'intervallo 1-%d)\n"
+"%s della partizione %s ha un valore impossibile per il settore: %lu "
+"(dovrebbe essere in 1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:616
+#, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
-"%s della partizione %s ha un valore impossibile per i cilindri: %d (dovrebbe "
-"essere compreso nell'intervallo 0-%d)\n"
+"%s della partizione %s ha un valore impossibile per i cilindri: %lu "
+"(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4644,405 +4500,408 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Rilettura della tabella delle partizioni in corso...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Il comando per la rilettura della tabella delle partizioni non � riuscito\n"
+"Il comando per la rilettura della tabella delle partizioni non è riuscito\n"
 "Riavviare adesso il sistema prima di utilizzare mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errore durante la chiusura di %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "formato non riconosciuto - utilizzo dei settori in corso\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabella delle partizioni di %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato non implementato - utilizzo di %s in corso\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unit� = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
+"Unità = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "   Inizio Boot Dispositivo     Fine   #cilin.   #blocchi   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unit� = settori di 512 byte, conteggiando da %d\n"
+"Unità = settori di 512 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Boot Dispositivo    Inizio      Fine  #settori Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unit� = blocchi di 1024 byte, conteggiando da %d\n"
+"Unità = blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Boot Dispositivo   Inizio       Fine  #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:956
+#, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unit� = megabyte da 1048576 byte, blocchi da 1024 byte, conteggiando da %d\n"
+"Unità = mebibyte da 1048576 byte, blocchi da 1024 byte, contando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Inizio Boot Dispositivo   Fine    MB   #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tinizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tendenza: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
-msgstr "Non si � trovata alcuna partizione\n"
+msgstr "Non si è trovata alcuna partizione\n"
 
-#: fdisk/sfdisk.c:1144
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1142
+#, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Attenzione: la prima partizione sembra sia stata creata\n"
+"Attenzione: la tabella delle partizioni sembra sia stata creata\n"
 "  per C/H/S=*/%ld/%ld (al posto di %ld/%ld/%ld).\n"
-"Per questo elenco viene presunta tale geometria.\n"
+"In questo elenco verrà assunta tale geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "nessuna tabella delle partizioni presente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "strano, sono definite solo %d partizioni.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
-"Attenzione: la partizione %s ha dimensione 0 ma non � contrassegnata come "
+"Attenzione: la partizione %s ha dimensione 0 ma non è contrassegnata come "
 "vuota\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Attenzione: la partizione %s ha dimensione 0 ed � avviabile\n"
+msgstr "Attenzione: la partizione %s ha dimensione 0 ed è avviabile\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 e inizio non nullo\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Attenzione: la partizione %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "non � contenuta nella partizione %s\n"
+msgstr "non è contenuta nella partizione %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Attenzione: le partizioni %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s si sovrappongono\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
+"Attenzione: la partizione %s contiene parte della tabella delle partizioni\n"
+"(settore %lu), e la distruggerà quando viene riempita.\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Attenzione: la partizione %s inizia al settore 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Attenzione: la partizione %s si estende dopo la fine del disco\n"
 
-#: fdisk/sfdisk.c:1276
-#, fuzzy
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
-msgstr "Tra le partizioni primarie, al massimo una pu� essere estesa\n"
+msgstr ""
+"Tra le partizioni primarie, al massimo una può essere estesa\n"
+"  (anche se questo non è un problema per Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non termina al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Attenzione: pi� di una partizione primaria � contrassegnata come avviabile "
+"Attenzione: più di una partizione primaria è contrassegnata come avviabile "
 "(attiva)\n"
-"Questo non ha importanza per LILO, ma MBR DOS non avvier� questo disco.\n"
+"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Attenzione: solitamente � possibile eseguire l'avvio solamente da partizioni "
+"Attenzione: solitamente è possibile eseguire l'avvio solamente da partizioni "
 "primarie\n"
 "LILO non prende in considerazione il flag `bootable' (flag 'avviabile').\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Attenzione: nessuna partizione primaria � contrassegnata come avviabile "
+"Attenzione: nessuna partizione primaria è contrassegnata come avviabile "
 "(attiva)\n"
-"Questo non ha importanza per LILO, ma MBR DOS non avvier� questo disco.\n"
+"Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1345
-#, fuzzy
+#: fdisk/sfdisk.c:1343
 msgid "start"
-msgstr "stato"
+msgstr "inizio"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
-#, fuzzy
+#: fdisk/sfdisk.c:1352
 msgid "end"
-msgstr "invio"
+msgstr "fine"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 " partizione %s: fine: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione %s termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1385
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1383
+#, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
-msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
+msgstr ""
 
-#: fdisk/sfdisk.c:1391
-#, fuzzy
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
-msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
+msgstr ""
+"Attenzione: la partizione estesa non inizia al limite di un cilindro.\n"
+"DOS e Linux interpreteranno i contenuti in modo diverso.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "troppe partizioni - sto ignorando quei numeri passati (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "struttura delle partizioni?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "rilevato l'amministratore del disco - impossibile da gestire\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "trovata firma DM6 - termina\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "strano..., una partizione estesa di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "strano..., una partizione BSD di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1624
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:1622
+#, c-format
 msgid " %s: unrecognized partition table type\n"
-msgstr " %s: partizione non riconosciuta\n"
+msgstr " %s: tipo di tabella delle partizioni non riconosciuto\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: `=' previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "errore di input: carattere non previsto %c dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
-msgstr "non c'� spazio per il descrittore di partizione\n"
+msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
-msgstr "Non c'� spazio per altri\n"
+msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2121
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2119
+#, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Attenzione: superiore alla dimensione massima consentita (%lu)\n"
+msgstr ""
+"Attenzione: la dimensione indicata (%lu) è superiore alla dimensione massima "
+"consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5052,233 +4911,227 @@ msgstr ""
 "predefinito.\n"
 "<inizio> <dimensione> <tipo [E,S,L,X,esadecimale]> <avviabile [-,*]> "
 "<cilindro,testina,settore> <cilindro,testina,settore>\n"
-"Solitamente � necessario specificare solamente <inizio> e <dimensione> ( e "
+"Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "versione"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Utilizzo: %s [opzioni] dispositivo...\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:      idem, ma in un formato adatto per un successivo input"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]: numero dei cilindri ecc. partendo da 1 invece che da "
 "0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
-"    -uS, -uB, -uC, -uM:  accetta/riporta in unit� di settori/blocchi/"
+"    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
 "cilindri/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [o --DOS]:       per la compatibilit� con DOS: spreca un po' di spazio"
+"    -D [o --DOS]:       per la compatibilità con DOS: spreca un po' di spazio"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:   fa rileggere al kernel la tabella delle partizioni"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :            salva sul file i settori che verranno sovrascritti"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla geometria"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
-"    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla geometria"
+"    -G [o --show-pt-geometry]: stampa la geometria stimata in base alla\n"
+"                               tavola delle partizioni"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
-"                             o prevede i rispettivi descrittori in input"
+"                            o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr ""
-"    -L  [o --Linux]:      non reclamare per cose che risultano irrilevanti "
-"per Linux"
+msgstr "    -L  [o --Linux]:      non segnala le cose irrilevanti per Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
-msgstr "    � possibile non usare la geometria rilevata utilizzando:"
+msgstr "    È possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [o --cylindres #]:imposta il numero di cilindri da utilizzare"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:    imposta il numero di testine da utilizzare"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:  imposta il numero di settori da utilizzare"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
-msgstr "� possibile disattivare tutte le verifiche di coerenza con:"
+msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [o --force]:      fa ci� che dico, anche se � stupido"
+msgstr "    -f  [o --force]:      fa ciò che dico, anche se è stupido"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
-msgstr "Utilizzo:"
+msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s device\t\t elenca le partizioni attive sul dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s device n1 n2 ... attiva le partizioni n1 ..., disattiva il resto\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An device\t attiva la partizione n, disattiva le altre\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2639
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2635
+#, c-format
 msgid "total: %llu blocks\n"
-msgstr "totale: %d blocchi\n"
+msgstr "totale: %llu blocchi\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "utilizzo: sfdisk --print-id numero partizione dispositivo\n"
+msgstr "uso: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr " utilizzo: sfdisk --change-id numero partizione dispositivo Id\n"
+msgstr " uso: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "utilizzo: sfdisk --id numero partizione dispositivo [Id]\n"
+msgstr "uso: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
-"� possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
+"è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2715
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2711
+#, c-format
 msgid "cannot open %s read-write\n"
-msgstr "impossibile aprire %s\n"
+msgstr "impossibile aprire %s in lettura e scrittura\n"
 
-#: fdisk/sfdisk.c:2717
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2713
+#, c-format
 msgid "cannot open %s for reading\n"
-msgstr "impossibile aprire %s in lettura"
+msgstr "impossibile aprire %s in lettura\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
+#, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s: %d cilindri, %d testine, %d settori/traccia\n"
+msgstr "%s: %ld cilindri, %ld testine, %ld settori/traccie\n"
 
-#: fdisk/sfdisk.c:2807
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2803
+#, c-format
 msgid "Cannot get size of %s\n"
-msgstr "Impossibile ottenere la dimensione del disco"
+msgstr "impossibile ottenere la dimensione di %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte attivo non valido: 0x%x al posto di 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5286,47 +5139,46 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
-"Ci sono %d partizioni primarie attive. Questo � irrelevante per LILO,\n"
-"ma MBR DOS  avvier� solamente un disco con 1 partizione attiva.\n"
+"Ci sono %d partizioni primarie attive. Questo è irrelevante per LILO,\n"
+"ma MBR DOS  avvierà solamente un disco con 1 partizione attiva.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "la partizione %s ha id %x e non � nascosta\n"
+msgstr "la partizione %s ha id %x e non è nascosta\n"
 
-#: fdisk/sfdisk.c:2983
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2979
+#, c-format
 msgid "Bad Id %lx\n"
-msgstr "Id non valido %x\n"
+msgstr "Id non valido %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
-msgstr "Questo disco � attualmente in uso.\n"
+msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Attenzione: %s non � un dispositivo di blocchi\n"
+msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Verifica in corso che in questo momento nessuno stia utilizzando questo "
 "disco...\n"
 
-#: fdisk/sfdisk.c:3026
-#, fuzzy
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5334,58 +5186,58 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Questo disco � attualmente in uso - effettuare una ripartizione non � "
-"probabilmente una buona idea. Eseguire l'umount di tutti i file system, lo "
-"swapoff di tutte le partizioni swap su questo disco. Utilizzare il flag--no-"
-"reread per eliminare questo controllo.\n"
+"Questo disco è attualmente in uso: ripartirlo è probabilmente una cattiva "
+"idea.\n"
+"Smontare tutti i file system e arrestare le partizioni swap su questo "
+"disco.\n"
+"Usare l'opzione --no-reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:3034
-#, fuzzy
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
-msgstr "OK"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "La partizione %d non esiste, non � possibile modificarla\n"
+msgstr "La partizione %d non esiste, non è possibile modificarla\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
-"(se questo � quanto si desidera, utilizzare l'opzione --force.)\n"
+"(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Questo non mi piace - probabilmente si dovrebbe rispondere no\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5394,31 +5246,31 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
-"La nuova tabella delle partizioni � stata scritta con successo\n"
+"La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Se � stata creata o modificata una partizione DOS, /dev/foo7, per esempio, "
+"Se è stata creata o modificata una partizione DOS, /dev/foo7, per esempio, "
 "utilizzare dd(1)\n"
 " per azzerare i primi 512 byte: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consultare fdisk(8).)\n"
@@ -5437,7 +5289,7 @@ msgstr "shell sconosciuta dopo parametro -s o --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Utilizzo: getopt optstring parametri\n"
+msgstr "Uso: getopt optstring parametri\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
@@ -5495,9 +5347,8 @@ msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prova della versione getopt(1)\n"
 
 #: getopt/getopt.c:337
-#, fuzzy
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -Q, --quiet-output           Nessun output normale\n"
+msgstr ""
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5508,142 +5359,142 @@ msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
 #: getopt/getopt.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "getopt (enhanced) 1.1.3\n"
-msgstr "getopt (avanzato) 1.0.3\n"
+msgstr "getopt (avanzato) 1.1.3\n"
 
 #: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "avviato da MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
-msgstr "Ruffian BCD clock\n"
+msgstr ""
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta clock regolata su 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
-msgstr "funky TOY!\n"
+msgstr ""
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: %s atomico non � riuscito per 1000 iterazioni!"
+msgstr "%s: %s atomico non è riuscito per 1000 iterazioni!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Impossibile aprire /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
-"Non sono riuscito ad ottenere l'autorizzazione perch� non ho provato.\n"
+"Non sono riuscito ad ottenere l'autorizzazione perché non ho provato.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s non riesce a ottenere l'accesso alla porta I/O:  chiamata iopl(3)non "
 "riuscita.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Probabilmente sono necessari privilegi di root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Si presuppone che il clock hardware sia mantenuto nell'orario %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "locale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: attenzione: terza linea non riconosciuta nel file adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Previsto: `UTC' o `LOCAL' o niente.)\n"
 
-#: hwclock/hwclock.c:313
-#, fuzzy, c-format
+#: hwclock/hwclock.c:312
+#, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr "Ultima regolazione della deriva effettuata %d secondi dopo il 1969\n"
+msgstr "Ultima regolazione della deriva effettuata %ld secondi dopo il 1969\n"
 
-#: hwclock/hwclock.c:315
-#, fuzzy, c-format
+#: hwclock/hwclock.c:314
+#, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Ultima calibrazione effettuata %d secondi dopo il 1969\n"
+msgstr "Ultima calibrazione effettuata %ld secondi dopo il 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "Il clock hardware � sull'orario %s\n"
+msgstr "Il clock hardware è sull'orario %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Attesa del segnale dal clock...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...ricevuto segnale dal clock\n"
 
-#: hwclock/hwclock.c:400
-#, fuzzy, c-format
+#: hwclock/hwclock.c:399
+#, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr " Valori non validi nel clock hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr " Valori non validi nel clock hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
-#, fuzzy, c-format
+#: hwclock/hwclock.c:407
+#, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-" Orario clock hardware : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d secondi dal 1969\n"
+"Orario clock hardware : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondi dal 1969\n"
 
-#: hwclock/hwclock.c:436
-#, fuzzy, c-format
+#: hwclock/hwclock.c:435
+#, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr " Orario letto dal clock hardware: %02d:%02d:%02d\n"
+msgstr "Orario letto dal clock hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
-#, fuzzy, c-format
+#: hwclock/hwclock.c:462
+#, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-" Impostazione del clock hardware a %.2d:%.2d:%.2d = %d secondi dal 1969\n"
+"Impostazione del clock hardware a %.2d:%.2d:%.2d = %ld secondi dal 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
-msgstr "Nessun cambio del clock - si tratta solamente di una verifica.\n"
+msgstr "Clock non cambiato - solamente verificato.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5652,56 +5503,56 @@ msgstr ""
 "Il tempo trascorso dall'orario di riferimento e' stato di %.6f secondi.\n"
 "Accumulare ulteriore ritardo per raggiungere il secondo pieno successivo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
 "I registri del clock hardware contengono valori che non sono validi (per es. "
-"50esimo giorno del mese) oppure oltre l'intervallo che � possibile gestire "
+"50esimo giorno del mese) oppure oltre l'intervallo che è possibile gestire "
 "(per es. anno 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondi\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Opzione --date non specificata.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "--date argomento troppo lungo\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Il valore dell'opzione --date non � una data valida.\n"
+"Il valore dell'opzione --date non è una data valida.\n"
 "In particolare, contiene virgolette.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Esecuzione comando date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Impossibile eseguire il programma 'date' nella shell /bin/sh. popen() fallito"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "risposta dal comando date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5713,11 +5564,11 @@ msgstr ""
 "Il comando date emesso da %s riporta risultati imprevisti.\n"
 "Il comando era:\n"
 "  %s\n"
-"La risposta � stata:\n"
+"La risposta è stata:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
-#, fuzzy, c-format
+#: hwclock/hwclock.c:636
+#, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
 "the converted time value was expected.\n"
@@ -5726,86 +5577,84 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Il comando dato emesso da %s riporta qualcosa d'altro rispetto ad un numero "
+"Il comando date emesso da %s riporta qualcosa d'altro rispetto ad un numero "
 "intero laddove era previsto il valore dell'orario convertito.\n"
 "Il comando era:\n"
 "  %s\n"
-"La risposta � stata:\n"
-" %s\n"
+"La risposta è stata:\n"
+"  %s\n"
 
-#: hwclock/hwclock.c:648
-#, fuzzy, c-format
+#: hwclock/hwclock.c:647
+#, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr "la stringa della data %s equivale a %d secondi dal 1969.\n"
+msgstr "la stringa della data %s equivale a %ld secondi dal 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"Il clock hardware non contiene un orario valido, perci� non � possibile "
+"Il clock hardware non contiene un orario valido, perciò non è possibile "
 "impostare l'ora del sistema a partire da esso.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr " Chiamata settimeofday in corso:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
-#, fuzzy, c-format
+#: hwclock/hwclock.c:704
+#, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
-"Il clock di sistema non viene impostato perch� sta funzionando in modalit� "
+"Il clock di sistema non viene impostato perché sta funzionando in modalità "
 "test.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Bisogna essere superuser per impostare il clock del sistema\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr " settimeofday() non riuscito"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poich� in "
+"Non viene effettuata la regolazione del fattore di deriva poiché in "
 "precedenza il clock hardwareconteneva elementi insoliti.\n"
 
-#: hwclock/hwclock.c:755
-#, fuzzy, c-format
+#: hwclock/hwclock.c:754
+#, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poich� � trascorso "
-"meno di un giornodall'ultima calibrazione.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"Non viene effettuata la regolazione del fattore di deriva poich� � trascorso "
+"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
 "meno di un giornodall'ultima calibrazione.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5816,23 +5665,23 @@ msgstr ""
 "nonostante il fattoredi deriva fosse di %f secondi/giorno.\n"
 "Regolazione del fattore di deriva a %f secondi/giorno\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Il tempo trascorso dall'ultima regolazione � di %d secondi\n"
+msgstr "Il tempo trascorso dall'ultima regolazione è di %d secondi\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
-"� necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
+"È necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Il file adjtime non viene aggiornato a causa della modalit� test.\n"
+msgstr "Il file adjtime non viene aggiornato a causa della modalità test.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5841,42 +5690,42 @@ msgstr ""
 "Si sarebbe scritto quanto segue in %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametri di regolazione della deriva non aggiornati.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
-"Il clock hardware non contiene un'ora valida, perci� non � possibile "
+"Il clock hardware non contiene un'ora valida, perciò non è possibile "
 "regolarlo.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
-"La regolazione necessaria equivale a meno di un secondo, perci� il clock non "
+"La regolazione necessaria equivale a meno di un secondo, perciò il clock non "
 "viene impostato.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "Utilizzo di %s in corso.\n"
+msgstr "Utilizzo di %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Impossibile trovare un'interfaccia clock utilizzabile.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5886,22 +5735,22 @@ msgid ""
 msgstr ""
 "Il kernel mantiene un valore epoch per il clock hardware solo su di una "
 "macchinaAlpha.\n"
-"Questa copia di hwclock � stata realizzata per una macchina diversa da "
+"Questa copia di hwclock è stata realizzata per una macchina diversa da "
 "Alpha\n"
-"(e quindi, presumibilmente, non pu� essere eseguita su un Alpha in questo "
+"(e quindi, presumibilmente, non può essere eseguita su un Alpha in questo "
 "momento). Nessuna azione intrapresa.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Impossibile ottenere il valore epoch dal kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Il kernel pressuppone un valore epoch di %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5910,19 +5759,24 @@ msgstr ""
 "Per impostare il valore epoch si deve utilizzare l'opzione 'epoch' per "
 "indicare su quale valore impostarlo.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "Non viene impostato il valore epoch a %d - si tratta solamente di una "
 "verifica.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossibile impostare il valore epoch nel kernel.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s da %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5955,7 +5809,7 @@ msgid ""
 msgstr ""
 "hwclock - ricerca e impostazione del clock di sistema (RTC)\n"
 "\n"
-"Utilizzo: hwclock [funzione] [opzioni...]\n"
+"Uso: hwclock [funzione] [opzioni...]\n"
 "\n"
 "Funzioni:\n"
 "  --help        mostra questa guida\n"
@@ -5965,23 +5819,23 @@ msgstr ""
 "  --systohc     imposta il clock hardware sull'ora del sistema attuale\n"
 "  --adjust      regola l'rtc tenendo conto della deriva sistematica "
 "dall'ultima \n"
-"                volta in cui il clock � stato impostato o regolato\n"
+"                volta in cui il clock è stato impostato o regolato\n"
 "  --getepoch    stampa il valore epoch del clock hardware del kernel\n"
 "  --setepoch    imposta il valore epoch del clock hardware del kernel sul \n"
 "                valore dato con --epoch\n"
 "  --version     stampa la versione di hwclock su stdout\n"
 "\n"
 "Opzioni: \n"
-"  --utc         il clock hardware � mantenuto su di un orario universale "
+"  --utc         il clock hardware è mantenuto su di un orario universale "
 "coordinato\n"
-"  --localtime   il clock hardware � mantenuto sull'ora locale\n"
+"  --localtime   il clock hardware è mantenuto sull'ora locale\n"
 "  --directisa   accesso diretto al bus ISA invece di %s\n"
-"  --badyear     ignora l'anno rtc perch� il bios � danneggiato\n"
+"  --badyear     ignora l'anno rtc perché il bios è danneggiato\n"
 "  --date        specifica l'ora sulla quale impostare il clock hardware \n"
-"  --epoch=anno  specifica l'anno che � l'inizio per il \n"
+"  --epoch=anno  specifica l'anno che è l'inizio per il \n"
 "                valore epoch del clock hardware\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5991,22 +5845,22 @@ msgstr ""
 "                indicano al hwclock il tipo di alpha utilizzato (consultare "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
-"%s non considera argomenti che non siano opzioni. � stato fornito %d.\n"
+"%s non considera argomenti che non siano opzioni. È stato fornito %d.\n"
 
-#: hwclock/hwclock.c:1404
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1403
+#, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Sono state specificate opzioni di funzione multipla.\n"
-"� possibile eseguire una sola funzione per volta.\n"
+"Sono state specificate multiple funzioni.\n"
+"È possibile eseguire una sola funzione per volta.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6015,58 +5869,60 @@ msgstr ""
 "%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
 "specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1418
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1417
+#, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
-"%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
-"specificate entrambe.\n"
+"%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
+"state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
-msgstr ""
+msgstr "%s: Con --noadjfile, occorre specificare o --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Impossibile utilizzare l'ora impostata. Impossibile impostare il clock.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Spiacente, solamente il superuser pu� modificare il clock hardware.\n"
+msgstr ""
+"Spiacente, solamente il superutente può modificare il clock hardware.\n"
 
-#: hwclock/hwclock.c:1460
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1459
+#, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr "Spiacente, solamente il superuser pu� modificare il clock hardware.\n"
+msgstr ""
+"Spiacente, solamente il superutente può modificare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"Solamente il supeuser pu� modificare l'epoch del clock hardware nel kernel.\n"
+"Solamente il supeutente può modificare l'epoca del clock hardware nel "
+"kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1488
+#, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-" Impossibile accedere al clock hardware attraverso qualsiasi metodo "
-"conosciuto.  Utilizzare l'opzione --debug per visionare i dettagli della "
-"nostra ricerca di un metodo d'accesso.\n"
+"Usare l'opzione --debug per vedere i dettagli della ricerca di un metodo di "
+"accesso.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -6087,20 +5943,17 @@ msgid "KDGHWCLK ioctl to read time failed in loop"
 msgstr " Lettura dell'orario con KDGHWCLK ioctl non riuscita nel loop"
 
 #: hwclock/kd.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr " ioctl() non � riuscito a leggere l'orario da  /dev/tty1"
+msgstr " ioctl() non è riuscito a leggere l'orario da %s"
 
 #: hwclock/kd.c:141
-#, fuzzy
 msgid "ioctl KDSHWCLK failed"
-msgstr " KDGHWCLK ioctl non riuscito"
+msgstr "ioctl KDGHWCLK non riuscito"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
-#, fuzzy
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "Impossibile aprire /dev/tty1"
+msgstr "Impossibile aprire /dev/tty1 o /dev/vc/1"
 
 #: hwclock/kd.c:181
 msgid "KDGHWCLK ioctl failed"
@@ -6132,14 +5985,14 @@ msgid "read() to %s to wait for clock tick failed"
 msgstr " read() su %s per l'attesa del segnale dal clock fallita"
 
 #: hwclock/rtc.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+msgstr "select() su %s per l'attesa del segnale dal clock fallita"
 
 #: hwclock/rtc.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
-msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+msgstr "select() su %s per l'attesa del segnale dal clock scaduta\n"
 
 #: hwclock/rtc.c:268
 #, c-format
@@ -6152,23 +6005,23 @@ msgstr ""
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"Non riuscita inaspettatamente l'attivazione degli interrupt d'aggiornametno "
-"attraverso ioctl() su %s "
+"ioctl() su %s per attivare gli interrupt di aggiornamento non riuscita "
+"inaspettatamente"
 
 #: hwclock/rtc.c:330
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "Non riusciuta l'impostazione dell'ora attraverso ioctl() su %s.\n"
+msgstr "ioctl() su %s per impostare l'ora non riuscita.\n"
 
 #: hwclock/rtc.c:336
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr " ioctl(%s) ha funzionato.\n"
+msgstr "ioctl(%s) ha funzionato.\n"
 
 #: hwclock/rtc.c:365
 #, c-format
 msgid "Open of %s failed"
-msgstr "Non riuscita l'apertura di %s"
+msgstr "Apertura di %s non riuscita"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
@@ -6189,20 +6042,17 @@ msgstr "Impossibile aprire %s"
 #: hwclock/rtc.c:395
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
+msgstr " ioctl(RTC_EPOCH_READ) su %s non riuscita"
 
 #: hwclock/rtc.c:401
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Il valore epoch non pu� essere inferiore a 1900. Si � richiesto %ld\n"
+msgstr "Il valore epoch non può essere inferiore a 1900. Si è richiesto %ld\n"
 
 #: hwclock/rtc.c:439
 #, c-format
@@ -6225,7 +6075,6 @@ msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
 msgid "calling open_tty\n"
 msgstr "chiamata a open_tty in corso\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "chiamata a termio_init in corso\n"
@@ -6234,7 +6083,6 @@ msgstr "chiamata a termio_init in corso\n"
 msgid "writing init string\n"
 msgstr "scrittura init string in corso\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "prima di autobaud\n"
@@ -6248,7 +6096,6 @@ msgstr "in attesa di cr-lf\n"
 msgid "read %c\n"
 msgstr "lettura di %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lettura del nome di login\n"
@@ -6282,11 +6129,11 @@ msgstr "entered parse_speeds\n"
 #: login-utils/agetty.c:545
 #, c-format
 msgid "bad speed: %s"
-msgstr "velocit� non valida: %s"
+msgstr "velocità non valida: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr "troppe velocit� alternative"
+msgstr "troppe velocità alternative"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
@@ -6300,9 +6147,8 @@ msgstr "/dev: chdir() non riuscito: %m"
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s: non � un dispositivo di caratteri"
+msgstr "/dev/%s: non è un dispositivo di caratteri"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6315,14 +6161,12 @@ msgstr "/dev/%s: impossibile l'apertura come input standard: %m"
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: non � aperto per lettura/scrittura"
+msgstr "%s: non è aperto per lettura/scrittura"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6360,54 +6204,49 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Utilizzo: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"Uso: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
 "login_host] baud_rate,... linea [tipo terminale]\n"
 "o\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "baud_rate linea,... [tipo terminale]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr "login: poca memoria, � possibile che il login non riesca\n"
+msgstr "login: poca memoria, è possibile che il login non riesca\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "malloc per ttyclass non possibile"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "malloc per grplist impossibile"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Login a %s da %s negato in base all'impostazione predefinita.\n"
+msgstr "Login a %s da %s negato per impostazione predefinita.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login a %s da %s negato.\n"
 
 #: login-utils/chfn.c:128 login-utils/chsh.c:113
-#, c-format
+#, fuzzy, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: non si esiste (come utente %d).\n"
 
 #: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: utente \"%s\" non esiste.\n"
+msgstr "%s: l'utente \"%s\" non esiste.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
-"%s: � possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
+"%s: è possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
 msgid "Unknown user context"
@@ -6421,7 +6260,7 @@ msgstr ""
 #: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: impossibile impostare il contesto predefinito per /etc/passwd"
 
 #: login-utils/chfn.c:173
 #, c-format
@@ -6434,8 +6273,8 @@ msgstr "Modifica delle informazioni finger per %s in corso.\n"
 msgid "Password error."
 msgstr "Errore password."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Password: "
@@ -6452,7 +6291,7 @@ msgstr "Le informazioni finger non sono state modificate.\n"
 #: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Utilizzo: %s [ -f nome intero ] [ -o ufficio ]"
+msgstr "Uso: %s [ -f nome intero ] [ -o ufficio ]"
 
 #: login-utils/chfn.c:320
 #, c-format
@@ -6480,12 +6319,12 @@ msgstr ""
 #: login-utils/chfn.c:425
 #, c-format
 msgid "field is too long.\n"
-msgstr "il campo � troppo lungo.\n"
+msgstr "il campo è troppo lungo.\n"
 
 #: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' non � consentito.\n"
+msgstr "'%c' non è consentito.\n"
 
 #: login-utils/chfn.c:438
 #, c-format
@@ -6509,9 +6348,9 @@ msgid "malloc failed"
 msgstr "malloc non riuscita"
 
 #: login-utils/chsh.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" non � elencato in /etc/shells.\n"
+msgstr "%s: %s non è autorizzato a cambiare la shelldi %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
@@ -6523,7 +6362,7 @@ msgstr ""
 #: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr "%s: la shell non � in /etc/shells, modifica shell negata\n"
+msgstr "%s: la shell non è in /etc/shells, modifica della shell negata\n"
 
 #: login-utils/chsh.c:170
 #, c-format
@@ -6550,11 +6389,13 @@ msgid "Shell changed.\n"
 msgstr "Shell modificata.\n"
 
 #: login-utils/chsh.c:293
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
-msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
+msgstr ""
+"Uso: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ nomeutente ]\n"
 
 #: login-utils/chsh.c:336
 #, c-format
@@ -6574,7 +6415,7 @@ msgstr "%s: \"%s\" non eseguibile.\n"
 #: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: '%c' non � consentito.\n"
+msgstr "%s: '%c' non è consentito.\n"
 
 #: login-utils/chsh.c:355
 #, c-format
@@ -6584,22 +6425,22 @@ msgstr "%s: Non sono ammessi i caratteri di controllo.\n"
 #: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Attenzione: \"%s\" non � elencato in /etc/shells\n"
+msgstr "Attenzione: \"%s\" non è elencato in /etc/shells\n"
 
 #: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s: \"%s\" non � elencato in /etc/shells.\n"
+msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
 
 #: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s: utilizzo opzione -l per consultare l'elenco\n"
+msgstr "%s: usare l'opzione -l per vedere l'elenco\n"
 
 #: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Attenzione: \"%s\" non � elencato in /etc/shells.\n"
+msgstr "Attenzione: \"%s\" non è elencato in /etc/shells.\n"
 
 #: login-utils/chsh.c:373
 #, c-format
@@ -6611,48 +6452,20 @@ msgstr "Utilizzare %s -l per consultare l'elenco.\n"
 msgid "No known shells.\n"
 msgstr "Nessuna shell conosciuta.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr " impossibile aprire /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "impossibile leggere dati random da /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "impossibile aprire %s in lettura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "impossibile eseguire stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s non ha i filemode corretti"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "impossibile leggere i dati da %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "Impossibile leggere %s, uscita in corso."
+msgstr "Impossibile leggere %s, uscita."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr " utilizzo: ultimo [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
+msgstr "uso: last [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  tuttora collegato"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6661,15 +6474,15 @@ msgstr ""
 "\n"
 "wtmp inizia %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: errore di malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6678,51 +6491,45 @@ msgstr ""
 "\n"
 "interrotto %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
-#, fuzzy, c-format
+#: login-utils/login.c:196
+#, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "mount: impossibile aprire %s: %s"
+msgstr "FATALE: impossibile riaprire la tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "FATALE: tty non valida"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h solamente per super-user.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr "utilizzo: login [-fp] [nomeutente]\n"
+msgstr "uso: login [-fp] [nomeutente]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "logine: errore PAM, interruzione in corso: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Impossibile inizializzare PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "FALLITA LOGIN %d DA %s PER %s, %s"
+msgstr "FALLITO IL LOGIN %d DA %s PER %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6731,161 +6538,146 @@ msgstr ""
 "Login non corretto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TROPPI TENTATIVI DI LOGIN (%d) DA %s PER %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FALLITA SESSIONE DI LOGIN DA %s PER %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Login  non corretto\n"
+"Login non corretto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "Nome utente NULL in %s:%d. Interrotto."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "Nome utente \"%s\" non valido in %s:%d. Interrotto."
 
-#: login-utils/login.c:667
-#, fuzzy, c-format
+#: login-utils/login.c:604
+#, c-format
 msgid "login: Out of memory\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "login: memoria esaurita\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nome utente non valido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login rifiutato su questo terminale.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO DA %s SU TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO SU TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login non corretto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Troppi utenti gi� collegati.\n"
-"Riprovare successivamente.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Ci sono troppi processi in esecuzione.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1100
-#, fuzzy, c-format
+#: login-utils/login.c:1009
+#, c-format
 msgid "You have new mail.\n"
-msgstr "C'� %sposta.\n"
+msgstr "C'è nuova posta.\n"
 
-#: login-utils/login.c:1102
-#, fuzzy, c-format
+#: login-utils/login.c:1011
+#, c-format
 msgid "You have mail.\n"
-msgstr "C'� %sposta.\n"
+msgstr "C'è posta.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: errore in esecuzione forking: %s"
+msgstr "login: errore in esecuzione del fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "TIOCSCTTY non riuscito: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6894,65 +6686,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
-msgstr "il nome di login � troppo lungo.\n"
+msgstr "il nome di login è troppo lungo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -6960,181 +6752,46 @@ msgstr "%d ERRORI DI LOGIN SU %s, %s"
 #: login-utils/mesg.c:89
 #, c-format
 msgid "is y\n"
-msgstr "� s\n"
+msgstr "è s\n"
 
 #: login-utils/mesg.c:92
 #, c-format
 msgid "is n\n"
-msgstr "� n\n"
+msgstr "è n\n"
 
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr "utilizzo: mesg [s | n]\n"
+msgstr "uso: mesg [s | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: chi sei?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: nessun gruppo di questo genere."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: autorizzazione negata"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Nessuna shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Impossibile riutilizzare la vecchia password.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-"Non utilizzare come password qualcosa che assomigli al proprio nome utente!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-"Non utilizzare come password qualcosa che assomigli al proprio vero nome!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Utilizzo: passwd [nome utente [password]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Solo root pu� utilizzare le forme a uno e due argomenti\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Utilizzo: passwd [-foqsvV] [utente [password]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Exec %s impossibile: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Impossibile trovare il nome di login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Solo root pu� modificare la password per gli altri.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Troppi argomenti.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Impossibile trovare il nome utente.`%s' � davvero un utente?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Posso modificare solo le password locali. Utilizzare invece yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID e nome utente non combaciano, impostore!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Modifica password per %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Immettere vecchia password: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Password non valida, impostore."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Immettere la nuova password: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Password non modificata."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ridigitare la nuova password: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Ortografia sbagliata. La password non � stata modificata."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "password modificata, utente %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "PASSWORD ROOT MODIFICATA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "password modificata da root, utente %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "chiamata di setpwnam per impostare la password.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Password *NON* modificata. Riprovare successivamente.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Password modificata.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Utilizzo: spegnimento [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Uso: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -7143,12 +6800,12 @@ msgstr "Processo di spegnimento interrotto"
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: solamente root pu� spegnere un sistema.\n"
+msgstr "%s: solamente root può spegnere un sistema.\n"
 
 #: login-utils/shutdown.c:256
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Verr� effettuato domani, non � possibile attendere fino ad allora?\n"
+msgstr "Verrà effettuato domani, non è possibile attendere fino ad allora?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
@@ -7161,30 +6818,29 @@ msgstr " timeout = %d, quiet = %d, reboot = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "Il sistema verr� spento entro 5 minuti"
+msgstr "Il sistema verrà spento entro 5 minuti"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "� perci� proibito effettuare il login."
+msgstr "È perciò proibito effettuare il login."
 
 #: login-utils/shutdown.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "rebooted by %s: %s"
-msgstr "%s attraverso %s: %s"
+msgstr "riavviato da %s: %s"
 
 #: login-utils/shutdown.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "halted by %s: %s"
-msgstr "%s attraverso %s: %s"
+msgstr "fermato da %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"perch� sono ancora attivo dopo il riavvio?"
+"Perché sono ancora attivo dopo il riavvio?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -7192,12 +6848,12 @@ msgid ""
 "Now you can turn off the power..."
 msgstr ""
 "\n"
-"Ora � possibile togliere l'alimentazione elettrica..."
+"È ora possibile togliere l'alimentazione elettrica..."
 
 #: login-utils/shutdown.c:447
 #, c-format
 msgid "Calling kernel power-off facility...\n"
-msgstr "Chiamata della funzionalit� di spegnimento del kernel...\n"
+msgstr "Chiamata della funzionalità di spegnimento del kernel...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
@@ -7214,36 +6870,35 @@ msgstr "Esecuzione del programma \"%s\" in corso...\n"
 msgid "Error executing\t%s\n"
 msgstr "Errore durante l'esecuzione di\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
-#, fuzzy, c-format
+#, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENTE: messaggio broadcast da %s:"
+msgstr "URGENTE: messaggio broadcast da %s:"
 
 #: login-utils/shutdown.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "Il sistema si spegner� tra %d ora/e%s %d minuti"
+msgstr "Il sistema si spegnerà tra %d ore e %d minuti"
 
 #: login-utils/shutdown.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "Il sistema si spegner� tra %d ora/e%s %d minuti"
+msgstr "Il sistema si spegnerà tra 1 ora e %d minuti"
 
 #: login-utils/shutdown.c:500
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d minutes\n"
-msgstr "Il sistema si spegner� in %d minuti%s\n"
+msgstr "Il sistema si spegnerà in %d minuti\n"
 
 #: login-utils/shutdown.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in 1 minute\n"
-msgstr "Il sistema si spegner� in %d minuti%s\n"
+msgstr "Il sistema si spegnerà in 1 minuto\n"
 
 #: login-utils/shutdown.c:505
 #, c-format
 msgid "System going down IMMEDIATELY!\n"
-msgstr "Il sistema si spegner� IMMEDIATAMENTE!\n"
+msgstr "Il sistema si spegnerà IMMEDIATAMENTE!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -7252,65 +6907,61 @@ msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "Esecuzione del fork per swapoff impossibile.Pazienza!"
+msgstr "Impossibile fare un fork per swapoff. Pazienza!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "Exec swapoff impossibile, sperando che umount ce la faccia."
+msgstr "Impossibile eseguire swapoff, si spera che umount ce la faccia."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "impossibile eseguire il fork per umount, provare manualmente."
+msgstr "Impossibile fare un fork per umount, si prova manualmente."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "Exec %s impossibile, tentativo di utilizzo di umount.\n"
+msgstr "Impossibile eseguire %s, si prova ad usare umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "Exec umount impossibile, termina utilizzo di umount."
+msgstr "Impossibile eseguire umount, termina utilizzo di umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
 #: login-utils/shutdown.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "spegnimento: impossibile eseguire umount di %s\n"
+msgstr "shutdown: Impossibile smontare %s: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr "Avvio in modalit� singolo utente.\n"
+msgstr "Avvio in modalità singolo utente.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr " exec di una shell per singolo utente non riuscita\n"
+msgstr "esecuzione di una shell per singolo utente non riuscita\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
 msgstr "fork di una shell per singolo utente non riuscito\n"
 
 #: login-utils/simpleinit.c:208
-#, fuzzy
 msgid "error opening fifo\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr "errore durante l'apertura del fifo\n"
 
 #: login-utils/simpleinit.c:212
 msgid "error setting close-on-exec on /dev/initctl"
 msgstr ""
 
 #: login-utils/simpleinit.c:259
-#, fuzzy
 msgid "error running finalprog\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
-#, fuzzy
 msgid "error forking finalprog\n"
-msgstr "Errore durante lo spegnimento\t%s\n"
+msgstr ""
 
 #: login-utils/simpleinit.c:345
 msgid ""
@@ -7318,28 +6969,25 @@ msgid ""
 "Wrong password.\n"
 msgstr ""
 "\n"
-"password errata.\n"
+"Password errata.\n"
 
 #: login-utils/simpleinit.c:418
-#, fuzzy
 msgid "lstat of path failed\n"
-msgstr " settimeofday() non riuscito"
+msgstr ""
 
 #: login-utils/simpleinit.c:426
-#, fuzzy
 msgid "stat of path failed\n"
-msgstr " settimeofday() non riuscito"
+msgstr "stat del percorso non riuscito\n"
 
 #: login-utils/simpleinit.c:434
-#, fuzzy
 msgid "open of directory failed\n"
-msgstr "apertura file rc non riuscita\n"
+msgstr "apertura della directory non riuscita\n"
 
 #: login-utils/simpleinit.c:508
 msgid "fork failed\n"
 msgstr "fork non riuscito\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec fallita\n"
 
@@ -7352,13 +7000,13 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "TERM non definito o impossibile eseguire stat sul tty\n"
 
 #: login-utils/simpleinit.c:936
-#, fuzzy, c-format
+#, c-format
 msgid "error stopping service: \"%s\""
-msgstr "errore durante la scrittura di %s: %s"
+msgstr "errore fermando il servizio \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "troppi iov's (modificare codice in wall/ttymsg.c)"
+msgstr "troppi iov (modificare codice in wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
@@ -7381,19 +7029,19 @@ msgid "%s: BAD ERROR"
 msgstr "%s: BRUTTO ERRORE"
 
 #: login-utils/vipw.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s: il file %s � occupato.\n"
+msgstr "%s: il file delle password è occupato.\n"
 
 #: login-utils/vipw.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: il file %s � occupato.\n"
+msgstr "%s: il file di gruppo è occupato.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: il file %s � occupato (%s presente)\n"
+msgstr "%s: il file %s è occupato (%s presente)\n"
 
 #: login-utils/vipw.c:168
 #, c-format
@@ -7401,14 +7049,14 @@ msgid "%s: can't link %s: %s\n"
 msgstr "%s: impossibile collegare %s: %s\n"
 
 #: login-utils/vipw.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get context for %s"
-msgstr "Impossibile ottenere il timeout per %s: %s\n"
+msgstr "%s: impossibile ottenere il contesto per %s"
 
 #: login-utils/vipw.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't set context for %s"
-msgstr "Impossibile ottenere il timeout per %s: %s\n"
+msgstr "%s: impossibile impostare il contesto per %s"
 
 #: login-utils/vipw.c:217
 #, c-format
@@ -7432,25 +7080,26 @@ msgstr "%s: %s immutato\n"
 msgid "%s: no changes made\n"
 msgstr "%s: nessuna modifica effettuata\n"
 
+# FIXME: shadow: invariato? ombra?
 #: login-utils/vipw.c:352
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "Gruppi shadow sono usati su questo sistema.\n"
 
 #: login-utils/vipw.c:353
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "Password shadow sono usate su questo sistema.\n"
 
 #: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Volete modificare %s adesso [y/n]?"
 
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "utilizzo: %s [file]\n"
+msgstr "uso: %s [file]\n"
 
 #: login-utils/wall.c:159
 #, c-format
@@ -7463,9 +7112,9 @@ msgid "Broadcast Message from %s@%s"
 msgstr "Messaggio broadcast da %s@%s"
 
 #: login-utils/wall.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: impossibile leggere %s.\n"
+msgstr ""
 
 #: login-utils/wall.c:209
 #, c-format
@@ -7475,7 +7124,7 @@ msgstr "%s: impossibile leggere %s.\n"
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: impossibile eseguire lo stat del file temporaneo.\n"
+msgstr "%s: impossibile fare stat del file temporaneo.\n"
 
 #: login-utils/wall.c:241
 #, c-format
@@ -7484,35 +7133,28 @@ msgstr "%s: impossibile leggere il file temporaneo.\n"
 
 #: misc-utils/cal.c:327
 msgid "illegal month value: use 1-12"
-msgstr "valore mese non valido: utilizzarne uno da 1 a 12"
+msgstr "valore del mese non valido: usare 1-12"
 
 #: misc-utils/cal.c:331
 msgid "illegal year value: use 1-9999"
-msgstr "valore anno non valido: utilizzarne uno da 1 da 9999"
-
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
+msgstr "valore dell'anno non valido: usare 1-9999"
+
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
 msgstr ""
 
 #: misc-utils/cal.c:780
-#, fuzzy, c-format
+#, c-format
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "utilizzo: cal [-mjyV] [[mese] anno]\n"
+msgstr "uso: cal [-13smjyV] [[mese] anno]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr " utilizzo: %s [+formato] [giorno mese anno]\n"
+msgstr " uso: %s [+formato] [giorno mese anno]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Giorno di S.Tiberio"
 
@@ -7534,12 +7176,12 @@ msgstr "%s: segnale sconosciuto %s; segnali validi:\n"
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "utilizzo: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "uso: %s [ -s segnale | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
 msgid "       %s -l [ signal ]\n"
-msgstr "       %s -l [ signal ]\n"
+msgstr "       %s -l [ segnale ]\n"
 
 #: misc-utils/logger.c:141
 #, c-format
@@ -7549,25 +7191,24 @@ msgstr "logger: %s: %s.\n"
 #: misc-utils/logger.c:248
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: nome funzionalit� sconosciuto: %s.\n"
+msgstr "logger: nome funzionalità sconosciuto: %s.\n"
 
 #: misc-utils/logger.c:260
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: nome priorit� sconosciuto: %s.\n"
+msgstr "logger: nome priorità sconosciuto: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"utilizzo: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] "
-"[ messaggio .. ]\n"
+"uso: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ messaggio .. ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr " utilizzo: look [-dfa] [-t char] stringa [file]\n"
+msgstr " uso: look [-dfa] [-t char] stringa [file]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
@@ -7592,7 +7233,7 @@ msgstr "namei: impossibile eseguire chdir su %s - %s (%d)\n"
 #: misc-utils/namei.c:126
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "utilizzo: namei [-mx] nome percorso [nome percorso ...]\n"
+msgstr "uso: namei [-mx] nome percorso [nome percorso ...]\n"
 
 #: misc-utils/namei.c:151
 #, c-format
@@ -7605,9 +7246,9 @@ msgid "namei: could not stat root!\n"
 msgstr "namei: impossibile eseguire stat della directory root!\n"
 
 #: misc-utils/namei.c:172
-#, fuzzy, c-format
+#, c-format
 msgid "namei: buf overflow\n"
-msgstr "  Overflow\n"
+msgstr "namei: buf overflow\n"
 
 #: misc-utils/namei.c:218
 #, c-format
@@ -7630,44 +7271,47 @@ msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: tipo file sconosciuto 0%06o su file %s\n"
 
 #: misc-utils/rename.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: memoria esaurita!\n"
+msgstr "%s: memoria esaurita\n"
 
 #: misc-utils/rename.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "impossibile rinominare %s in %s: %s\n"
+msgstr "%s: impossibile rinominare %s in %s: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
+"Attenzione: `%s' è un link.\n"
+"Usare `%s [opzioni] %s' se volete veramente usarlo.\n"
+"Script non avviato.\n"
 
-#: misc-utils/script.c:169
-#, fuzzy, c-format
+#: misc-utils/script.c:168
+#, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr " utilizzo: script [-a] [file]\n"
+msgstr "uso: script [-a] [-f] [-q] [-t] [file]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Script iniziato, il file � %s\n"
+msgstr "Script iniziato, il file è %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7676,257 +7320,256 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "Script effettuato, il file � %s\n"
+msgstr "Script effettuato, il file è %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
-msgstr "esauriti tutti i pty disponibili\n"
+msgstr "Esauriti tutti i pty disponibili\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr "%s: argomento errato, utilizzo\n"
+msgstr "%s: argomento errato, uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_name ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -dump   [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilename ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
-msgstr " impossibile (dis)impostare la modalit� risparmio energetico\n"
+msgstr " impossibile (dis)impostare la modalità risparmio energetico\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "errore klogctl : %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Errore in scrittura screendump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "impossibile leggere %s  e impossibile eseguire ioctl sul dump\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: $TERM non � definito.\n"
+msgstr "%s: $TERM non è definito.\n"
 
 #: misc-utils/whereis.c:157
 #, c-format
@@ -7941,12 +7584,12 @@ msgstr "write: impossibile trovare il nome di tty\n"
 #: misc-utils/write.c:110
 #, c-format
 msgid "write: you have write permission turned off.\n"
-msgstr "write: l'autorizzazione per la scrittura � disattivata.\n"
+msgstr "write: l'autorizzazione per la scrittura è disattivata.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s non � collegato a %s.\n"
+msgstr "write: %s non è collegato a %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
@@ -7956,12 +7599,12 @@ msgstr "write: %s ha i messaggi disattivati su %s\n"
 #: misc-utils/write.c:146
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr "utilizzo: write user [tty]\n"
+msgstr "uso: write utente [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr "write: %s non � collegato\n"
+msgstr "write: %s non è collegato\n"
 
 #: misc-utils/write.c:243
 #, c-format
@@ -7971,12 +7614,12 @@ msgstr "write: %s ha i messaggi disattivati\n"
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr "write: %s � collegato pi� di una volta; scrittura su %s in corso\n"
+msgstr "write: %s è collegato più di una volta; scrittura su %s in corso\n"
 
 #: misc-utils/write.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr "Messaggio da %s@%s su %s a %s ..."
+msgstr "Messaggio da %s@%s (come %s) su %s a %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
@@ -7998,40 +7641,32 @@ msgstr "attenzione: impossibile aprire %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
-"impossibile creare un file di blocco %s: %s (utilizzare il flag -n per "
-"tralasciare)"
+"impossibile creare un file di lock %s: %s (usare il flag -n per cambiare)"
 
 #: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-"impossibile collegare il file di blocco %s: %s  (utilizzare il flag -n per "
-"tralasciare)"
+"impossibile collegare il file di lock %s: %s  (usare il flag -n per cambiare)"
 
 #: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
-"impossibile aprire il file di blocco %s: %s (utilizzare flag -n per "
-"tralasciare)"
+msgstr "impossibile aprire il file di lock %s: %s (usare flag -n per cambiare)"
 
 #: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Impossibile bloccare il file di blocco %s: %s\n"
+msgstr "Impossibile fare il lock del file di lock %s: %s\n"
 
 #: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Impossibile bloccare il file di blocco %s: %s"
+msgstr "impossibile fare il lock del file di lock %s: %s"
 
 #: mount/fstab.c:540
 msgid "timed out"
@@ -8044,7 +7679,7 @@ msgid ""
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 "Impossibile creare il collegamento %s\n"
-"Forse c'� un vecchio file di blocco?\n"
+"Forse c'è un vecchio file di lock?\n"
 
 #: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
@@ -8059,7 +7694,7 @@ msgstr "errore durante la scrittura di %s: %s"
 #: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr "errore durante il cambiamento della modalit� di %s: %s\n"
+msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
 #: mount/fstab.c:661
 #, c-format
@@ -8074,7 +7709,7 @@ msgstr "loop: impossibile aprire il device %s: %s\n"
 #: mount/lomount.c:89
 #, c-format
 msgid ", offset %lld"
-msgstr ""
+msgstr ", offset %lld"
 
 #: mount/lomount.c:92
 #, c-format
@@ -8084,17 +7719,17 @@ msgstr ""
 #: mount/lomount.c:100
 #, c-format
 msgid ", encryption %s (type %d)"
-msgstr ""
+msgstr ", cifratura %s (tipo %d)"
 
 #: mount/lomount.c:114
 #, c-format
 msgid ", offset %d"
-msgstr ""
+msgstr ", offset %d"
 
 #: mount/lomount.c:117
-#, fuzzy, c-format
+#, c-format
 msgid ", encryption type %d\n"
-msgstr "Tipo di criptazione non supportata %s\n"
+msgstr ", tipo di cifratura %d\n"
 
 #: mount/lomount.c:126
 #, c-format
@@ -8102,29 +7737,30 @@ msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
 #: mount/lomount.c:179
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not find any device /dev/loop#"
-msgstr "mount: impossibile trovare un qualsiasi device /dev/loop#"
+msgstr "%s: impossibile trovare alcun device /dev/loop#"
 
 #: mount/lomount.c:181
 #, c-format
 msgid "%s: no permission to look at /dev/loop#"
 msgstr ""
 
+# FIXME: loop device
 #: mount/lomount.c:184
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: impossibile trovare qualsiasi loop device e, in base a %s,\n"
-"       questo kernel non � a conoscenza del loop device\n"
-"       (se � questo il caso, ricompilare o `insmod loop.o'.)"
+"%s: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
+"       non è a conoscenza del loop device (se è questo il caso,\n"
+"       occorre ricompilare o eseguire 'modprobe loop'.)"
 
 #: mount/lomount.c:189
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
-msgstr "mount: impossibile trovare un qualsiasi loop device libero"
+msgstr "%s: impossibile trovare un qualsiasi loop device libero"
 
 #: mount/lomount.c:287
 #, c-format
@@ -8132,14 +7768,14 @@ msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
 #: mount/lomount.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
-msgstr "set_loop(%s,%s,%d): riuscito\n"
+msgstr "set_loop(%s,%s,%llu): riuscito\n"
 
 #: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: impossibile cancellare il device %s: %s\n"
+msgstr "loop: impossibile eliminare il device %s: %s\n"
 
 #: mount/lomount.c:361
 #, c-format
@@ -8149,10 +7785,10 @@ msgstr "del_loop(%s): riuscito\n"
 #: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Questo montaggio � stato compilato senza supporto loop. Ricompilare.\n"
+msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
 #: mount/lomount.c:406
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage:\n"
 "  %s loop_device                                       # give info\n"
@@ -8160,10 +7796,6 @@ msgid ""
 "  %s -f                                                # find unused\n"
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
-"utilizzo:\n"
-"  %s loop_device                                      # da informazioni\n"
-"  %s -d loop_device                                   # elimina\n"
-"  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
 
 #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
@@ -8174,59 +7806,57 @@ msgstr "memoria insufficiente"
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
-"Nessun supporto loop disponibile al momento della compilazione. "
-"Ricompilare.\n"
 
 #: mount/mntent.c:166
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
-"[mntent]: attenzione: non c'e' un 'codice di interruzione linea' alla fine "
-"di %s\n"
+msgstr "[mntent]: attenzione: non c'è un'andata a capo alla fine di %s\n"
 
 #: mount/mntent.c:217
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]: la linea %d in %s non � valida%s\n"
+msgstr "[mntent]: riga %d in %s non valida%s\n"
 
 #: mount/mntent.c:220
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "%s: errore: non � possibile impostare swap in nessuna posizione?\n"
+msgstr "%s: errore: l'etichetta %s appare sia su %s che su %s\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: considerare il montaggio di %s con %s\n"
+msgstr "mount: %s verrà montato in base all'UUID\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: considerare il montaggio di %s con %s\n"
+msgstr "mount: %s verrà montato in base all'etichetta\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
+msgstr ""
+"%s: impossibile aprire %s, la conversione di UUID e ETICHETTA non può\n"
+"    essere effettuata.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID non valido"
+msgstr "%s: UUID non valido"
 
 #: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: in base a mtab, %s � gi� montato su %s"
+msgstr "mount: secondo mtab, %s è già montato su %s"
 
 #: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: in base a mtab, %s � montato su %s"
+msgstr "mount: secondo mtab, %s è montato su %s"
 
 #: mount/mount.c:407
 #, c-format
@@ -8241,7 +7871,7 @@ msgstr "mount: errore durante la scrittura di %s: %s"
 #: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount: errore durante il cambio di modalit� di %s: %s"
+msgstr "mount: errore durante il cambio di modalità di %s: %s"
 
 #: mount/mount.c:483
 #, c-format
@@ -8255,7 +7885,7 @@ msgstr "mount non riuscito"
 #: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: solamente root pu� montare %s su %s"
+msgstr "mount: solamente root può montare %s su %s"
 
 #: mount/mount.c:600
 msgid "mount: loop device specified twice"
@@ -8292,259 +7922,243 @@ msgstr "mount: impossibile aprire %s: %s"
 
 #: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
-msgstr ""
+msgstr "mount: l'argomento di -p o --pass-fd deve essere un numero"
 
 #: mount/mount.c:706
-#, fuzzy, c-format
+#, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: impossibile aprire %s in scrittura: %s"
+msgstr "mount: impossibile aprire %s per impostare la velocità"
 
 #: mount/mount.c:709
-#, fuzzy, c-format
+#, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: impossibile aprire %s: %s"
+msgstr "mount: impossibile impostare la velocità: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: questa versione � stata compilata senza supporto per il tipo `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: impossibile determinare il tipo di filesystem, e non � stato "
+"mount: impossibile determinare il tipo di filesystem, e non è stato "
 "specificato nessuno"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: il mount point di %s non � una directory"
+msgstr "mount: il mount point di %s non è una directory"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: bisogna essere superuser per utilizzare mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
-msgstr "mount: %s � occupato"
+msgstr "mount: %s è occupato"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
-msgstr "mount: proc gi� montato"
+msgstr "mount: proc già montato"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr "mount: %s gi� montato o %s occupato"
+msgstr "mount: %s già montato o %s occupato"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: il mount point %s � un link simbolico a nulla"
+msgstr "mount: il mount point %s è un link simbolico a nulla"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 "mount: il device speciale %s non esiste\n"
-"       (un prefisso di percorso non � una directory)\n"
+"       (un prefisso di percorso non è una directory)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr "mount: %s non ancora montato, oppure l'opzione non � valida"
+msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
 
-#: mount/mount.c:966
-#, fuzzy, c-format
+#: mount/mount.c:959
+#, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
-"       o troppi file system montati"
+"       codepage mancante o altro errore"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       In alcuni casi si possono trovare informazioni utili in syslog. "
+"Provare\n"
+"       ad esempio 'dmesg | tail'\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:1011
-#, fuzzy, c-format
+#: mount/mount.c:1004
+#, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s: dispositivo di blocchi non valido"
+msgstr "umount: %s: dispositivo sconosciuto"
 
-#: mount/mount.c:1016
-#, fuzzy, c-format
+#: mount/mount.c:1009
+#, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr "   l   elenco dei tipi di filesystem conosciuti"
+msgstr "mount: tipo di filesystem '%s' sconosciuto"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:1030
-#, fuzzy
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr "mount: forse si intendeva iso9660 ?"
+msgstr "mount: forse si intendeva 'iso9660'?"
 
-#: mount/mount.c:1032
-#, fuzzy
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
-msgstr "mount: forse si intendeva iso9660 ?"
+msgstr "mount: forse si intendeva 'vfat'?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: %s ha un numero device errato o il fs di tipo %s non � supportato"
+"mount: %s ha un numero device errato o il tipo di fs %s non è supportato"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s non � un dispositivo di blocchi e lo stat non � riuscito?"
+msgstr "mount: %s non è un dispositivo a blocchi e stat non è riuscito?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
+"mount: il kernel non riconosce %s come un dispositivo a blocchi\n"
 "       (forse `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s  non � un dispositivo di blocchi (magari tentare `-o loop'?)"
+msgstr "mount: %s  non è un dispositivo a blocchi (forse provare `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr "mount: %s non � un dispositivo di blocchi"
+msgstr "mount: %s non è un dispositivo a blocchi"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr "mount: %s non un dispositivo di blocchi valido"
+msgstr "mount: %s non è un dispositivo a blocchi valido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
-msgstr " dispositivo di blocchi"
+msgstr "dispositivo a blocchi"
 
-#: mount/mount.c:1057
-#, fuzzy, c-format
+#: mount/mount.c:1050
+#, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "umount: impossibile rimontare %s di sola lettura\n"
+msgstr "mount: impossibile montare %s%s in sola lettura"
 
-#: mount/mount.c:1061
-#, fuzzy, c-format
+#: mount/mount.c:1054
+#, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: %s%s � protetto da scrittura, montaggio in sola lettura in corso"
+"mount: %s%s è protetto da scrittura, ma l'opzione '-w' è stata indicata"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr ""
-"mount: %s%s � protetto da scrittura, montaggio in sola lettura in corso"
+msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: non � stato dato il tipo - Si presume nfs perch� ci sono i due punti\n"
+"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
 
-#: mount/mount.c:1183
-#, fuzzy, c-format
+#: mount/mount.c:1176
+#, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: non � stato dato il tipo - Si presume smbfs perch� xxx\n"
+msgstr "mount: non è stato dato il tipo - Si assume smbfs per il prefisso //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: esecuzione in background di \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: termina \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr "mount: %s gi� montato su %s\n"
+msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8570,52 +8184,52 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
-msgstr "mount: � possibile solo per root"
+msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: nessun %s trovato - creazione in corso..\n"
+msgstr "mount: nessun %s trovato - creazione in corso...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
-msgstr "mount: non si � trovata tale partizione"
+msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: mount di %s in corso\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
-msgstr ""
+msgstr "non è stato montato niente"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: impossibile trovare %s in %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
 #: mount/mount_guess_fstype.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: si deve specificare il tipo di filesystem"
+msgstr "mount: errore tentando di indovinare il tipo di filesystem\n"
 
 #: mount/mount_guess_fstype.c:541
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: non si � specificato un tipo di filesystem per %s\n"
+msgstr "mount: non si è specificato un tipo di filesystem per %s\n"
 
 #: mount/mount_guess_fstype.c:544
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "      Prover� tutti i tipi citati in %s o %s\n"
+msgstr "      Proverò tutti i tipi citati in %s o %s\n"
 
 #: mount/mount_guess_fstype.c:547
 #, c-format
@@ -8625,105 +8239,105 @@ msgstr "      e sembra che questo sia swapspace\n"
 #: mount/mount_guess_fstype.c:549
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "      Prover� il tipo %s\n"
+msgstr "      Proverò il tipo %s\n"
 
 #: mount/mount_guess_fstype.c:637
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argomento host:dir eccessivamente lungo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: attenzione:nomi host multipli non supportati\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: la directory da montare non � nell'host: formato dir\n"
+msgstr "mount: la directory da montare non è nell'host: formato dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: impossibile ottenere l'indirizzo di %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ottenuto hp->h_length non valido\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argomento dell'opzione eccessivamente lungo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Attenzione: opzione proto= non riconosciuta.\n"
+msgstr "Attenzione: Opzione proto= non riconosciuta.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Attenzione: l'opzione namlen non � supportata.\n"
+msgstr "Attenzione: L'opzione namlen non è gestita.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Attenzione: l'opzione nolock non � supportata.\n"
+msgstr "Attenzione: l'opzione nolock non è gestita.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "opzione di nfs mount sconosciuta: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ottenuto un hp->h_length non valido?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS attraverso TCP non supportato.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
-msgstr "utilizzato il portmapper(mappatore porte) per trovare la porta NFS\n"
+msgstr "utilizzato il portmapper per trovare la porta NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "utilizzo della porta %d per il demone nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valore riportato di stato nfs sconosciuto: %d"
@@ -8732,7 +8346,7 @@ msgstr "valore riportato di stato nfs sconosciuto: %d"
 msgid "bug in xstrndup call"
 msgstr "bug in chiamata xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8740,223 +8354,216 @@ msgid ""
 "       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
-"utilizzo: %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
-"       %s [-s]\n"
+"Uso: %s [-hV]\n"
+"     %s -a [-e] [-v]\n"
+"     %s [-v] [-p priorità] speciale|LABEL=volume_name ...\n"
+"     %s [-s]\n"
 
-#: mount/swapon.c:67
-#, fuzzy, c-format
+#: mount/swapon.c:66
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"utilizzo: %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
-"       %s [-s]\n"
+"Uso: %s [-hV]\n"
+"     %s -a [-v]\n"
+"     %s [-v] speciale ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: impossibile trovare \"_stext\" in %s\n"
+msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: impossibile effettuare stat di %s: %s\n"
+msgstr "%s: impossibile effettuare stat di %s: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr ""
-"swapon: attenzione: %s ha le autorizzazioni non sicure %04o, 0600 � "
-"suggerito\n"
+msgstr "%s: attenzione: %s ha permessi %04o non sicuri, si suggerisce %04o\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: sto ignorando il file %s - sembra avere dei buchi.\n"
+msgstr "%s: file %s ignorato - sembra avere dei buchi.\n"
 
-#: mount/swapon.c:276
-#, fuzzy, c-format
+#: mount/swapon.c:275
+#, c-format
 msgid "Not superuser.\n"
-msgstr "Non impostato\n"
+msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilato senza supporto per -f\n"
 
-#: mount/umount.c:141
-#, fuzzy, c-format
+#: mount/umount.c:139
+#, c-format
 msgid "umount: cannot fork: %s"
-msgstr "mount: impossibile effettuare il fork: %s"
+msgstr "mount: impossibile fare il fork: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, directory: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: impossibile ottenere l'indirizzo di %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ottenuto hostp->h_length non valido\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: impossibile scrivere superblock"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: non trovato"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bisogna essere superuser per eseguire umount"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: i dispositivi di blocchi non sono permessi su fs"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
-"impossibile eseguire umount di %s - al suo posto � in corso un tentativo con "
+"impossibile eseguire umount di %s - al suo posto è in corso un tentativo con "
 "%s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Utilizzo: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Uso: umount [-hV]\n"
+"     umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"     umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
-#, fuzzy
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
-msgstr "Impossibile aprire %s\n"
+msgstr "Impossibile smontare \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount: %s non � montato (secondo mtab)"
+msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s non si trova in fstab (e non si � root)"
+msgstr "umount: %s non si trova in fstab (e non si è root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: solamente %s pu� smontare %s da %s"
+msgstr "umount: solo %s può smontare %s da %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr " umount: � possibile solo per root"
+msgstr " umount: solo root può farlo"
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Bisogna essere root per impostare modalit� Ctrl-Alt-Del.\n"
+msgstr "Bisogna essere root per impostare modalità Ctrl-Alt-Del.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Utilizzo: ctrlaltdel hard|soft\n"
+msgstr "Uso: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:115
 #, c-format
@@ -8966,7 +8573,7 @@ msgid ""
 msgstr ""
 "Il file %s, per il valore limite %lu, il numero massimo di caratteri in fifo "
 "era %d,\n"
-"e la velocit� massima di trasferimento di caratteri/secondo era di %f\n"
+"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
 
 #: sys-utils/cytune.c:126
 #, c-format
@@ -8977,7 +8584,7 @@ msgid ""
 msgstr ""
 "Il file %s, per il valore limite %lu e il valore di timeout %lu, il numero "
 "massimo di caratteri in fifo era %d,\n"
-"e la velocit� massima di trasferimento di caratteri/secondo era di %f\n"
+"e la velocità massima di trasferimento di caratteri/secondo era di %f\n"
 
 #: sys-utils/cytune.c:190
 #, c-format
@@ -9010,8 +8617,9 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Utilizzo: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T "
-"value]) [-g|-G] file [file...]\n"
+"Uso: %s [-q [-i intervallo]] ([-s valore]|[-S valore]) ([-t valore]|[-T "
+"valore]\n"
+"        [-g|-G] file [file...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -9040,14 +8648,14 @@ msgid "Can't get timeout for %s: %s\n"
 msgstr "Impossibile ottenere il timeout per %s: %s\n"
 
 #: sys-utils/cytune.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr "%s: %ld %s limite e %ld %s timeout\n"
+msgstr "%s: %ld soglia corrente e %ld timeout corrente\n"
 
 #: sys-utils/cytune.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr "%s: %ld %s limite e %ld %s timeout\n"
+msgstr "%s: %ld soglia predefinita e %ld timeout predefinito\n"
 
 #: sys-utils/cytune.c:328
 msgid "Can't set signal handler"
@@ -9063,11 +8671,10 @@ msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Impossibile eseguire CYGETMON su %s: %s\n"
 
 #: sys-utils/cytune.c:419
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -9089,41 +8696,42 @@ msgstr "   %f int/sec; %f rec (car/sec)\n"
 #: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr " Utilizzo: %s [-c] [-n level] [-s bufsize]\n"
+msgstr " Uso: %s [-c] [-n livello] [-s bufsize]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "flock: opzione sconosciuta, interruzione.\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Uso: flock [--shared | --timeout=secondi] nomefile comando {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "invalid id: %s\n"
-msgstr "Numero non valido: %s\n"
+msgstr "id non valido: %s\n"
 
 #: sys-utils/ipcrm.c:84
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "impossibile aprire %s %s\n"
+msgstr "impossibile rimuovere l'id %s %s\n"
 
 #: sys-utils/ipcrm.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "utilizzo: %s [shm | msg | sem] id\n"
+msgstr "uso deprecato: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "unknown resource type: %s\n"
-msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
+msgstr "tipo di risorsa sconosciuto: %s\n"
 
 #: sys-utils/ipcrm.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "resource(s) deleted\n"
 msgstr "risorsa eliminata\n"
 
@@ -9133,67 +8741,65 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"uso: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"        [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr ""
+msgstr "%s: opzione illegale -- %c\n"
 
 #: sys-utils/ipcrm.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "%s: illegal key (%s)\n"
-msgstr "Tasto non valido"
+msgstr "%s: chiave illegale (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
-#, fuzzy
 msgid "permission denied for key"
-msgstr "mount: autorizzazione negata"
+msgstr "autorizzazione negata per la chiave"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr ""
+msgstr "chiave giù rimossa"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
-#, fuzzy
 msgid "invalid key"
-msgstr "Numero non valido: %s\n"
+msgstr "chiave non valida"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
-msgstr ""
+msgstr "errore sconosciuto nella chiave"
 
 #: sys-utils/ipcrm.c:241
-#, fuzzy
 msgid "permission denied for id"
-msgstr "mount: autorizzazione negata"
+msgstr "autorizzazione negata per id"
 
 #: sys-utils/ipcrm.c:246
-#, fuzzy
 msgid "invalid id"
-msgstr "Numero non valido: %s\n"
+msgstr "id non valido"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr ""
+msgstr "id già rimosso"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
-msgstr ""
+msgstr "errore sconosciuti in id"
 
 #: sys-utils/ipcrm.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (%s)\n"
-msgstr "%s su %s\n"
+msgstr "%s: %s (%s)\n"
 
 #: sys-utils/ipcrm.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "%s: argomento sconosciuto: %s\n"
 
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "utilizzo : %s -asmq -tclup \n"
+msgstr "uso : %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -9206,10 +8812,12 @@ msgid "\t%s -h for help.\n"
 msgstr "\t%s -h per richiamare la guida.\n"
 
 #: sys-utils/ipcs.c:129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s fornisce informazioni sulle funzionalit� ipc per"
+msgstr ""
+"%s fornisce informazioni sulle funzionalità ipc a cui avete accesso in "
+"lettura.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -9261,34 +8869,32 @@ msgstr "-i id [-s -q -m] : dettagli sulla risorsa identificata da id\n"
 #: sys-utils/ipcs.c:267
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr "il kernel non � configurato per la condivisione della memoria\n"
+msgstr "il kernel non è configurato per la condivisione della memoria\n"
 
 #: sys-utils/ipcs.c:273
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limiti della memoria condivisa --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %lu\n"
-msgstr "numero massimo di segmenti = %d\n"
+msgstr "numero massimo di segmenti = %lu\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr "dimensione max seg (kbyte) = %d\n"
+msgstr "dimensione max seg (kbyte) = %lu\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (pages) = %lu\n"
-msgstr "valore massimo totale di memoria condivisa (kbyte) = %d\n"
+msgstr "valore massimo totale di memoria condivisa (kbyte) = %lu\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr "dimensione min seg (byte) = %d\n"
+msgstr "dimensione min seg (byte) = %lu\n"
 
 #: sys-utils/ipcs.c:289
 #, c-format
@@ -9326,9 +8932,9 @@ msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Segmento Mem. Condiv. Creatori/Propr.--------\n"
 
 #: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
@@ -9362,9 +8968,9 @@ msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Mem. Condiv.  Conn./Sconn./Cambio  Volte --------\n"
 
 #: sys-utils/ipcs.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-20s %-20s %-20s\n"
-msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
 #: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
@@ -9390,9 +8996,9 @@ msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Mem.  Condiv. Creatore/Last-op--------\n"
 
 #: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:314
 msgid "cpid"
@@ -9408,9 +9014,9 @@ msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segm. Memoria Condivisa --------\n"
 
 #: sys-utils/ipcs.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
 
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
 msgid "key"
@@ -9509,9 +9115,9 @@ msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ Mem. Condivisa Operazione/Modif. Volte --------\n"
 
 #: sys-utils/ipcs.c:426
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-26.24s %-26.24s\n"
-msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
 
 #: sys-utils/ipcs.c:427
 msgid "last-op"
@@ -9527,18 +9133,18 @@ msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrici semafori --------\n"
 
 #: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:437
 msgid "nsems"
 msgstr "nsems"
 
 #: sys-utils/ipcs.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "kernel not configured for message queues\n"
-msgstr "kernel non configurato per i semafori\n"
+msgstr "kernel non configurato per le code di messaggi\n"
 
 #: sys-utils/ipcs.c:504
 #, c-format
@@ -9596,9 +9202,9 @@ msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Code messaggi  Inv./Ric./Modif. Volte--------\n"
 
 #: sys-utils/ipcs.c:525
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
-msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:526
 msgid "send"
@@ -9631,9 +9237,9 @@ msgid "------ Message Queues --------\n"
 msgstr "------ Code messaggi  --------\n"
 
 #: sys-utils/ipcs.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
 
 #: sys-utils/ipcs.c:539
 msgid "used-bytes"
@@ -9663,24 +9269,24 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "att_time=%-26.24s\n"
-msgstr "att_time=%s"
+msgstr "att_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:617
-#, fuzzy, c-format
+#, c-format
 msgid "det_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "det_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
-#, fuzzy, c-format
+#, c-format
 msgid "change_time=%-26.24s\n"
-msgstr "change_time=%s"
+msgstr "change_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:634
 #, c-format
@@ -9697,19 +9303,19 @@ msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:637
-#, fuzzy, c-format
+#, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
+msgstr "cbyte=%ld\tqbyte=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
 #: sys-utils/ipcs.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "send_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "send_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:648
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "rcv_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:668
 #, c-format
@@ -9728,22 +9334,22 @@ msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 #: sys-utils/ipcs.c:671
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr "modalit�=%#o, access_perms=%#o\n"
+msgstr "modalità=%#o, access_perms=%#o\n"
 
 #: sys-utils/ipcs.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "nsems = %ld\n"
-msgstr "nsems = %d\n"
+msgstr "nsems = %ld\n"
 
 #: sys-utils/ipcs.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "otime = %-26.24s\n"
-msgstr "otime = %s"
+msgstr "otime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:676
-#, fuzzy, c-format
+#, c-format
 msgid "ctime = %-26.24s\n"
-msgstr "ctime = %s"
+msgstr "ctime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:679
 msgid "semnum"
@@ -9766,10 +9372,8 @@ msgid "pid"
 msgstr "pid"
 
 #: sys-utils/rdev.c:69
-#, fuzzy
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"utilizzo: rdev [ -rsv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
+msgstr "uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
@@ -9814,7 +9418,7 @@ msgstr " vidmode ...                     come rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Nota: le modalit� a video sono: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+"Nota: le modalità a video sono: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
 "2=key2,..."
 
 #: sys-utils/rdev.c:80
@@ -9824,12 +9428,12 @@ msgstr ""
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
-msgstr ""
+msgstr "virgola mancante"
 
 #: sys-utils/readprofile.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "out of memory"
-msgstr "memoria insufficiente?\n"
+msgstr "memoria esaurita"
 
 #: sys-utils/readprofile.c:118
 #, fuzzy, c-format
@@ -9848,20 +9452,24 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Utilizzo: \"%s [opzioni]\n"
-"\t -m <mapfile>  (predefinito = \"%s\")\n"
-"\t -p <nome file> (predefinito = \"%s\")\n"
-"\t -i            stampa solamente le informazioni relative alla fase di "
+"%s: Uso: \"%s [opzioni]\n"
+"\t -m <mapfile>  (predefinito = \"%s\" e\n"
+"                                      \"%s\")\n"
+"\t -p <profilo>  (predefinito = \"%s\")\n"
+"         -M <mult>     FIXME\n"
+"\t -i            stampa solamente le informazioni sulla fase di "
 "campionamento\n"
 "\t -v            stampa i dati in elenco\n"
-"\t -a            stampa tutti i simboli, anche se il conteggio � 0\n"
-"\t -r            reimposta tutti i counter (solamente utente root)\n"
+"\t -a            stampa tutti i simboli, anche se il conteggio è 0\n"
+"         -b            FIXME\n"
+"\t -r            reimposta tutti i contatori (solamente utente root)\n"
+"         -n            FIXME\n"
 "\t -V            stampa versione ed esci\n"
 
 #: sys-utils/readprofile.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "%s version %s\n"
-msgstr "%s Versione %s\n"
+msgstr "%s versione %s\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
@@ -9892,7 +9500,7 @@ msgstr "totale"
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"utilizzo: renice priorit� [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+"uso: renice priorità [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] utenti ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9910,17 +9518,17 @@ msgstr "getpriority"
 
 #: sys-utils/renice.c:128
 msgid "setpriority"
-msgstr " setpriority"
+msgstr "setpriority"
 
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d: vecchia priorit� %d, nuova priorit� %d\n"
+msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "utilizzo: %s programma [arg ...]\n"
+msgstr "uso: %s programma [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9929,9 +9537,9 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Utilizzo: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
-"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-"          -T [on|off] ]\n"
+"Uso: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"        -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"        -T [on|off] ]\n"
 
 #: sys-utils/tunelp.c:91
 msgid "malloc error"
@@ -9945,12 +9553,12 @@ msgstr "%s: valore non valido\n"
 #: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr "%s: %s no � un lp device.\n"
+msgstr "%s: %s no è un lp device.\n"
 
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr "lo stato di %s � %d"
+msgstr "lo stato di %s è %d"
 
 #: sys-utils/tunelp.c:264
 #, c-format
@@ -9994,12 +9602,12 @@ msgstr "%s utilizzo del polling in corso\n"
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: argomento -l invalido per %s.\n"
+msgstr "col: argomento -l non valido per %s.\n"
 
 #: text-utils/col.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "utilizzo: col [-bfx] [-l nline]\n"
+msgstr "uso: col [-bfpx] [-l nline]\n"
 
 #: text-utils/col.c:541
 #, c-format
@@ -10017,12 +9625,12 @@ msgstr "dopo la prima linea"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
-msgstr "-- linea gi� svuotata"
+msgstr "-- linea già svuotata"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "utilizzo: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "uso: %s [ - ] [ -2 ] [ file ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -10031,7 +9639,7 @@ msgstr "linea troppo lunga"
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "utilizzo: column [-tx] [-c columns] [file ...]\n"
+msgstr "uso: column [-tx] [-c colonne] [file ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
@@ -10044,23 +9652,22 @@ msgid "hexdump: bad skip value.\n"
 msgstr "hexdump: valore skip non valido.\n"
 
 #: text-utils/hexsyntax.c:131
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
-"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:261
-#, fuzzy, c-format
+#: text-utils/more.c:216
+#, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr " usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "Uso: %s [-dflpcsu] [+linenum | +/modello] nome1 nome2 ...\n"
 
-#: text-utils/more.c:484
-#, fuzzy, c-format
+#: text-utils/more.c:439
+#, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr "%s: segnale sconosciuto %s\n"
+msgstr "%s: opzione sconosciuta \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10071,8 +9678,7 @@ msgstr ""
 "*** %s: directory ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10080,50 +9686,48 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"******** %s: non � un file di testo********\n"
+"******** %s: non è un file di testo********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr "[Utilizzare q o Q per uscire]"
+msgstr "[Usare q o Q per uscire]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Ancora--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(File successivo: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Premere spazio per continuare, 'q' per uscire.]"
 
-#: text-utils/more.c:1160
-#, fuzzy, c-format
+#: text-utils/more.c:1115
+#, c-format
 msgid "...back %d pages"
 msgstr "...indietro %d pagine"
 
-#: text-utils/more.c:1162
-#, fuzzy
+#: text-utils/more.c:1117
 msgid "...back 1 page"
-msgstr "...indietro %d pagine"
+msgstr "...indietro 1 pagina"
 
-#: text-utils/more.c:1205
-#, fuzzy
+#: text-utils/more.c:1160
 msgid "...skipping one line"
-msgstr "...sto saltando %d righe"
+msgstr "...sto saltando una riga"
 
-#: text-utils/more.c:1207
-#, fuzzy, c-format
+#: text-utils/more.c:1162
+#, c-format
 msgid "...skipping %d lines"
 msgstr "...sto saltando %d righe"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10133,7 +9737,7 @@ msgstr ""
 "***Indietro***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10141,7 +9745,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10164,34 +9768,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Premere 'h' per visualizzare le istruzioni.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
-msgstr "\"%s\" linea %d"
+msgstr "\"%s\" riga %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
-msgstr "[Non un file] linea %d"
+msgstr "[Non un file] riga %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overflow\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...ignora\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Errore nell'espressione regolare"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10199,15 +9803,15 @@ msgstr ""
 "\n"
 "Pattern non trovato\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Pattern non trovato"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "impossibile effettuare fork\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10215,33 +9819,31 @@ msgstr ""
 "\n"
 "...sto ignorando"
 
-#: text-utils/more.c:1678
-#, fuzzy
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
-msgstr "...Sto ignorando"
+msgstr ""
 
-#: text-utils/more.c:1680
-#, fuzzy
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
-msgstr "ritorna al file"
+msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
-msgstr "Linea troppo lunga"
+msgstr "Riga troppo lunga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Nessun comando precedente da sostituire"
 
 #: text-utils/odsyntax.c:130
 #, c-format
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od: od(1) � stata sostituito da hexdump(1).\n"
+msgstr "od: od(1) è stata sostituito da hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: la compatibilit� hexdump(1) non supporta l'opzione -%c %s\n"
+msgstr "od: la compatibilità hexdump(1) non supporta l'opzione -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
@@ -10283,101 +9885,90 @@ msgstr "hexdump: formato non valido {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carattere di conversione non valido %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
+"%s: Uso: %s [-numero] [-p stringa] [-cefnrs] [+riga] [+/modello/] [file]\n"
 
-#: text-utils/pg.c:266
-#, fuzzy, c-format
+#: text-utils/pg.c:246
+#, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "l'opzione `%s' richiede un argomento\n"
+msgstr "%s: l'opzione richiede un argomento -- %s\n"
 
-#: text-utils/pg.c:274
-#, fuzzy, c-format
+#: text-utils/pg.c:254
+#, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "Tasto non valido"
+msgstr "%s: opzione illecita -- %s\n"
 
-#: text-utils/pg.c:391
-#, fuzzy
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
-msgstr "...ignora\n"
+msgstr ""
 
-#: text-utils/pg.c:393
-#, fuzzy
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
-msgstr "...ignora\n"
+msgstr ""
 
-#: text-utils/pg.c:415
-#, fuzzy
+#: text-utils/pg.c:395
 msgid "No next file"
-msgstr "(File successivo: %s)"
+msgstr "Nessun file successivo"
 
-#: text-utils/pg.c:419
-#, fuzzy
+#: text-utils/pg.c:399
 msgid "No previous file"
-msgstr "Nessuna partizione definita\n"
+msgstr "Nessun file precedente"
 
-#: text-utils/pg.c:949
-#, fuzzy, c-format
+#: text-utils/pg.c:929
+#, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: Errore di lettura dal file %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr ""
+msgstr "%s: EOF non previsto nel file %s\n"
 
-#: text-utils/pg.c:958
-#, fuzzy, c-format
+#: text-utils/pg.c:938
+#, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr "errore di scrittura su %s\n"
+msgstr "%s: Errore sconosciuto nel file %s\n"
 
-#: text-utils/pg.c:1053
-#, fuzzy, c-format
+#: text-utils/pg.c:1033
+#, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: impossibile leggere il file temporaneo.\n"
+msgstr "%s: Impossibile creare il file temporaneo\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
-#, fuzzy
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
-msgstr ", errore"
+msgstr ""
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
-msgstr ""
+msgstr "Nessuna stringa di ricerca ricordata"
 
-#: text-utils/pg.c:1328
-#, fuzzy
+#: text-utils/pg.c:1308
 msgid "Cannot open "
-msgstr "Impossibile aprire %s\n"
+msgstr "Impossibile aprire "
 
-#: text-utils/pg.c:1376
-#, fuzzy
+#: text-utils/pg.c:1356
 msgid "saved"
-msgstr "invio"
+msgstr "salvato"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
-#, fuzzy
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
-msgstr "Password *NON* modificata. Riprovare successivamente.\n"
+msgstr "fork() non riuscito, riprovare più tardi\n"
 
-#: text-utils/pg.c:1720
-#, fuzzy
+#: text-utils/pg.c:1700
 msgid "(Next file: "
-msgstr "(File successivo: %s)"
+msgstr "(File successivo: "
 
 #: text-utils/rev.c:113
 #, c-format
@@ -10387,22 +9978,22 @@ msgstr "Impossibile allocare lo spazio buffer\n"
 #: text-utils/rev.c:156
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr "utilizzo: rev [file ...]\n"
+msgstr "uso: rev [file ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "impossibile aprire %s in lettura"
+msgstr "Impossibile aprire \"%s\" in lettura\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "utilizzo: %s [file]\n"
+msgstr "Uso: tailf file-di-log\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "utilizzo: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "Uso: %s [ -i ] [ -tTerm ] file...\n"
 
 #: text-utils/ul.c:152
 #, c-format
@@ -10429,399 +10020,152 @@ msgstr "Linea di input troppo lunga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#, fuzzy
-#~ msgid "Warning: omitting partitions after %d\n"
-#~ msgstr "Attenzione: cancellazione delle partizioni dopo %d\n"
-
-#~ msgid "mount: fs type %s not supported by kernel"
-#~ msgstr "mount: fs di tipo %s non supportato dal kernel"
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Numero non valido: %s\n"
 
-#~ msgid "BLKGETSIZE ioctl failed for %s\n"
-#~ msgstr "BLKGETSIZE ioctl non riuscito per %s\n"
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Errore di sintassi: '%s'\n"
 
-#~ msgid "%s: not compiled with minix v2 support\n"
-#~ msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Parametro non impostato: '%s'\n"
 
-#~ msgid "Boot (%02X)"
-#~ msgstr "Avvio (%02X)"
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev nome\n"
 
-#~ msgid "None (%02X)"
-#~ msgstr "Nessuno (%02X)"
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] disp\n"
 
-#, fuzzy
-#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-#~ msgstr "%s: [%04x]:%ld (%s) offset %d, criptazione %s\n"
-
-#~ msgid ""
-#~ "mount: Could not find any loop device.\n"
-#~ "       Maybe /dev/loop# has a wrong major number?"
-#~ msgstr ""
-#~ "mount: impossibile trovare qualsiasi loop device.\n"
-#~ "       Forse /dev/loop# ha un major number errato?"
-
-#~ msgid ""
-#~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
-#~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
-#~ "       maybe /dev/loop# has the wrong major number?"
-#~ msgstr ""
-#~ "mount: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
-#~ "       non � a conoscenza del loop device (allora ricompilare o \n"
-#~ "       `insmod loop.o'), o forse /dev/loop# ha il major number errato?"
-
-#, fuzzy
-#~ msgid "Error: unable to open %s for reading\n"
-#~ msgstr "impossibile aprire %s in lettura"
-
-#, fuzzy
-#~ msgid "Retype password: "
-#~ msgstr "Ridigitare la nuova password: "
-
-#, fuzzy
-#~ msgid "Error: gpg key file decryption failed\n"
-#~ msgstr "apertura file rc non riuscita\n"
-
-#, fuzzy
-#~ msgid "Error: Password must be at least %d characters.\n"
-#~ msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
-
-#, fuzzy
-#~ msgid "Error: Unable to allocate memory\n"
-#~ msgstr "Impossibile allocare altra memoria\n"
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] disp\n"
 
-#~ msgid "Init (up to 16 hex digits): "
-#~ msgstr "Init (fino a 16 cifre esadecimali): "
+#~ msgid "version"
+#~ msgstr "versione"
 
-#~ msgid "Non-hex digit '%c'.\n"
-#~ msgstr "Cifra non esadec. '%c'.\n"
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr " impossibile aprire /dev/urandom"
 
-#~ msgid "Don't know how to get key for encryption system %d\n"
-#~ msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "impossibile leggere dati casuali da /dev/urandom"
 
-#, fuzzy
-#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgid "can't open %s for reading"
 #~ msgstr "impossibile aprire %s in lettura"
 
-#, fuzzy
-#~ msgid "mount: %s duplicate - not mounted"
-#~ msgstr "umount: %s: non montato"
-
-#~ msgid "UUID"
-#~ msgstr "UUID"
-
-#, fuzzy
-#~ msgid "swapon: invalid loop device name\n"
-#~ msgstr "umount: %s: dispositivo di blocchi non valido"
+#~ msgid "can't stat(%s)"
+#~ msgstr "impossibile eseguire stat(%s)"
 
 #, fuzzy
-#~ msgid "swapon: unable to open loop device %s\n"
-#~ msgstr "mount: si intende utilizzare il loop device %s\n"
-
-#, fuzzy
-#~ msgid "swapon: loop device %s already in use\n"
-#~ msgstr "Questa partizione � gi� in uso"
-
-#, fuzzy
-#~ msgid "swapon: unable to open swap device %s\n"
-#~ msgstr "impossibile riavvolgere il dispositivo swap"
-
-#, fuzzy
-#~ msgid "swapon: unable to open /dev/urandom\n"
-#~ msgstr " impossibile aprire /dev/urandom"
-
-#, fuzzy
-#~ msgid "swapon: unable to create pipe\n"
-#~ msgstr "impossibile scrivere inode"
-
-#, fuzzy
-#~ msgid "swapon: fork failed\n"
-#~ msgstr "fork non riuscito\n"
-
-#, fuzzy
-#~ msgid "swapon: random password for %s is %s"
-#~ msgstr "Modifica password per %s\n"
-
-#~ msgid "umount: only root can unmount %s from %s"
-#~ msgstr "umount: solamente root pu� smontare %s da %s"
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s non ha i filemode corretti"
 
-#~ msgid "Partition %i does not end on cylinder boundary:\n"
-#~ msgstr "La partizione %i non termina al limite del cilindro:\n"
-
-#~ msgid "Can't open help file"
-#~ msgstr "Impossibile aprire il file guida"
+#~ msgid "can't read data from %s"
+#~ msgstr "impossibile leggere i dati da %s"
 
 #~ msgid ""
-#~ "\n"
-#~ "Disk %s: %d heads, %d sectors, %d cylinders\n"
-#~ "Units = %s of %d * %d bytes\n"
-#~ "\n"
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
 #~ msgstr ""
-#~ "\n"
-#~ "Disco %s: %d testine, %d settori, %d cilindri\n"
-#~ "Unit� = %s di %d * %d byte\n"
-#~ "\n"
-
-#~ msgid "invalid number `%s'\n"
-#~ msgstr "numero `%s' non valido\n"
-
-#~ msgid "number `%s' to `%s' out of range\n"
-#~ msgstr " numero `%s' su `%s' fuori intervallo\n"
-
-#~ msgid "unrecognized option `%s'\n"
-#~ msgstr "opzione `%s' non riconosciuta\n"
-
-#~ msgid "option `%s' requires an argument\n"
-#~ msgstr "l'opzione `%s' richiede un argomento\n"
-
-#~ msgid "option `%s' doesn't allow an argument\n"
-#~ msgstr "l'opzione `%s' non consente un argomento\n"
-
-#~ msgid "unrecognized option `-%c'\n"
-#~ msgstr "opzione `-%c' non riconosciuta\n"
-
-#, fuzzy
-#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-#~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
-
-#~ msgid "Block %d in file `"
-#~ msgstr "Blocco %d nel file `"
+#~ "Troppi utenti già collegati.\n"
+#~ "Riprovare successivamente.\n"
 
-#, fuzzy
-#~ msgid "The directory '"
-#~ msgstr "Nessuna directory %s!\n"
-
-#~ msgid "not "
-#~ msgstr "non "
-
-#~ msgid "BSD/386"
-#~ msgstr "BSD/386"
-
-#~ msgid "cannot open %s %s\n"
-#~ msgstr "impossibile aprire %s %s\n"
-
-#~ msgid "read-write"
-#~ msgstr "lettura-scrittura"
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Ci sono troppi processi in esecuzione.\n"
 
-#~ msgid "for reading"
-#~ msgstr "in lettura"
-
-#~ msgid "new "
-#~ msgstr "nuovo "
-
-#~ msgid "The password must contain characters out of two of the following\n"
-#~ msgstr "La password deve contenere caratteri delle due seguenti\n"
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
 
 #~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
 #~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
 #~ msgstr ""
-#~ "classi:  lettere maiuscole minuscole, cifre e caratteri non "
-#~ "alfanumerici.\n"
-
-#~ msgid "characters. See passwd(1) for more information.\n"
-#~ msgstr "Consultare passwd(1) per ulteriori informazioni.\n"
-
-#~ msgid "rebooted"
-#~ msgstr "riavviato"
+#~ "La password deve contenere caratteri tratti da due delle seguenti "
+#~ "classi:\n"
+#~ "lettere maiuscole e minuscole, numeri e caratteri non alfanumerici.\n"
+#~ "Consultare passwd(1) per maggiori informazioni.\n"
 
-#~ msgid "halted"
-#~ msgstr "arrestato"
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Impossibile riutilizzare la vecchia password.\n"
 
-#~ msgid "current"
-#~ msgstr "corrente"
-
-#~ msgid "default"
-#~ msgstr "predefinito"
-
-#~ msgid "%s: %lu ints, %lu/%lu chars; "
-#~ msgstr "%s: %lu ints, %lu/%lu chars;"
-
-#~ msgid "fifo: %lu thresh, %lu tmout, "
-#~ msgstr "fifo: %lu thresh, %lu tmout, "
-
-#~ msgid "%lu max, %lu now\n"
-#~ msgstr "%lu max, %lu now\n"
-
-#~ msgid " which you have read access.\n"
-#~ msgstr " le quali si ha accesso in lettura.\n"
-
-#~ msgid "to file "
-#~ msgstr "al file"
-
-#~ msgid "usage: banner [-w width]\n"
-#~ msgstr "utilizzo: banner [-w width]\n"
-
-#~ msgid "Message: "
-#~ msgstr "Messaggio: "
-
-#~ msgid "The character '%c' is not in my character set"
-#~ msgstr "Il carattere '%c' non � compreso nel mio set di caratteri"
-
-#~ msgid "Message '%s' is OK\n"
-#~ msgstr "Il messaggio '%s' � OK\n"
-
-#~ msgid "ioctl() to open /dev/tty1 failed"
-#~ msgstr "impossibile per ioctl() aprire /dev/tty1"
-
-#~ msgid ": bad directory: size<32"
-#~ msgstr ": directory danneggiata: dimensione<32"
-
-#~ msgid "Warning: partition %d has an odd number of sectors.\n"
-#~ msgstr "Attenzione: la partizione %d ha un numero strano di settori.\n"
-
-#~ msgid ""
-#~ "Re-read table failed with error %d: %s.\n"
-#~ "Reboot your system to ensure the partition table is updated.\n"
+#~ msgid "Please don't use something like your username as password!\n"
 #~ msgstr ""
-#~ "Rilettura della tabella non riuscita con errore %d: %s.\n"
-#~ "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
-#~ "aggiornata.\n"
-
-#~ msgid "SGI rxlvol"
-#~ msgstr "SGI rxlvol"
-
-#~ msgid "AST Windows swapfile"
-#~ msgstr "AST Windows swapfile"
-
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "Attenzione: la partizione %s contiene parte della "
-
-#~ msgid "the partition table (sector %lu),\n"
-#~ msgstr "tabella delle partizioni (settore %lu),\n"
-
-#~ msgid "and will destroy it when filled\n"
-#~ msgstr "e la eliminer� quando � piena\n"
-
-#~ msgid " (although this is not a problem under Linux)\n"
-#~ msgstr " (sebbene questo non costituisca un problema su Linux)\n"
+#~ "Non utilizzare come password qualcosa che assomigli al proprio nome "
+#~ "utente!\n"
 
-#~ msgid "%s: open for update: %m"
-#~ msgstr "%s: apertura per l'aggiornamento: %m"
-
-#~ msgid "%s: no utmp entry"
-#~ msgstr "%s: nessuna voce utmp"
-
-#~ msgid "badlogin: %s\n"
-#~ msgstr "login non valida: %s\n"
-
-#~ msgid "sleepexit %d\n"
-#~ msgstr "sleepexit %d\n"
-
-#~ msgid "Usage: %s [ -s shell ] "
-#~ msgstr "Utilizzo: %s [ -s shell ]"
-
-#~ msgid "       [ username ]\n"
-#~ msgstr "       [ nome utente ]\n"
-
-#~ msgid "Warning: no Kerberos tickets issued\n"
-#~ msgstr "Attenzione: non sono stati emessi i ticket di Kerberos\n"
-
-#~ msgid "Sorry -- your password has expired.\n"
-#~ msgstr "La password � scaduta.\n"
-
-#~ msgid "Warning: your password expires on %d %s %d.\n"
-#~ msgstr "Attenzione: la password scade in data %d %s %d.\n"
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Non utilizzare come password qualcosa che assomigli al proprio vero "
+#~ "nome!\n"
 
-#~ msgid "Sorry -- your account has expired.\n"
-#~ msgstr "L'account � scaduto.\n"
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nome utente [password]]\n"
 
-#~ msgid "Warning: your account expires on %d %s %d.\n"
-#~ msgstr "Attenzione: l'account scade in data %d %s %d.\n"
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Solo root può utilizzare le forme a uno e due argomenti\n"
 
-#~ msgid "s"
-#~ msgstr "s"
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [utente [password]]\n"
 
-#~ msgid "snow.on"
-#~ msgstr " snow.on"
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Exec %s impossibile: %s\n"
 
-#~ msgid "snow.off"
-#~ msgstr " snow.off"
+#~ msgid "Cannot find login name"
+#~ msgstr "Impossibile trovare il nome di login"
 
-#~ msgid "softscroll.on"
-#~ msgstr " softscroll.on"
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Solo root può modificare la password per gli altri.\n"
 
-#~ msgid "softscroll.off"
-#~ msgstr " softscroll.off"
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Troppi argomenti.\n"
 
-#~ msgid "mount: warning: cannot change mounted device with a remount\n"
-#~ msgstr ""
-#~ "mount: attenzione: impossibile modificare il device montato con un "
-#~ "rimontaggio\n"
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Impossibile trovare il nome utente.`%s' è davvero un utente?"
 
-#~ msgid "mount: warning: cannot change filesystem type with a remount\n"
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 #~ msgstr ""
-#~ "mount: attenzione: impossibile modificare il tipo di filesystem con un "
-#~ "rimontaggio\n"
+#~ "Posso modificare solo le password locali. Utilizzare invece yppasswd."
 
-#~ msgid "not mounted anything"
-#~ msgstr "niente � montato"
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID e nome utente non combaciano, impostore!"
 
-#~ msgid "send_time=%srcv_time=%schange_time=%s"
-#~ msgstr "send_time=%srcv_time=%schange_time=%s"
-
-#~ msgid "Not Set\n"
-#~ msgstr "Non impostato\n"
-
-#~ msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
-#~ msgstr "  rdev -s /dev/fd0 /dev/hda2      imposta SWAP device"
-
-#~ msgid "  swapdev ...                     same as rdev -s"
-#~ msgstr "  swapdev ...                     same as rdev -s"
-
-#~ msgid "anything\n"
-#~ msgstr "qualsiasi\n"
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Modifica password per %s\n"
 
-#~ msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-#~ msgstr "Velocit� di ripetizione impostata su %.1f cps (ritardo = %d ms)\n"
+#~ msgid "Enter old password: "
+#~ msgstr "Immettere vecchia password: "
 
-#~ msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-#~ msgstr " Utilizzo: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Password non valida, impostore."
 
-#~ msgid "Cannot open /dev/port"
-#~ msgstr "Impossibile aprire /dev/port"
+#~ msgid "Enter new password: "
+#~ msgstr "Immettere la nuova password: "
 
-#~ msgid "Writing disklabel to %s%d.\n"
-#~ msgstr "Scrittura del disklabel su %s%d in corso.\n"
+#~ msgid "Password not changed."
+#~ msgstr "Password non modificata."
 
-#~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "%s%d non contiene disklabel.\n"
+#~ msgid "Re-type new password: "
+#~ msgstr "Ridigitare la nuova password: "
 
-#~ msgid "Bootstrap installed on %s%d.\n"
-#~ msgstr "Bootstrap installato su %s%d.\n"
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Ortografia sbagliata. La password non è stata modificata."
 
-#~ msgid "%s: unknown geometry\n"
-#~ msgstr "%s: geometria sconosciuta\n"
+#~ msgid "password changed, user %s"
+#~ msgstr "password modificata, utente %s"
 
-#~ msgid "exec rc failed\n"
-#~ msgstr " exec di rc non riuscito\n"
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "PASSWORD ROOT MODIFICATA"
 
-#~ msgid "fork of rc shell failed\n"
-#~ msgstr "fork della shell rc non riuscita\n"
+#~ msgid "password changed by root, user %s"
+#~ msgstr "password modificata da root, utente %s"
 
-#~ msgid "Cannot get loop info"
-#~ msgstr "Impossibile avere informazioni sul loop"
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "chiamata di setpwnam per impostare la password.\n"
 
-#~ msgid "mount: %s has wrong major or minor number"
-#~ msgstr "mount: %s ha un major o un minor number errato"
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Password *NON* modificata. Riprovare successivamente.\n"
 
-#~ msgid "mount: block device %s is not permitted on its filesystem"
-#~ msgstr ""
-#~ "mount: il dispositivo di blocchi %s non � consentito sul relativo "
-#~ "filesystem"
+#~ msgid "Password changed.\n"
+#~ msgstr "Password modificata.\n"
 
-#~ msgid ""
-#~ "Usage: mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
 #~ msgstr ""
-#~ "Utilizzo: mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       Un device speciale pu� essere indicato da  -L label  o  -U uuid .\n"
-
-#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
-#~ msgstr "mount: %s:%s non riuscito, motivo indicato dal server: %s\n"
-
-#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
-#~ msgstr "utilizzo: %s [-shm | -msg | -sem] id\n"
+#~ "mount: questa versione è stata compilata senza supporto per il tipo 'nfs'"
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 000000000..b4d4fdead
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 6540a668d..8b84a3155 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11n\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-12-11 22:43+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "%s: %s �� ioctl ���顼\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   ����Sec    ������   �ǥХ���\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "�Ȥ���:\n"
@@ -159,13 +159,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "�Ȥ���: %s [ -n ] �ǥХ���\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s from %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -190,7 +189,7 @@ msgstr "ξ"
 msgid "Single"
 msgstr "��"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -200,97 +199,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: %s �� seek ���顼\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "(%d, %d, %d) �Ǥ���٤��Ǥ�\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: minix v2 �Υ��ݡ��ȤĤ��ǥ���ѥ��뤵��Ƥ��ޤ���\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ���"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ���ץ������ϥ��顼\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -767,7 +766,7 @@ msgstr "i-�Ρ��ɤ�¿�����ޤ� - ���� 512 �Ǥ�"
 msgid "not enough space, need at least %lu blocks"
 msgstr "�ΰ褬�Խ�ʬ�Ǥ�������Ǥ� %lu �֥��å�ɬ�פǤ�"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "�ǥХ���: %s\n"
@@ -836,19 +835,19 @@ msgstr ".. ���ܽ񤭹�����˥��顼��ȯ�����ޤ���"
 msgid "error closing %s"
 msgstr "%s �� close �ǥ��顼��ȯ�����ޤ���"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "�Ȥ���: mkfs [-V] [-t �ե����륷���ƥ෿] [fs ���ץ����] �ǥХ��� [������]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ���꤬­��ޤ���\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs ������� %s (%s)\n"
@@ -891,7 +890,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -944,10 +942,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1020,7 +1014,6 @@ msgstr "inode �ν񤭹��ߤ��Ǥ��ޤ���"
 msgid "write failed in write_block"
 msgstr "write_block �Ǥν񤭹��ߤ˼��Ԥ��ޤ���"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1056,7 +1049,7 @@ msgstr "�֥��å��Υƥ�����˥����������Ԥ��ޤ���"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check ���Ѥ��ͤ�����ޤ�: ¿ʬ�Х��Ǥ��礦\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "check_blocks �ǤΥ������˼��Ԥ��ޤ���"
 
@@ -1098,106 +1091,106 @@ msgstr "%s �ξ��֤�����Ǥ��ޤ���"
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' ��˥ե����륷���ƥ����ʤ��褦�ˤ��ޤ�"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "�����ʥ桼������ڡ��������� %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "�����ƥ�Υڡ����������� %2$d/%3$d ������ˡ��桼�������� %1$d ��Ȥ��ޤ�\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "������ %d (%d �ǤϤʤ�) �Υڡ������ޤ�\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "��٥�"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "�Ȥ���: %s [-c] [-v0|-v1] [-p�ڡ���������] /dev/name [�֥��å���]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "�����ڡ�����¿�����ޤ�"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "���꤬­��ޤ���"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "�����ʥڡ�����\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "�����ʥڡ����� %d\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ���顼: ����åפ�ͭ�������ꤹ�뤿��ξ�꤬�ʤ���\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: ���顼: ������ %ld ���ǥХ����Υ����� %d �����礭���Ǥ�\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ���顼: �����ʥС������ %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: ���顼: ����å��ΰ�Ͼ��ʤ��Ȥ� %ldkB ɬ�פǤ�\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: �ٹ�: ����å��ΰ�� %ldkB ���ڤ�ͤ�ޤ���\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: ���顼: ����åפ�ͭ�������ꤹ�뤿��ξ�꤬�ʤ���\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' �ˤϥ���åץǥ�����������ʤ��褦�ˤ��ޤ�"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "��̿���顼: �ǽ�Υڡ������ɹ���ޤ���"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1210,120 +1203,83 @@ msgstr ""
 "���ޤ����Ȥ��̣���ޤ����⤷���ʤ��������ˤ��ΥǥХ����� v0 ����å�\n"
 "��������������С�-f ���ץ����Ƕ��פ��Ƥ���������\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "����å׶��֤�����Ǥ��ޤ���: �ɹ���ޤ���"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "����å׶��֥С������ %d �����ꤷ�ޤ��������� = %ld �Х���\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "����åץǥ��������򴬤��᤻�ޤ���"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "��̾�ڡ�����񤭹���ޤ���"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync �˼���"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "�����ʿ�: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "ʸˡ���顼: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "���Τ褦������ѥ�᥿�Ϥ���ޤ���: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] �ǥХ��� ̾��\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] �ǥХ���\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] �ǥХ���\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "�����Բ�"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "�ǥ��������ѹ�����ޤ�����\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "�ΰ���������������������ˤϥ����ƥ��Ƶ�ư���Ƥ���������\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1336,330 +1292,311 @@ msgstr ""
 "�ޤä����ϡ�cfdisk �ޥ˥奢��ˤ����ɲþ���ڡ���\n"
 "�򻲾Ȥ��Ƥ���������\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "*��̿Ū�ʥ��顼*"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "���Ǥ���ˤϲ������������Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "�ǥ������ɥ饤�־�� seek �Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "�ǥ������ɥ饤�֤��ɤ߹���ޤ���"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "�ǥ������ɥ饤�֤˽񤭹���ޤ���"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "�ΰ褬¿�����ޤ�"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "�ΰ褬������ 0 ���ޤ�����ϤޤäƤ��ޤ�"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "�ΰ褬������ 0 ������ǽ���äƤ��ޤ�"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "�ΰ褬�ǥ������ν�������������ϤޤäƤ��ޤ�"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "�ΰ褬�ǥ������ν����������ǽ���äƤ��ޤ�"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "�����ΰ褬�ǥ������ν���Ȱ��פ��ޤ���"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "�����ΰ褬��ʣ���Ƥ��ޤ�"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "���礵�줿�����ΰ褬��ʣ���Ƥ��ޤ�"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! �������顼����ĥ�ΰ�ʳ��������ɥ饤�֤�������褦�Ȥ��Ƥ��ޤ� !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "�����ˤ������ɥ饤�֤�����Ǥ��ޤ��� -- 2 �Ĥγ�ĥ�ΰ�Ǥ���к������ޤ�"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "��˥塼����̾��Ĺ�����ޤ�����˥塼ɽ�������Ƥ����ǽ��������ޤ���"
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "��˥塼������������ޤ��󡣿�ʿ���������ͤȤ��ޤ���"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "�����ʥ���"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "³����ˤϲ������������Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "�����˴����ΰ��������ޤ�"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "�����������ΰ��������ޤ�"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "���"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "�ΰ��������ޤ���"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! �������顼 !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "������ (MB ñ��): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "�ǽ餫��"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "�����ΰ�κǽ���ΰ���ɲ�"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "�Ǹ夫��"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "�����ΰ�κǸ���ΰ���ɲ�"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "��ĥ�ΰ��������뤿��ξ�꤬����ޤ���"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "���ߥѡ��ƥ���������Ϥ���ޤ���\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "�ΰ�ơ��֥뤬̵�����ΰ�ơ��֥�ν�̾�������Ǥ�"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "ñ���ΰ�����ɽ��"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "���ߥѡ��ƥ���������Ϥ���ޤ���\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "�����ơ��֥�dz��Ϥ��ޤ��礦�� [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "�ǥ������ˤȤä�Ŭ�ڤʿ�����¿���Υ�����������ꤵ��ޤ���"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "�ǥ������ɥ饤�֤򳫤��ޤ���"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "�ǥ��������ɹ������Ѥdz����ޤ��� -- ���ʤ��ˤϽ���߸��¤�����ޤ���"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "�ǥ�����������������Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "�����ʴ����ΰ�"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "�����������ΰ�"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "�ٹ� ����Ϥ��ʤ��Υǥ������ˤ���ǡ������˲����뤫�⤷��ޤ���"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "�ΰ�����ǥ������˽񤭹���Ǥ��������Ǥ�����(yes �ޤ��� no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "�ΰ�ơ��֥��ǥ������˽񤭹��ߤޤ���Ǥ���"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' �� `no' �Τ����줫�����Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "�ΰ�ơ��֥��񤭹�����..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "�ΰ�ơ��֥��ǥ������˽񤭹��ߤޤ���"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "�ΰ�ơ��֥��񤭹��ߤޤ����������ɹ��ߤ˼��ԡ��Ƶ�ư���ƹ������Ƥ�������"
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�֡��Ȳ�ǽ�ޡ����դ������ΰ褬����ޤ���DOS MBR �Ϥ����֡��ȤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�֡��Ȳ�ǽ�ޡ����դ������ΰ褬ʣ������ޤ���DOS MBR �Ϥ����֡��ȤǤ��ޤ�"
 "��"
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "�ե�����̾�����ϡ����̤�ɽ��������ϥ꥿���󥭡�: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "�ե����� '%s' �򳫤��ޤ���"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "�ǥ������ɥ饤��: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "������ 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "������ %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   ̵��   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   ����/����"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   �����ΰ�"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   �����ΰ�"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "����"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "�֡���"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "����(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "��λ"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s �ѡ��ƥ���������\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            �ǽ��   �Ǹ��\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1668,7 +1605,7 @@ msgstr ""
 " #  �ΰ�    ������   ������ ���ե��å� �礭��  Filesystem������(ID)   �ե�"
 "��\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1677,472 +1614,469 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---�ǽ��-----      ----�Ǹ��---- ���Υ�  \n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flags Head Sect Cyl   ID  Head Sect Cyl  �����ֹ� ��������\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "���ǡ���"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "���ǡ����η����ǥѡ��ƥ�������������"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "��������˥ѡ��ƥ�������������"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "�ơ��֥�"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "ñ���ΰ�����ɽ��"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "�ΰ�������Ϥ��ʤ�"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk �Υإ�ײ���"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk ��ü�����ǥ������ΰ�����ץ������Ǥ���"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "�ϡ��ɥǥ������ɥ饤�֤��ΰ�������������ѹ�"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "���뤳�Ȥ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "���ޥ��      ����"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          �����������ΰ�Υ֡��ȥե饰������"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          ��������������"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ������, �إå�, �ȥ�å�������Υ����������ѹ�"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             �ٹ�: ���Υ��ץ���󤬲��򤹤��Τ����򤷤Ƥ��ʤ���"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             �ϻ��Ѥ��ƤϤ����ʤ���"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          ���β��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          �����������ΰ�Υǥ����������̤����ˤ��롣"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             ����: ���Υ��ץ����ϡ�DOS, OS/2 ���ȸߴ����Τʤ�"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             �ΰ����������ǽ��������ޤ���"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          �����ΰ褫�鿷�����ΰ�����"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          �ΰ�������̤ޤ��ϥǥ������˽��Ϥ���"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             �ΰ�ν��Ϥˤϼ��Τ褦��ʣ���η�����������"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             �Ǥ���:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - ���ǡ���(�ǥ������˽񤭹��ޤ����󤽤Τ��)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ��������Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - ���η����Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          �ΰ�����񤭹��ޤ��˥ץ�������λ"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          �ե����륷���ƥॿ���פ��ѹ�"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ɽ�������ΰ襵������ñ�̤��ѹ�����"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, ������, �������ν�˽۴Ĥ���"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          �ΰ�����ǥ������˽񤭹���(��ʸ�� W ��"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ���Ϥ��ʤ���Фʤ�ʤ�)�����Υ��ץ����ϥǥ��������"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             �ǡ������˲������ǽ�������뤿�ᡢ'yes'�ޤ���'no'����"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             �Ϥˤ�ꡢ�񤭹��ߤ�Ԥ����ɤ������ǧ���롣"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "���������   ����ΰ�˥���������ư"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "���������   �����ΰ�˥���������ư"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ���̤������"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          ���β��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "����: ���ޥ�ɤϤ��٤���ʸ������ʸ���ɤ���Ǥ���ѤǤ��ޤ�"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(�񤭹��ߤ����)��"
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "�������Υ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "�إåɿ�"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "�إåɤΥ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "�������Υ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "��λ"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "������ȥ���ѹ����ƽ�λ"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "�������������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "�����ʥ�������"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "�إå��������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "�����ʥإåɿ�"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "�ȥ�å�������Υ������������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "�����ʥ�������"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "�ե����륷���ƥॿ���פ����Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "�ե����륷���ƥॿ���פ�����ѹ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "�ե����륷���ƥॿ���פ��ĥ���ѹ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "����(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "����/����"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "���� (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "�ǥ������ɥ饤��: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "������: %lld ����"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "������: %lld ����"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "�إå�: %d   �ȥ�å�������Υ�����: %d   ������: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "̾��"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "�ե饰"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "�ΰ西����"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS������"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[��٥�]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "  ������"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "������ (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "������ (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "�֡��Ȳ�"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "�����������ΰ�Υ֡��ȥե饰���ڤ��ؤ���"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "��������������"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "������ȥ�"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "�ǥ�����������ȥ���ѹ�����(�������ѡ�����)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "�إ��"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "�إ�ײ��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "���粽"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "�����������ΰ�Υǥ����������̤���粽(�������ѡ�����)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "�����ΰ褫�鿷�����ΰ�����"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "ɽ��"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "�ΰ�������̤ޤ��ϥե�����˽���"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "��λ"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "�ΰ�����񤭹��ޤ��˥ץ�������λ"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "FS������"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "�ե����륷���ƥ�Υ����פ��ѹ�����(DOS, Linux, OS/2 �ʤ�)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "ñ��"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "ɽ�������ΰ襵������ñ��(MB, ������, ������)���ѹ�����"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "�񤭹���"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "�ΰ�����ǥ������˽񤭹���(�ǡ������˲������ǽ������)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "�����ΰ��֡��Ȳ�ǽ�ˤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "�����ΰ�������뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "�����ΰ����粽���뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "�����ΰ�ϻ��ѤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "���Υǥ������ϸ��߻�����Ǥ���"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "�����ΰ�Υ����פ��ѹ����뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "����ʾ���ΰ�Ϥ���ޤ���"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "�����ʥ��ޥ��"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2214,9 +2148,9 @@ msgstr ""
 "\n"
 "BSD ��٥��ѥǥХ���: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "���ޥ�ɤ�ư��"
 
@@ -2236,10 +2170,9 @@ msgstr "   i   �֡��ȥ��ȥ�åפ򥤥󥹥ȡ��뤹��"
 msgid "   l   list known filesystem types"
 msgstr "   l   ���ΤΥե����륷���ƥॿ���פ�ꥹ��ɽ������"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   ���Υ�˥塼��ɽ������"
 
@@ -2251,14 +2184,14 @@ msgstr "   n   ������ BSD ���������"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD �ΰ�ơ��֥��ɽ������"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   �ѹ�����¸�����˽�λ����"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   �ᥤ���˥塼�����"
 
@@ -2301,13 +2234,13 @@ msgstr "%s �ˤ� *BSD �ΰ�Ϥ���ޤ���\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD �ǥ�������٥륳�ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "�ǽ� %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "���� %s �ޤ��� +������ �ޤ��� +������M �ޤ��� +������K"
@@ -2352,8 +2285,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2454,8 +2385,8 @@ msgstr "������/�ȥ�å�"
 msgid "tracks/cylinder"
 msgstr "�ȥ�å�/������"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "��������"
 
@@ -2513,7 +2444,7 @@ msgstr "�֡��ȥ��ȥ�åפ� %s �˥��󥹥ȡ��뤵��ޤ�����\n"
 msgid "Partition (a-%c): "
 msgstr "�ΰ� (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "�����ΰ���Ϻ����ѤǤ�\n"
@@ -2537,7 +2468,7 @@ msgstr ""
 "\n"
 "�ǥ�������Ʊ�������ޤ���\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2557,7 +2488,7 @@ msgstr ""
 "-u: (�������������)��������˥åȤγ��ϡ�������Ϳ���ޤ�\n"
 "-b 2048: (������ MO �ɥ饤���Ѥ�) 2048 �Х��ȤΥ�������������Ȥ��ޤ�\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2573,198 +2504,184 @@ msgstr ""
 " ����: fdisk /dev/rd/c0d0  ����: fdisk /dev/ida/c0d0  (RAID �ǥ�������)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s ���ɤ�ޤ���\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s �򥷡����Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s �ؤν񤭹��ߤ��Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s �Ǥ� BLKGETSIZE ioctl �˼���\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "����ʾ�Υ��꤬���ݤǤ��ޤ���\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "��̿Ū�ʥ��顼\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   �ɹ������ѥե饰��Ĥ���"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd �ǥ�������٥���Խ�����"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   �ޥ���Ȳ�ǽ�ե饰��Ĥ���"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   ��������"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   ���Τ��ΰ西���פ�ꥹ��ɽ������"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ���������������"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   �����˶��� DOS �ΰ�ơ��֥���������"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   �ΰ�ơ��֥��ɽ������"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ���� Sun �ǥ�������٥���������"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   �ΰ�Υ����ƥ� ID ���ѹ�����"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   ɽ��/���ܥ�˥åȤ��ѹ�����"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   �ΰ�ơ��֥��ȹ礹��"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   �ơ��֥��ǥ������˽񤭹��ߡ���λ����"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   ���̤ʵ�ǽ (�������ѡ�������)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   �֡��Ȳ�ǽ�ΰ�����򤹤�"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   �֡��ȥե����륨��ȥ���Խ�����"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi ����å��ΰ�����򤹤�"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   �֡��Ȳ�ǽ�ե饰��Ĥ���"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos �ߴ��ե饰��Ĥ���"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ���إ����������ѹ�����"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   �����������ѹ�����"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   �ΰ�ơ��֥�������ǡ�����ɽ������"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ���������;�ꥻ���������ѹ�����"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   �إåɿ����ѹ�����"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ���󥿡��꡼�֥ե��������ѹ�����"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ��ž�����ѹ����� (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   ��������/�ȥ�å����ѹ�����"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ʪ�������������ѹ�����"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   �ΰ���Υǡ�������Ƭ�˰�ư����"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ��ĥ�ΰ��ꥹ��ɽ������"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) �ΰ�ơ��֥���������"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   �ΰ�ν����Ŭ��������"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "���ꤹ��ɬ�פ�����ޤ�"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "�إåɿ�"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "��������"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2773,11 +2690,11 @@ msgstr ""
 "%s%s.\n"
 "���ʤ������̵�ǽ��˥塼���餳���Ԥʤ����Ȥ��Ǥ��ޤ�\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " �ڤ� "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2796,29 +2713,29 @@ msgstr ""
 "2) �̤� OS �Υ֡��Ȥ�ѡ��ƥ������������ե�\n"
 "   (��. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "���ܳ�ĥ�ΰ�������ʥ��ե��åȤ�����ޤ�\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "�ٹ�: �ΰ�ơ��֥� %d ������̤ʥ�󥯥ݥ��󥿤Ǥ�\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "�ٹ�: �ΰ�ơ��֥� %d ������̤ʥǡ�����̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2830,24 +2747,24 @@ msgstr ""
 "��\n"
 "����������˻Ĥ��ޤ������θ�Ϥ��������������ƤϽ����Բ�ǽ�ˤʤ�ޤ���\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "����: �������������� %d �Ǥ� (%d �ǤϤʤ�)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "�ΰ�ơ��֥�ν񤭹��ߤ�Ԥ��ޤ���\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2856,17 +2773,17 @@ msgstr ""
 "�ǥХ���������� DOS �ΰ�ơ��֥�⡢Sun, SGI �� OSF �ǥ�������٥��\n"
 "�ޤ�Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "�������顼\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "���̤ʳ�ĥ�ΰ� %d ��̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2875,7 +2792,7 @@ msgstr ""
 "�ٹ�: �ΰ�ơ��֥� %2$d �������ʥե饰 0x%1$04x �� w(�񤭹���)�ˤ�ä�\n"
 "����ˤʤ�ޤ�\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2884,83 +2801,83 @@ msgstr ""
 "\n"
 "EOF �� 3 ���ɤߤޤ��� -- ��λ���ޤ�..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "16�ʿ������� (L ���ޥ�ɤǥ����ɥꥹ��ɽ��): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, ����� %d): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "����� %d ��Ȥ��ޤ�\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "�ϰϳ����ͤǤ���\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "�ΰ��ֹ�"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "�ٹ�: �ΰ� %d �϶��Υ����פǤ���\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "���̤ʳ�ĥ�ΰ� %d ��̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "�ΰ褬�������Ƥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "������"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "������"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "%s ��ɽ��/���ܥ�˥åȤ��ѹ����ޤ�\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "�ٹ�: �ΰ� %d �ϳ�ĥ�ΰ�Ǥ�\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS �ߴ��ե饰�����ꤵ��ޤ���\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS �ߴ��ե饰�����ꤵ��Ƥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "�ΰ� %d �Ϥޤ�¸�ߤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2973,7 +2890,7 @@ msgstr ""
 "¿ʬ���Ϥ��ʤ��ȤǤ������ʤ��� `d' ���ޥ�ɤ�ȤäƤ��Υѡ��ƥ�������\n"
 "����Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2982,7 +2899,7 @@ msgstr ""
 "���ʤ����ΰ���ĥ�ΰ���ѹ��Ǥ��ޤ��󤷡����εդ�ޤ�\n"
 "�Ǥ��ޤ��󡣤ޤ������ԤʤäƤ���������\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2992,7 +2909,7 @@ msgstr ""
 "�ΰ� 3 �� Whole disk (5) �Ȥ��ƻĤ��Ƥ������Ȥ��θ���Ƥ���������\n"
 "SunOS/Solaris �Ϥ������Ԥ��ޤ�����Linux �Ǥ������줬˾�ޤ����Ǥ���\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3002,59 +2919,59 @@ msgstr ""
 "�ΰ� 9 �� volume header (0) �Ȥ��ơ��ڤ��ΰ� 11 �� entire volume (6)\n"
 "�Ȥ��ƻĤ��Ƥ������Ȥ��θ���Ƥ���������IRIX �Ϥ�������ꤷ�ޤ���\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "�ΰ�Υ����ƥॿ���פ� %d ���� %x (%s) ���ѹ����ޤ���\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "�ΰ� %d �ϰۤʤä�ʪ��/�������ϰ��֤ˤʤäƤ��ޤ�(Linux �Ǥ�̵��?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ʪ��=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "����=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "�ΰ� %d �ϰۤʤä�ʪ��/���������ˤʤäƤ��ޤ�:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "�ΰ� %i �ϥ����������ǻϤޤäƤ��ޤ���:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) �Ǥ���٤��Ǥ�\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "�ѡ��ƥ������ %d �ϡ������������ǽ���äƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) �Ǥ���٤��Ǥ�\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3064,7 +2981,7 @@ msgstr ""
 "�ǥ����� %s: �إå� %d, ������ %d, ������ %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3072,19 +2989,19 @@ msgstr ""
 "�ǥ����� %s: �إå� %d, ������ %d, ������ %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3093,7 +3010,7 @@ msgstr ""
 "�Ԥ��٤����ȤϤ���ޤ��󡣴�������ʽ���ˤʤäƤ��ޤ���\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3101,16 +3018,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s �֡���   ����      ����  �֥��å�   ID  �����ƥ�\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "�ǥХ���"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3119,7 +3036,7 @@ msgstr ""
 "\n"
 "�ΰ�ơ��֥���ܤ��ǥ������ν���Ȱ��פ��ޤ���\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3130,82 +3047,82 @@ msgstr ""
 "�ǥ����� %s: �إå� %d, ������ %d, ������ %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    ����    ������ ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "�ٹ�: �ΰ� %d �ϥ����� 0 ��ޤ�Ǥ��ޤ�\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "�ΰ� %d: �إå� %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "�ΰ� %d: ������ %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "�ΰ� %d: ������ %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "�ΰ� %d: ���Υ����� %d �Ϲ�� %d �Ȱ��פ��ޤ���\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "�ٹ�: �ΰ� %d �������ʥǡ������ϰ��֤�����ޤ�\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "�ٹ�: �ΰ� %d �ϡ��ΰ� %d �ȽŤʤäƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "�ٹ�: �ΰ� %d �϶��Ǥ�\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "�����ΰ� %d ���ΰ� %d ���ΤˤʤäƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "��׳��ݥ����� %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "���ݤ���Ƥ��ʤ��������� %d ����ޤ�\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "�ΰ� %d ������ѤǤ����ޤ��Ϻ����ԤʤäƤ���������\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "������ %d �ϴ��˳��ݺѤߤǤ�\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "���Ѳ�ǽ�ե꡼������������ޤ���\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3218,22 +3135,22 @@ msgstr ""
 "\t�ѡ��ƥ������ơ��֥��������Ƥ���������(o ��Ȥ�)\n"
 "\t�ٹ�: ����ϸ��ߤΥǥ��������Ƥ��˲����ޤ���\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "��ĥ�ΰ���ɲä������ˡ��ޤ��ΰ��������ɬ�פ�����ޤ�\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "�����ΰ褬�ǥ������ν���Ȱ��פ��ޤ���"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "�����ʴ����ΰ�"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3244,20 +3161,20 @@ msgstr ""
 "   %s\n"
 "   p   �����ΰ� (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   ���� (5 �ʾ�)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ��ĥ"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "������ `%c' �ˤȤäƤ��������ΰ��ֹ�Ǥ�\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3266,12 +3183,12 @@ msgstr ""
 "�ΰ�ơ��֥�ϸ򴹤���ޤ�����\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() ��ƤӽФ����ΰ�ơ��֥����ɹ��ߤ��ޤ���\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3284,7 +3201,7 @@ msgstr ""
 "�����ͥ�Ϥޤ��Ť��ơ��֥��ȤäƤ��ޤ���\n"
 "�������ơ��֥�ϼ����֡��Ȼ��˻Ȥ���褦�ˤʤ�Ǥ��礦��\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3296,75 +3213,75 @@ msgstr ""
 "�ٹ�: DOS 6.x �ΰ��������ޤ����ѹ����Ƥ��ޤä����ϡ�\n"
 "fdisk �ޥ˥奢����ɲþ���ڡ����򻲾Ȥ��Ƥ���������\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "%s �Υ����������顼\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "�ǥ�������Ʊ�������ޤ���\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "�ΰ� %d �˥ǡ����ΰ褬����ޤ���\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "�����ǡ������ϰ���"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "���ԥ��ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "��������"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "�إåɿ�"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "��������"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "�ٹ�: DOS �ߴ��Τ���Υ��������ե��åȤ����ꤷ�ޤ�\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "�ǥ����� %s ��������ΰ�ơ��֥��ޤ�Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: �����ʥ��ޥ��\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "���Υ����ͥ�ϥ�������������ʬǧ�����ޤ� -- -b ���ץ�����̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3373,19 +3290,18 @@ msgstr ""
 "�ٹ�: -b (����������������) ���ץ����� 1 �ĤΥǥХ�������ȶ���\n"
 "���Ѥ����٤��Ǥ�\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s ��OSF/1 �ǥ�������٥�򸡽Ф����Τǡ��ǥ�������٥�⡼�ɤ˰ܹԤ��ޤ���\n"
 "DOS �ΰ�ơ��֥�⡼�ɤ����ˤϡ�'r' ���ޥ�ɤ�Ȥ��ޤ��礦��\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "���ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3394,16 +3310,16 @@ msgstr ""
 "\n"
 "���ߤΥ֡��ȥե������: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "�����ʥ֡��ȥե�����̾�����Ϥ��Ƥ�������: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "�֡��ȥե�������ѹ����ޤ���Ǥ���\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3470,15 +3386,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux ����å�"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3557,7 +3473,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s ������%5u ������%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3614,7 +3529,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "ʣ���� entire disk �ι��ܤ�����ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "�ΰ褬�������Ƥ��ޤ���\n"
@@ -3699,7 +3614,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t���ʤ��ϡ��֡��ȥե�����̾�Ȥ����̾�Ȱۤʤ�̾�������Ӥޤ�����\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3719,11 +3633,10 @@ msgstr ""
 "�����������Τ��Ȥ��Ȥ�ޤ���\n"
 "�����ΰ�˰ۤʤ륿���դ��ˤĤ��ơ��褯��äƤ���ʤ� YES �����Ϥ��Ʋ�������\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3793,44 +3706,43 @@ msgstr "�ΰ� %d ���ͤ���¸���ߤޤ���\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t����=%d\t��=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "��"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS �롼��"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS ����å�"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid ��ư����"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3843,12 +3755,12 @@ msgstr ""
 "��. �إåɿ����������������������ڤӥѡ��ƥ�������\n"
 "���뤤�� fresh label �������Ƥ������� (�ᥤ���˥塼�� s ���ޥ��)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "��ư����� %s%s%s �򸫤Ĥ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3859,7 +3771,7 @@ msgstr ""
 "������ sun disklabel ���ۤ��ޤ����ѹ��Ϥ��ʤ����񤭹��ߤ���ꤹ��ޤǡ�\n"
 "����ˤΤ߻Ĥ��ޤ������θ�Ϥ�����󡢰��������Ƥ������Ǥ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3869,72 +3781,72 @@ msgstr ""
 "   ?   ��ư����\n"
 "   0   �������� (�ϡ��ɥ����������Ф����ͤ����ͤȤ���)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "�����פ�����Ǥ������� (? �Ǽ�ư��0 �ǥ�������): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "��ư���꤬���Ԥ��ޤ�����\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "������/�ȥ�å�"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "���إ�������"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "ʪ����������"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "��ž�� (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "���󥿡��꡼��"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "������������̤ʥ�����"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "���ƤΥǥ������ѥ�᡼���� x ��˥塼�����ѹ��Ǥ��ޤ�"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" �ե��åԡ�"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "�ѡ��ƥ������ %d �ϥ����������ǽ���äƤ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "�ѡ��ƥ������ %d ��¾�Υ����� %d-%d �ȽŤʤäƤ��ޤ�\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "̤���ѥ���å� -- 0-%d ������\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "̤���ѥ���å� -- %d-%d ������\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3943,7 +3855,7 @@ msgstr ""
 "¾�Υѡ��ƥ�����󤬴��˥ǥ��������Τ�ʤ�äƤ��ޤ���\n"
 "�ޤ�����������Ƥ���⤦���ٻ�Ƥ���������\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3954,7 +3866,7 @@ msgstr ""
 "¾�Τ����Ĥ��Υѡ��ƥ�������ʤ�äƤ��ޤ������ʤ��ι��ܤ� %d %s ��\n"
 "�ѹ�����ޤ�����\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3964,7 +3876,7 @@ msgstr ""
 "Whole disk (5) �Τޤޤˤ��Ƥ������Ȥ��θ���Ƥ���������\n"
 "0 ����Ϥޤ� %u ������ʬ�Ǥ�\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3978,7 +3890,7 @@ msgstr ""
 "�⤷�����ʤ��������˥ѡ��ƥ���������� 82 (Linux swap) ��Ĥ��������\n"
 "YES �������Ƥ�������: "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3997,7 +3909,7 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4010,16 +3922,16 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s �ե饰  ����        ����   �֥��å� ID  �����ƥ�\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "���إ�������"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "ʪ����������"
 
@@ -4043,32 +3955,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "��ĥ�ΰ�"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX �֡��Ȳ�ǽ"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 �֡��ȥޥ͡�����"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4079,7 +3985,6 @@ msgstr "Win95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4177,12 +4082,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4203,8 +4106,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4214,7 +4115,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD �ޤ��� SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4235,12 +4135,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "�Ť� Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / �Ť� Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4271,12 +4169,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad �ϥ��Х͡������"
@@ -4285,7 +4181,6 @@ msgstr "IBM Thinkpad �ϥ��Х͡������"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4350,30 +4245,22 @@ msgstr "�� FS �ǡ���"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell �桼�ƥ���ƥ�"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4382,117 +4269,110 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC �֡���"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ���������"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s �Υ��������顼 -- %lu �򥷡����Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "���������顼: 0x%08x%08x �ΤϤ��Ǥ����� 0x%08x%08x ��������ޤ���\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "���꤬­��ޤ��� -- ����ޤ�\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s ���ɤ߼�ꥨ�顼 -- ������ %lu ���ɤ�ޤ���\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "���顼: ������ %lu �ˤ� msdos �����󤬤���ޤ���\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s �ؤν񤭹��ߥ��顼 -- ������ %lu �˽񤭹���ޤ���\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "�ѡ��ƥ�����󥻥�����¸�ե����� (%s) �򥪡��ץ�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s �ؤν񤭹��ߥ��顼\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "�ѡ��ƥ�����������ե����� (%s) �ξ��������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "�ѡ��ƥ�����������ե�����Υ��������ְ�äƤ��ޤ� -- ������Ԥʤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "���꤬­��ʤ���\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "�ѡ��ƥ�����������ե����� (%s) �򳫤��ޤ���\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s ���ɤ߼�ꥨ�顼\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "�ǥХ��� %s ��񤭹��ߤ褦�˥����ץ�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%2$s �Υ����� %1$lu �ؤν񤭹��ߥ��顼\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "�ǥ����� %s: ������ȥ������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "�ǥ����� %s: ������������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4504,22 +4384,22 @@ msgstr ""
 "������ fdisk �����Ѥ���Τ�¿ʬ��̣���ʤ����ȤǤ���\n"
 "[�����ˤ����Ԥʤ�������С�--force ���ץ�����ȤäƤ�������]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "�ٹ�: HDIO_GETGEO �ˤ��ȡ��إåɿ��� %lu �Ǥ�\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "�ٹ�: HDIO_GETGEO �ˤ��ȡ����������� %lu �Ǥ�\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "�ٹ�: BLKGETSIZE/HDIO_GETGEO �ˤ��ȡ����������� %lu �Ǥ�\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4529,7 +4409,7 @@ msgstr ""
 "����ϡ�C/H/S �򥢥ɥ쥹���������Ѥ��Ƥ������ƤΥ��եȥ������ǡ�\n"
 "���꤬�����뤳�Ȥˤʤ�ޤ���\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4538,7 +4418,7 @@ msgstr ""
 "\n"
 "�ǥ����� %s: �������� %lu���إåɿ� %lu��%lu ������/�ȥ�å�\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4546,7 +4426,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υإåɿ��Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$lu (0-%4$lu �ˤ���"
 "��������)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4555,7 +4435,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υ��������Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$lu (1-%4$lu �ˤ���"
 "��������)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4564,7 +4444,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υ��������Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$lu (0-%4$lu �ˤ�"
 "�Ƥ�������)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4573,12 +4453,12 @@ msgstr ""
 "Id  ̾��\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "�ѡ��ƥ������ơ��֥����ɤ߹�����...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4586,31 +4466,31 @@ msgstr ""
 "�ѡ��ƥ��������ɹ��ߥ��ޥ�ɤ����Ԥ��ޤ���\n"
 "mkfs ��Ȥ����ˡ������ƥ��Ƶ�ư���Ƥ�������\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s �Υ����������顼\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ���Τ褦�ʥѡ��ƥ������Ϥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ǧ���Ǥ��ʤ��ե����ޥå� -- �������������Ѥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s �Υѡ��ƥ������ơ��֥�\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "̤�����Υե����ޥå� -- %s �����Ѥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4619,12 +4499,12 @@ msgstr ""
 "��˥å� = %lu �Х��ȤΥ�������1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "�ǥХ��� �֡��� ����   ����   #������ #�֥��å� ID   �����ƥ�\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4633,12 +4513,12 @@ msgstr ""
 "��˥å� = 512 �Х��ȤΥ�������%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr " �ǥХ��� �֡���  ����      ����   #������   ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4647,12 +4527,12 @@ msgstr ""
 "��˥å� = 1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " �ǥХ��� �֡��� ����        ����  #�֥��å� ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4661,31 +4541,31 @@ msgstr ""
 "Units = 1048576 �Х��Ȥ�ᥬ�Х��ȡ�1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "�ǥХ��� �֡��� ����   ����    MB   #�֥��å� ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ %ld �˥ѡ��ƥ������ν������ǥ������κǸ��ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "�ѡ��ƥ�����󤬸��Ĥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4696,52 +4576,52 @@ msgstr ""
 "  (%ld/%ld/%ld ������)��\n"
 "���Υꥹ�Ȥϡ����Υ�����ȥ�ȸ��ʤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "���ߥѡ��ƥ���������Ϥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "�ѤǤ���%d �ĤΥѡ��ƥ�����󤷤��������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �Ǥ��������Ȥ��ƥޡ�������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �ʤΤ˥֡��Ȳ�ǽ�Ǥ���\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �ǡ��󥼥��γ��ϰ��֤Ǥ�\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϡ�"
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "�ѡ��ƥ������ %s �˴ޤޤ�Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "�ٹ�: �ѡ��ƥ������ %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "�� %s ���ŤʤäƤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4750,17 +4630,17 @@ msgstr ""
 "�ٹ�: �ΰ� %s ���ΰ�ơ��֥� (������ %lu) �ΰ�����ޤ�Ǥ��ꡢ\n"
 "���줬������������˲��������ˤʤ�ޤ�\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �������� 0 ����ϤޤäƤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥǥ������ν����ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4768,17 +4648,17 @@ msgstr ""
 "�����ΰ�ѡ��ƥ������Ǥϡ���ĥ�ѡ��ƥ��������Ĥ������ޤ�\n"
 " ��Linux �Ǥ�����ȤϤʤ�ޤ��󤱤�ɤ��\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ�������������ϤޤäƤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����������ǽ���äƤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4787,7 +4667,7 @@ msgstr ""
 "LILO �ˤȤäƤ����ꤢ��ޤ��󤬡�DOS �� MBR �Ϥ��Υǥ�������֡��ȤǤ��ʤ�\n"
 "�ʤäƤ��ޤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4795,7 +4675,7 @@ msgstr ""
 "�ٹ�: ���̤ϥץ饤�ޥ�ѡ��ƥ�������Ĥ�֡��ȤǤ���褦�ˤ��ޤ���\n"
 "LILO �� `�֡��Ȳ�ǽ' �ե饰��̵�뤷�ޤ����ɤ⡣\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4804,37 +4684,37 @@ msgstr ""
 "LILO �ˤȤäƤ����ꤢ��ޤ��󤬡�DOS MBR �Ϥ��Υǥ�������֡��ȤǤ��ʤ�\n"
 "�ʤäƤ��ޤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "����"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "�ѡ��ƥ������ %s: ����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "����"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "�ѡ��ƥ������ %s: ����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "������ %2$ld �ˤ���ѡ��ƥ������ %1$s �ν����ϥǥ������κǸ��ۤ��Ƥ���"
 "��\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4843,7 +4723,7 @@ msgstr ""
 "�ٹ�: ��ĥ�ΰ�γ��ϰ��֤� %ld ���� %ld �˰ܤ���ޤ���\n"
 "�ʥꥹ��ɽ���ΰ٤����Ǥ����������Ƥ��ѹ��Ϥ���ޤ��󡣡�\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4851,133 +4731,132 @@ msgstr ""
 "�ٹ�: ��ĥ�ΰ褬��������������ϤޤäƤ��ޤ���\n"
 "DOS �� Linux ����Ȥ�ۤʤäƲ�᤹��Ǥ��礦��\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "�ѡ��ƥ������¿�����ޤ� -- nr (%d) �ʹߤ�̵�뤷�ޤ�\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "�ѡ��ƥ������Υĥ꡼��\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager �򸡽� -- �������ª�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ��̾��ȯ�� -- ����ޤ�\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "�ѤǤ�..., ������ 0 �γ�ĥ�ѡ��ƥ������ ��\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "�ѤǤ�..., ������ 0 �� BSD �ѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ǧ���Ǥ��ʤ��ѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n �ե饰��Ϳ�����ޤ���: �����ѹ����ޤ���Ǥ���\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "�Ť�����������¸�˼��� -- ���Ǥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s �Υѡ��ƥ������񤭹��ߤ˼���\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ĺ�����Դ����ʹԤ����� -- ��ߤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "���ϥ��顼: `=' �� %s �ե�����ɤθ�ˤ��Ƥ�������\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "���ϥ��顼: %2$s �ե�����ɤθ��ͽ�����ʤ�ʸ�� `%1$c'\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ǧ���Ǥ��ʤ�����: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "�������礭�����ޤ�\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "�����θ���˥��ߤ��դ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "�ѡ��ƥ�����󵭽һҤζ���������ޤ���\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "��ĥ�ѡ��ƥ������ΰϤ����ۤǤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "���ϥե�����ɤ�¿�����ޤ�\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "����ʾ�ζ���������ޤ���\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "�����ʥ�����\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "�ٹ�: Ϳ����줿������ (%lu) �ϡ����ƤǤ�����祵���� (%lu) ��ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "�ٹ�: ���Υѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "�ٹ�: �����ʥѡ��ƥ�����󤬻ϤޤäƤ��ޤ� (���ֺǽ� %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ǧ���Ǥ��ʤ��֡��Ȳ�ǽ�ե饰 -- - �� * ������Ǥ�������\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s �ΰ�������ꡩ\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "��ĥ�ѡ��ƥ������ͽ���������ˤ���ޤ���\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "����������\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "�ѡ��ƥ������¿�����ޤ�\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -4988,103 +4867,99 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "���̤� <start> �� <size> (�����ƶ��餯 <type>)����ꤹ������ǹ����ޤ���\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "�������"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "�Ȥ���: %s [���ץ����] �ǥХ���̾...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "�ǥХ���: /dev/hda �� /dev/sda ���ͤʲ���"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "ͭ�פʥ��ץ����:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [or --show-size]: �ΰ襵�����Υꥹ��"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [or --id]:        �ΰ� ID ��ɽ���ޤ����ѹ�"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [or --list]:      �ǥХ�������ΰ�ꥹ��"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      ����Ʊ��������������Ͻ񼰤˱褦�褦�ˤ���"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: ���������ʤɡ�0 �ǤϤʤ� 1 ����"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  ������/�֥��å�/������/MB �Υ�˥åȤμ���/���"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [or --list-types]:���Τ��ΰ西���פΥꥹ��"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS �ߴ��⡼�� -- ���֤�����̵�̤ˤʤ�ޤ�"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [or --re-read]:   �����ͥ���ΰ�ơ��֥����ɹ��ߤ�����"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                �����ֹ�# ���ΰ�Τ��ѹ�����"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 �ǥ������ؤμºݤν���ߤ�Ԥ�ʤ�"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            ��񤭤���륻������ե��������¸����"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ��������ե����뤫����������"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   �С�������ɽ������"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      ���Υ�å�������ɽ������"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "�����ʥ��ץ����:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: �����ͥ�Υ�����ȥ�����ɽ������"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [or --show-geometry]: �����ͥ�Υ�����ȥ�����ɽ������"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5092,115 +4967,115 @@ msgstr ""
 "    -x [or --show-extended]: ��ĥ�ΰ�ꥹ�Ȥ�ɽ������\n"
 "                             �ޤ��Ϥ����ε��һҤ����Ϥ�����"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux �ˤ�����ʤ��Ƥ�ʸ��򱾤�ʤ�"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      �ٹ��å���������������"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    ������ȥ긡�Ф�������Ǥ��ޤ�:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:���Ѥ��륷�����������ꤹ��"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    ���Ѥ���إåɿ������ꤹ��"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  ���Ѥ��륻�����������ꤹ��"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "̷��Υ����å���Ԥ�ʤ��褦�ˤǤ��ޤ�:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      �������ʻ����ԤäƤ⡢���Τޤ޼¹Ԥ��ޤ�"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "�Ȥ���:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s �ǥХ���\t\t �ǥХ�����Υ����ƥ����ΰ��ꥹ�Ȥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s �ǥХ��� n1 n2 ... n1 �򥢥��ƥ����ˤ���..., �Ĥ���󥢥��ƥ����ˤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An �ǥХ���\t n �򥢥��ƥ����ˤ�������ʳ����󥢥��ƥ����ˤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "���ޥ�ɤʤ���\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "���: %d �֥��å�\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "�Ȥ���: sfdisk --print-id �ǥХ��� �ѡ��ƥ�������ֹ�\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "�Ȥ���: sfdisk --change-id �ǥХ��� �ѡ��ƥ�������ֹ� ID\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "�Ȥ���: sfdisk --id �ǥХ��� �ѡ��ƥ�������ֹ� [ID]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "��ĤΥǥХ����Τ߻���Ǥ��ޤ� (-l �� -s �����)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ���ɤ߽񤭥⡼�ɤdz����ޤ���\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ���ɹ����Ѥ˳����ޤ���\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: �������� %ld���إåɿ� %ld��%ld ������/�ȥ�å�\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s �Υ�����������Ǥ��ޤ���"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "�����ʥ֡��ȥե饰: 0x80 �Ǥʤ� 0x%x �Ǥ�\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5208,7 +5083,7 @@ msgstr ""
 "��λ\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5218,35 +5093,35 @@ msgstr ""
 "LILO �Ǥ����ꤢ��ޤ��󤬡�DOS MBR �� 1 �ĤΥ����ƥ��֤ʥѡ��ƥ�����󤷤�\n"
 "�֡��ȤǤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "�ѡ��ƥ������ %s �ˤ� ID %x �����ꡢ������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "������ ID %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "���Υǥ������ϸ��߻�����Ǥ���\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "��̿Ū�ʥ��顼: %s �����Ĥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "�ٹ�: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ���\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "���ߡ�ï�⤳�Υǥ�������ȤäƤ��ʤ�����Ĵ�٤ޤ�...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5260,30 +5135,30 @@ msgstr ""
 "   ������� swapoff ���Ƥ���������\n"
 "   ���ʤߤ� --no-reread �ե饰�Ǥ��Υ����å��������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "���ƤΥ����å���Ķ�ۤ�����ˤ� --force �ե饰��ȤäƤ���������\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "�Ť�����:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "�ѡ��ƥ������ %d ��¸�ߤ��ޤ���Τǡ��ѹ��Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "�����ʾ���:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5291,21 +5166,21 @@ msgstr ""
 "��Ϥ����Υѡ��ƥ������˴�Ϳ����������ޤ��� -- �ѹ����ޤ���\n"
 "(�����ˤ����Ԥʤ�������С�--force ���ץ�����ȤäƤ�������)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "��Ϥ���˴�Ϳ����������ޤ��� -- ���餯 No ��������٤��Ǥ��礦\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "����Ǥ��ʤ����׵����������ޤ����� [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�ǥ������ؤν񤭹��ߤ�Ԥʤ��ޤ����� [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5314,16 +5189,16 @@ msgstr ""
 "\n"
 "sfdisk: ���Ϥ�û�����ޤ�\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "���� -- �����ѹ����ޤ���\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q �Τ����줫�������Ƥ�������\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5332,7 +5207,7 @@ msgstr ""
 "�����ʥѡ��ƥ������ν񤭹��ߤ�����\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5432,130 +5307,130 @@ msgstr "getopt (enhanced) 1.1.2\n"
 msgid "internal error, contact the author."
 msgstr "�������顼����Ԥ�Ϣ����"
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "MILO ����֡��Ȥ���ޤ���\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "�ƹ��� BCD �����å�\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "�����å��ݡ��Ȥ� 0x%x �˽������ޤ���\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "�������� TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: �Բ�ʬ��%s�� 1000 ���ȿ��������!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port �򳫤��ޤ���: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "���Ĥμ������ʤ��ä��Τǡ����Ĥμ����˼��Ԥ��ޤ�����\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s �� I/O �ݡ��ȥ����������Ǥ��ޤ���: iopl(3) ������˼��ԡ�\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "���餯�롼�ȸ��¤�ɬ�פǤ���\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "�ϡ��ɥ���������%s������ݻ����Ƥ���Ȥߤʤ��ޤ�\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr " UTC "
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "��������"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: �ٹ�: adjtime �ե�����λ����ܤ�ǧ���Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(���Ԥ����Τ�: `UTC', `LOCAL' ���뤤�ϲ���ʤ����Ǥ���)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "ľ���Τ���ν����� 1969 ǯ�ʹ� %ld �û����ǹԤʤ��ޤ���\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "ľ����Ĵ���� 1969 ǯ�ʹ� %ld �û����ǹԤʤ��ޤ���\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "�ϡ��ɥ��������פ�%s����Ǥ�\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "������"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "�����å����å����ԤäƤ��ޤ�...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "�����å����å���������ޤ���\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "�ϡ��ɥ��������פ���������: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "�ϡ��ɥ��������׻��� : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 ǯ���� %ld ��\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "�ϡ��ɥ��������פ����ɹ��������: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "�ϡ��ɥ��������פ� %.2d:%.2d:%.2d ������ = 1969 ǯ���� %ld ��\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "�����å����ѹ����ޤ���Ǥ��� -- �ƥ��Ȥ����Ǥ���\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5564,7 +5439,7 @@ msgstr ""
 "����򻲾Ȥ����������� %.6f �÷вᡣ\n"
 "���δ������äޤ��٤餻�ޤ���\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5573,22 +5448,22 @@ msgstr ""
 "�ϡ��ɥ��������ץ쥸����������������(�� ����50��)�ˤʤäƤ��뤫��\n"
 "��ª�Ǥ��ʤ��ϰϤ���(�� 2095ǯ)�ˤʤäƤ��ޤ���\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f ��\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date ���ץ���󤬻��ꤵ��Ƥ��ޤ���\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date ������Ĺ�����ޤ�\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5597,23 +5472,23 @@ msgstr ""
 "--date ���ץ������ͤ����������դǤϤ���ޤ���\n"
 "�äˡ��������ơ������ޡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "date ���ޥ�ɤ�ȯ�Ԥ��ޤ�: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "/bin/sh ��������� 'date' �ץ�������¹ԤǤ��ޤ���\n"
 "popen() �����Ԥ��ޤ�����"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date ���ޥ�ɤ�������� = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5628,7 +5503,7 @@ msgstr ""
 "����������:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5645,12 +5520,12 @@ msgstr ""
 "�������:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "date ʸ���� %s �� 1969 ǯ���� %ld �äȤ��ޤ�\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5659,57 +5534,57 @@ msgstr ""
 "�ϡ��ɥ��������פϡ������������ޤ�Ǥ��ʤ��Τǡ�������������줿�ͤ�\n"
 "�����ƥ���������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday ��ƤӽФ��ޤ�:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "�ƥ��ȥ⡼�ɤ�ư��Ƥ��뤿�ᡢ�����ƥ९���å������ꤷ�ޤ���\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "�����ƥ९���å������ꤹ��ˤϡ������ѡ��桼���Ǥʤ���Фʤ�ޤ���\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() �ƤӽФ��˼���"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr "�ϡ��ɥ���������˰����Υ��ߤ��ޤޤ�Ƥ��ꡢ��������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr "�����Ĵ�����衢���ʤ��Ȥ�����вᤷ�ʤ��ȡ���������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr "�����Ĵ�����衢���ʤ��Ȥ�����вᤷ�ʤ��ȡ���������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5720,22 +5595,22 @@ msgstr ""
 "�ä���ޤ�����\n"
 "���������� %4$f �ä���������ޤ�\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "����ν�������λ��֤� %d �äǤ�\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "%d �ä������ȡ�%.6f �����λ���λ��Ȥ�ɬ�פǤ�\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "�ƥ��ȥ⡼�ɤ�ư��Ƥ��뤿�� adjtime �ե�����򹹿����ޤ���\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5744,38 +5619,38 @@ msgstr ""
 "����ʤ�� %s �˰ʲ��Τ褦�˽񤭹��ޤ��Ϥ��Ǥ���:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "����ν����ͤϹ�������ޤ���Ǥ�����\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "�ϡ��ɥ��������פ�������ʻ����ޤ�Ǥ��ʤ��Τǡ������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "ɬ�פʽ���������̤���ʤΤǡ������å������ꤷ�ޤ���\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s ��Ȥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "���Ѳ�ǽ�ʥ����å����󥿡��ե����������Ĥ���ޤ���\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "�����ƥ९���å�������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5788,17 +5663,17 @@ msgstr ""
 "���� hwclock ��ʣ���� Alpha �ʳ��Υޥ���ǥӥ�ɤ���ޤ���\n"
 "(���������������� Alpha ��Ǽ¹Ԥ���Ƥ��ޤ���)���¹ԤǤ��ޤ���\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "�����ͥ뤫�饨�ݥå��ͤ�����Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "�����ͥ�ϥ��ݥå��ͤ� %lu �����ꤷ�Ƥ��ޤ�\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5807,17 +5682,22 @@ msgstr ""
 "���ݥå��ͤ����ꤹ�뤿��ˤϡ������ͤ����ꤹ�뤫���Τ餻�뤿��� 'epoch'\n"
 "���ץ�����Ȥ�ʤ���Фʤ�ޤ���\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "���ݥå��� %d �����ꤷ�ޤ��� -- �ƥ��Ȥ����Ǥ���\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "�����ͥ�˥��ݥå��ͤ����ꤹ�뤳�Ȥ��Ǥ��ޤ���Ǥ�����\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s from %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5876,7 +5756,7 @@ msgstr ""
 "  -noadjfile    /etc/adjtime �˥����������ʤ���--utc ���� --localtime\n"
 "                �Τ����줫�λ��Ѥ�ɬ�פȤ���\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5885,12 +5765,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                ���ʤ��� alpha �Υ����פ�ؼ����� (hwclock(8) ����)\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s �ϲ��餫�Υ��ץ�����������ޤ������ʤ��� %d ��Ϳ���ޤ�����\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5899,7 +5779,7 @@ msgstr ""
 "���ʤ��ϵ�ǽ���ץ�����ʣ���Ļ��ꤷ�ޤ�����\n"
 "���٤˰�Ĥε�ǽ�Τ߹Ԥʤ����Ȥ��Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5908,7 +5788,7 @@ msgstr ""
 "%s: --utc �� --localtime ���ץ����������¾Ū�Ǥ�����ξ�������ꤵ��ޤ�"
 "����\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5917,30 +5797,30 @@ msgstr ""
 "%s: --adjust �� --noadjfile ���ץ����������¾Ū�Ǥ�����ξ�������ꤵ��ޤ�"
 "����\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: --noadjfile ��Ĥ�����硢--utc �� --localtime �Τ����줫����ꤷ�ʤ����"
 "�ʤ�ޤ���\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "ͭ����������郎����ޤ��󡣥����å�������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 "��ǰ�ʤ��顢�ϡ��ɥ����������פ��ѹ��ϥ����ѡ��桼���Ǥ����Ԥʤ��ޤ���\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "��ǰ�ʤ��顢�����ƥ���פ��ѹ��ϥ����ѡ��桼���Ǥ����Ԥʤ��ޤ���\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -5949,12 +5829,12 @@ msgstr ""
 "��ǰ�ʤ��顢�����ͥ���Υϡ��ɥ��������פΥ��ݥå��ͤ��ѹ��Ǥ���Τϡ�\n"
 "�����ѡ��桼�������Ǥ���\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "���ΤΤɤ����ˡ�Ǥ⡢�ϡ��ɥ��������פ˥��������Ǥ��ޤ���\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5988,7 +5868,6 @@ msgstr "%s ���������ɹ��ि��� ioctl() �˼��Ԥ��ޤ���"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK ioctl �˼��Ԥ��ޤ���"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 �ޤ��� /dev/vc/1 �򳫤��ޤ���"
@@ -6085,9 +5964,6 @@ msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 "%2$s ���� RTC_EPOCH_READ ioctl �ˤ�äƥ��ݥå� %1$ld ���ɤ߼��ޤ�����\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6115,7 +5991,6 @@ msgstr "%s �ؤ� ioctl(RTC_EPOCH_SET) �����Ԥ��ޤ���"
 msgid "calling open_tty\n"
 msgstr "open_tty �θƤӽФ���\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "termio_init �ƤӽФ���\n"
@@ -6124,7 +5999,6 @@ msgstr "termio_init �ƤӽФ���\n"
 msgid "writing init string\n"
 msgstr "�����ʸ����ν񤭹�����\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "��ư�ܡ��졼�ȸ�����\n"
@@ -6138,7 +6012,6 @@ msgstr "cr-lf ���ԤäƤ��ޤ�\n"
 msgid "read %c\n"
 msgstr "%c ���ɹ���\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "��������̾���ɹ���ޤ���\n"
@@ -6192,7 +6065,6 @@ msgstr "/dev: chdir() ������: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ����饯���ǥХ����ǤϤ���ޤ���"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6207,12 +6079,10 @@ msgstr "/dev/%s: ɸ�����ϤȤ��Ƴ������Ȥ��Ǥ��ޤ���: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: �ɤ߽�ξ�Ѥ˥����ץ�Ǥ��ޤ���"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "ʣ����\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6255,30 +6125,25 @@ msgstr ""
 "����\t[-hiLmw] [-l ��������ץ������] [-t�����ॢ���� [-I �����ʸ����] [-H "
 "��������ۥ���] �� �ܡ��졼��,... [ü��������]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ���꤬���ʤ��Τǡ���������˼��Ԥ���褦�Ǥ�\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "tty ���饹�ѥ��꤬���ݤǤ��ޤ���"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "���롼�ץꥹ���ѥ��꤬���ݤǤ��ޤ���"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "%2$s ���� %1$s �ؤΥ�������ϡ�������֤Ǥϵ��ݤ���ޤ�����\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "%2$s ���� %1$s �ؤΥ�����������ꤵ��ޤ�����\n"
@@ -6324,8 +6189,8 @@ msgstr "%s �� finger ������ѹ����ޤ���\n"
 msgid "Password error."
 msgstr "�ѥ���ɥ��顼��"
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "�ѥ����: "
@@ -6503,34 +6368,6 @@ msgstr "�ꥹ�Ȥ򸫤�ˤϡ�%s -l ��ȤäƤ���������\n"
 msgid "No known shells.\n"
 msgstr "�Τ�ʤ�������Ǥ���\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom �򳫤��ޤ���"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "/dev/urandom ���������ǡ������ɹ���ޤ���"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s ���ɹ����Ѥ˳����ޤ���"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "(%s) �ե�������������Ǥ��ޤ���"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s ���������ե�����⡼�ɤǤϤ���ޤ���"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "%s ����ǡ������ɹ���ޤ���"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6540,11 +6377,11 @@ msgstr "%s ���ɤ�ޤ���Τǽ�λ���ޤ���"
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "�Ȥ���: last [-#] [-f �ե�����] [-t ü��] [-h �ۥ���̾] [�桼�� ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  �������󤷤��ޤޤǤ�"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6553,15 +6390,15 @@ msgstr ""
 "\n"
 "wtmp �� %s ����Ϥޤ�ޤ� "
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: ������ݤ˼��ԡ�\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6570,51 +6407,45 @@ msgstr ""
 "\n"
 "�����ߤ�����ޤ��� %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s �������ץ�Ǥ��ޤ���: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h �ϥ����ѡ��桼�����ѤǤ���\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "�Ȥ���: login [-fp] [�桼��̾]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM ���ԡ����Ǥ��ޤ�: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM �ν�������Ǥ��ޤ���: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "��������: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6623,17 +6454,17 @@ msgstr ""
 "Login ���ְ�äƤ��ޤ�\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "*��������ȥ饤��¿�����ޤ�* (%d) %s ���� %s ��, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "���Ԥ����������󥻥å���� %s ���� %s ��, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6642,7 +6473,7 @@ msgstr ""
 "\n"
 "Login ���ְ�äƤ��ޤ�\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6651,135 +6482,120 @@ msgstr ""
 "\n"
 "���å���󥻥åȥ��åפ����ꡣ���Ǥ��ޤ���\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL �桼��̾�� %s:%d �ˤ���ޤ������Ǥ��ޤ���"
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "̵���ʥ桼��̾ \"%s\" �� %s:%d �ˤ���ޤ������Ǥ��ޤ�"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: ���꤬­��ޤ���\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "�����ʥ桼��̾"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s �Υ�������Ϥ���ü���Ǥϵ��ݤ���ޤ�����\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "�������� %s ����䡢%s ���� TTY %s ���"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "�������� %s ����䡢TTY %s ���"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login ���ְ�äƤ��ޤ�\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"���˥������󤷤Ƥ���桼��������¿�����ޤ���\n"
-"�ޤ���ǻ�Ƥ���������\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "���ʤ����¹Ԥ��Ƥ���ץ�������¿�����ޤ���\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "�������륢�åפ� %s �ˡ�%s �ˤ��"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s �� ROOT ����������%s ����"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s �� ROOT ����������"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s �� %s ����������%s ����"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s �� %s ����������"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "�������ᥤ�뤬�Ϥ��Ƥ��ޤ���\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "�ᥤ�뤬�Ϥ��Ƥ��ޤ���\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork �˼���: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() �˼���"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "�ǥ��쥯�ȥ� %s ������ޤ���\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "�ۡ���ǥ��쥯�ȥ� \"/\" �ǥ������󤷤ޤ���\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: �����륹����ץ��ѤΥ��꤬����ޤ���\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: �����륹����ץȤ�¹ԤǤ��ޤ���Ǥ���: %s\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: �����뤬����ޤ���: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6788,65 +6604,65 @@ msgstr ""
 "\n"
 "%s ��������: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "��������̾��Ĺ�����ޤ���\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "̾����Ĺ�����ޤ�"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "��������̾�� '-' �ǻϤޤäƤ��ƤϤ����ޤ���\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "������(linefeed) ��¿�����ޤ���\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "����ʹ�����(linefeed)"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d �ø�˥�������λ����ڤ�\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ǽ���������: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s ����\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s ��\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s ����Υ������󤬼���, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s �ǤΥ������󤬼���, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d �� %s ����Υ������󤬼���, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d �� %s �ǤΥ������󤬼���, %s"
@@ -6866,168 +6682,30 @@ msgstr "�� n �Ǥ�\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "�Ȥ���: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: �����"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: ���Τ褦�ʥ��롼�פϤ���ޤ���"
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: ���Ĥ�����ޤ���"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "�����뤬����ޤ���"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "�ѥ���ɤϺ��� 6 ʸ��ɬ�פǤ����⤦���٤��ľ���Ƥ���������\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"�ѥ���ɤϰʲ����Ȥߤ��� 2 �İʾ�ǹ�������ͤФʤ�ޤ���:\n"
-"����ʸ���ȱѾ�ʸ�����������󥢥�ե��٥å�ʸ��\n"
-"�ܤ�������� passwd(1) �򸫤ޤ��礦��\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "�Ť��ѥ���ɤκ����ѤϤǤ��ޤ���\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "�桼��̾��Ʊ���褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "���ʤ��μ�̾�Τ褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "�Ȥ���: passwd [�桼��̾ [�ѥ����]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "root ��������Ĥޤ�����Ĥΰ��������Ǽ¹ԤǤ��ޤ�\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "�Ȥ���: passwd [-foqsvV] [�桼�� [�ѥ����]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s ��¹ԤǤ��ޤ���: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "��������̾�����Ĥ����ޤ���"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "root ������¾�ͤΥѥ���ɤ��ѹ��Ǥ��ޤ�\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "������¿�����ޤ���\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "�桼��̾���ɤ��ˤ⸫�Ĥ���ޤ���`%s' �������˥桼���Ǥ�����"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"��ǰ�ʤ��顢��������Υѥ���ɤ��ѹ������Ǥ��ޤ���\n"
-"������ yppasswd ��ȤäƤ���������"
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "�桼��ID �ֹ�ȥ桼��̾�����פ��ޤ��󡣺��Τ���"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "%s �Υѥ���ɤ��ѹ����ޤ�\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "��ѥ���ɤ����Ϥ��Ƥ�������: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "�����ʥѥ���ɡ����ΤǤ���"
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "���ѥ���ɤ����Ϥ��Ƥ���������"
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "�ѥ���ɤ��ѹ�����ޤ���Ǥ�����"
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "���ѥ���ɤ�⤦�������Ϥ��Ƥ�������: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "�֤꤬�㤤�ޤ�����Ǥ⤦���ٻ�Ƥ���������"
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "�ѥ���ɤ��ѹ�����ޤ������桼�� %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "* root �Υѥ���ɤ��ѹ�����ޤ��� *"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "�ѥ���ɤϥ롼�Ȥˤ�ä��ѹ�����ޤ������桼�� %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "�ѥ���ɤ����ꤹ�뤿�� setpwnam ��ƤӽФ��档\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "�ѥ���ɤ��ѹ� *����ޤ���Ǥ���*����Ǥ⤦���ٻ�Ƥ���������\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "�ѥ���ɤ��ѹ�����ޤ�����\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7074,7 +6752,6 @@ msgstr "%s �ˤ�� reboot: %s"
 msgid "halted by %s: %s"
 msgstr "%s �ˤ�� halt: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7111,7 +6788,6 @@ msgstr "�ץ������ \"%s\" ��¹Ԥ��Ƥ��ޤ�...\n"
 msgid "Error executing\t%s\n"
 msgstr "�¹ԥ��顼\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7201,7 +6877,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "finalprog ��ư���˥��顼ȯ��\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "finalprog �� fork ���˥��顼ȯ��\n"
@@ -7230,7 +6905,7 @@ msgstr "�ǥ��쥯�ȥ�Υ����ץ󤬼��Ԥ��ޤ���\n"
 msgid "fork failed\n"
 msgstr "fork ������\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "�¹Ԥ˼���\n"
 
@@ -7379,12 +7054,6 @@ msgstr "�����ʷ�: 1-12 ��ȤäƤ�������"
 msgid "illegal year value: use 1-9999"
 msgstr "������ǯ: 1-9999 ��ȤäƤ�������"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7395,13 +7064,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "�Ȥ���: cal [-mjyV] [�� �� ǯ]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "�Ȥ���: %s [+��] [�� �� ǯ]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "�� Tib ����"
 
@@ -7533,7 +7201,7 @@ msgstr "%s: %s ���� %s �ؤ�̾�����ѹ��˼��Ԥ��ޤ���: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s from to files...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7544,22 +7212,22 @@ msgstr ""
 "�����ˤ����Ȥ������ʤ� `%s [���ץ����] %s' ��Ȥ��ޤ��礦\n"
 "script �ϳ��Ϥ��ޤ���Ǥ�����\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "�Ȥ���: script [-a] [-f] [-q] [-t] [�ե�����]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "������ץȤ򳫻Ϥ��ޤ������ե������ %s �Ǥ�\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "������ץȤ� %s �˳��Ϥ��ޤ���"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7568,254 +7236,253 @@ msgstr ""
 "\n"
 "������ץȤ� %s �˽�λ���ޤ���"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "������ץȤ�λ���ޤ������ե������ %s �Ǥ�\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ������\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "���ѤǤ��� pty ������ޤ���\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: �������顼���Ȥ�����\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term ü��̾ ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ ����1 ����2 ����3 ... ] ]      (���ֿ� = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ ����1 ����2 ����3 ... ] ]   (���ֿ� = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ����ץե�����̾ ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "�ѥ�����֥⡼�ɤ�����(���ϲ��)�Ǥ��ޤ���\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl ���顼: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s ���ɹ��ߥ��顼\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "�����꡼�����׽񤭹��ߥ��顼\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s ���ɤ�ޤ��󡢤����� ioctl ����פ��Ǥ��ޤ���\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ���������Ƥ��ޤ���\n"
@@ -7890,10 +7557,6 @@ msgstr "�ٹ�: %s �������ץ�Ǥ��ޤ���: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s �򥪡��ץ�Ǥ��ޤ���Ǥ��� -- ���� %s ��Ȥ��ޤ�\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8191,82 +7854,72 @@ msgstr "mount: %s ��®�������Ѥ˥����ץ�Ǥ��ޤ���"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ®�٤����꤬�Ǥ��ޤ���: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork �Ǥ��ޤ���: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: ���ΥС������� 'nfs' �����פΥ��ݡ��Ȥʤ��ǥ���ѥ��뤵��Ƥ��ޤ�"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount version 4 �Ǥϼ��Ԥ��ޤ�����3 ���ޤ�..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none �����ꤵ��ޤ��������ե����륷���ƥॿ���פ����Ǥ��ޤ���"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: �ե����륷���ƥॿ���פ���ꤹ��ɬ�פ�����ޤ�"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: �ޥ���Ȥ˼��Ԥ��ޤ���"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: �ޥ���ȥݥ���� %s �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: ���Ĥ�����ޤ���"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount ��Ȥ��ˤϥ����ѡ��桼���Ǥʤ���Фʤ�ޤ���"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s �ϻ�����Ǥ�"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc �ϥޥ���ȺѤǤ�"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s �� �ޥ���ȺѤ� %s ��������Ǥ�"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: �ޥ���ȥݥ���� %s ��¸�ߤ��ޤ���"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: �ޥ���ȥݥ���� %s �Ϥɤ��⤵���Ƥ��ʤ�����ܥ�å���󥯤Ǥ�"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ���ڥ����ǥХ��� %s ��¸�ߤ��ޤ���"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8275,12 +7928,12 @@ msgstr ""
 "mount: ���ڥ����ǥХ��� %s ��¸�ߤ��ޤ���\n"
 "       (�ѥ��Υǥ��쥯�ȥ꤬����ޤ���)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s �Ϥޤ��ޥ���Ȥ���Ƥ��ʤ����������ʥ��ץ����Ǥ�"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8290,72 +7943,71 @@ msgstr ""
 "       %s �Υ����ѡ��֥��å��������������ϥե����륷���ƥ�Υޥ����\n"
 "       ��¿�����ޤ�"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "�ޥ���ȥơ��֥뤬���äѤ��Ǥ�"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: �����ѡ��֥��å����ɤ�ޤ���"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: �����ʥǥХ����Ǥ�"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   ���ΤΥե����륷���ƥॿ���פ�ꥹ��ɽ������"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: �����餯���ʤ��� %s ����ꤷ�����ä��ΤǤ��礦"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ¿ʬ���ʤ��� iso9660 ����ꤷ�����ä��ΤǤϡ�"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ¿ʬ���ʤ��� iso9660 ����ꤷ�����ä��ΤǤϡ�"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s �ϴְ�ä��ǥХ����ֹ�ˤʤäƤ��뤫���ե����륷���ƥॿ����\n"
 "       %s �����ݡ��Ȥ���Ƥ��ޤ���"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ��󡢤����� stat �����ԡ�"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8364,73 +8016,68 @@ msgstr ""
 "mount: ���Υ����ͥ�� %s ��֥��å��ǥХ����Ȥ���ǧ�����ޤ���\n"
 "       (¿ʬ��`insmod �ɥ饤��' ���ʤ��Ȥ����ʤ��ΤǤϡ�)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ��� (¿ʬ `-o loop' �Ȥ�äƤߤ��顩)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ���"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ������ʥ֥��å��ǥХ����ǤϤ���ޤ���"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "�֥��å��ǥХ��� "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ���ɹ������Ѥǥޥ���ȤǤ��ޤ���"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s �Ͻ񤭹��߶ػߤǤ�����`-w' �ե饰������Ū��Ϳ�����ޤ���"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s �Ͻ񤭹��߶ػߤǤ����ɹ������Ѥǥޥ���Ȥ��ޤ�"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: �����פ�Ϳ�����Ƥ��ޤ��� -- �����󤬤���Τ� nfs ���ͤǤ���\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: �����פ�Ϳ�����Ƥ��ޤ��� -- �����󤬤���Τ� smbfs ���ͤǤ���\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: �Хå����饦��� \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ����ޤ��� \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s �� %s �˥ޥ���ȺѤǤ�\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8475,34 +8122,34 @@ msgstr ""
 "����¾�Υ��ץ����: [-nfFrsvw] [-o ���ץ����]\n"
 "��äȾܤ������Ȥ��Τꤿ����С�man 8 mount �Ⱦ����Ƥߤޤ��礦��\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: root �����������Ԥʤ��ޤ�"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s �����Ĥ���ޤ��� -- �������ޤ�..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ���Τ褦�ʥѡ��ƥ������ϸ��Ĥ���ޤ���"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s ��ޥ���Ȥ��ޤ�\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "����ޥ���Ȥ���ޤ���Ǥ���"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %2$s ��� %1$s �򸫤Ĥ����ޤ���"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s �� %3$s ��� %1$s �򸫤Ĥ����ޤ���"
@@ -8537,99 +8184,99 @@ msgstr "       ������ %s ���Ƥߤޤ�\n"
 msgid "Trying %s\n"
 msgstr "%s ���ޤ�\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: ��ü��Ĺ�� �ۥ���:�ǥ��쥯�ȥ� ����\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: �ٹ�: ʣ���Υۥ���̾�ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: �ޥ������ǥ��쥯�ȥ꤬ �ۥ���:�ǥ��쥯�ȥ� �����ˤʤäƤ��ޤ���\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: %s �Υ��ɥ쥹�������Ǥ��ޤ���\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ������ hp->h_length �ͤ�������ޤ���\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: ���ץ���������Ĺ�����ޤ�\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "�ٹ�: proto= ���ץ��������Ǥ��ޤ���\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "�ٹ�: namlen ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "������ nfs �ޥ���ȥѥ�᡼��: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "�ٹ�: nolock ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "������ nfs �ޥ���ȥ��ץ����: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ������ hp->h_length �ͤ������\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "TCP ��ͳ�� NFS �ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs �����å�"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs �����Фϥ����ӥ������ѤǤ��ʤ�����𤷤ޤ���"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS �ݡ��Ȥ򸫤Ĥ��뤿��� portmapper ������\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "nfs �ǡ����Τ���� %d �֥ݡ��Ȥ�����\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs ��³"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "������ nfs ���ơ������ͤ��֤��ޤ���: %d"
@@ -8638,7 +8285,7 @@ msgstr "������ nfs ���ơ������ͤ��֤��ޤ���: %d"
 msgid "bug in xstrndup call"
 msgstr "xstrndup �ƤӽФ��ΥХ�"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8651,7 +8298,7 @@ msgstr ""
 "        %s [-v] [-p ͥ����] ���ڥ����ե����� ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8663,139 +8310,137 @@ msgstr ""
 "        %s [-v] [-p ͥ����] ���ڥ����ե����� ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s �� %1$s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: %s �� \"_stext\" �����Ĥ���ޤ���\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: %s �ξ��ּ������Ǥ��ޤ���: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: �ٹ�: %s �ϰ����Ǥʤ����� %04o ������ޤ��� %04o ��������Ǥ�\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: �ե����� %s �򥹥��å� -- �ۡ���򸡽С�\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "Not superuser.\n"
 msgstr "���åȤ���Ƥ��ޤ���\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s �򳫤��ޤ���: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "mount: -f ���ץ����Υ��ݡ���̵���ǥ���ѥ��뤵��Ƥ��ޤ�\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: fork �Ǥ��ޤ���: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "�ۥ���: %s, �ǥ��쥯�ȥ�: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: %s �Υ��ɥ쥹�������Ǥ��ޤ���\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ������ hostp->h_length �ͤ�������ޤ���\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s �������ʥ֥��å��ǥХ����Ǥ�"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: �ޥ���Ȥ���Ƥ��ޤ���"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: �����ѡ��֥��å��˽񤭹���ޤ���"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: �ǥХ����������Ǥ�"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ���Ĥ���ޤ���"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: ����ޥ���Ȥ���ˤϥ����ѡ��桼���Ǥʤ���Фʤ�ޤ���"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: �֥��å��ǥХ����ϥե����륷���ƥ��ǵ��Ĥ���ޤ���"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 ������ޤ���umount ���Ƥߤޤ�...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s �򥢥�ޥ���ȤǤ��ޤ���Ǥ��� -- ���� %s ��ȤäƤߤޤ�\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s �ϻ�����Ǥ� -- �ɹ������ѤȤ��ƺƥޥ���Ȥ��ޤ�\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s ���ɹ������ѤǺƥޥ���ȤǤ��ޤ���Ǥ���\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s �ϥ���ޥ���Ȥ���ޤ���\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ����ޥ���ȤΤ���Υե����륷���ƥ�ꥹ�Ȥ򸫤Ĥ����ޤ���"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8806,49 +8451,48 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t �ե����륷���ƥॿ����]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s �򥢥�ޥ���Ȥ��ޤ�\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab �� %s �����Ĥ���ޤ���\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �ޥ���Ȥ���Ƥ��ޤ��� (mtab �ˤ���)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s ��ʣ���ޥ���Ȥ���Ƥ���褦�Ǥ�"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s �� fstab �ˤ���ޤ��� (����ˡ����ʤ��� root �ǤϤ���ޤ���)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s �� fstab �Ȱ��פ��ʤ��ޥ���ȤǤ�"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s ������ %s �� %s ���饢��ޥ���ȤǤ��ޤ�"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: root �����������Ԥʤ��ޤ�"
 
@@ -9004,7 +8648,7 @@ msgstr "%s: �����ʥ����ʥ� %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9174,8 +8818,6 @@ msgstr "�����ͥ�Ǥζ�ͭ����ΰ٤����꤬����Ƥ��ޤ���\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ���������ɥ�������� --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -9954,17 +9596,17 @@ msgid ""
 msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "�Ȥ���: %s [-dflpcsu] [+���ֹ� | +/�ѥ�����] ̾��1 ̾��2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: �����ʥ����ʥ� %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9975,8 +9617,7 @@ msgstr ""
 "*** %s: �ǥ��쥯�ȥ� ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9987,46 +9628,46 @@ msgstr ""
 "******** %s: �ƥ����ȥե�����ǤϤ���ޤ��� ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[��λ����ˤ� q �� Q �򲡤��Ʋ�����]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--³����--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(���Υե�����: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[���ڡ��������򲡤���³����'q' �ǽ�λ��]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "... %d �ڡ������ޤ�"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "... 1 �ڡ������ޤ�"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...%d �����Ф��ޤ�"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...%d �����Ф��ޤ�"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10036,7 +9677,7 @@ msgstr ""
 "***���***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10048,7 +9689,7 @@ msgstr ""
 "����\n"
 "����(*)�ϥǥե���Ȥ��ѹ�����뤳�Ȥ򼨤��ޤ���\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 #, fuzzy
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
@@ -10091,34 +9732,34 @@ msgstr ""
 ":f\t\t\t���ߤΥե�����̾�ȹ��ֹ��ɽ������\n"
 ".\t\t\tľ���Υ��ޥ�ɤ򷫤��֤�\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "['h' �����������ˡ]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" %d ��"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[��ե�����] %d ��"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  �礭����\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...���Ф��Ƥ��ޤ�\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "����ɽ�����ޥ���"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10126,15 +9767,15 @@ msgstr ""
 "\n"
 "�ѥ����󤬸��Ĥ���ޤ���\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "�ѥ����󤬸��Ĥ���ޤ���"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "�ҥץ�������ư�Ǥ��ޤ���\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10142,19 +9783,19 @@ msgstr ""
 "\n"
 "...���Ф��Ƥ��ޤ� "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...�ե���������Ф��ޤ� "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...�ե���������ޤ� "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "���ΤΤ���ΰ����Υ��ޥ�ɤ�����ޤ���"
 
@@ -10208,98 +9849,95 @@ msgstr "hexdump: �����ʽ� {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: �������Ѵ�����饯�� %%%s��\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "���ץ���� `%s' �ϰ������׵ᤷ�ޤ�\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "�����ʥ���"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...���Ф��Ƥ��ޤ�\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...���Ф��Ƥ��ޤ�\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(���Υե�����: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "�ΰ褬�������Ƥ��ޤ���\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s �� read ���顼\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s �� seek ���顼\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ����ե�������ɤ�ޤ���\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", ���顼"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s �򳫤��ޤ���\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "����"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "�ѥ���ɤ��ѹ� *����ޤ���Ǥ���*����Ǥ⤦���ٻ�Ƥ���������\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(���Υե�����: %s)"
@@ -10354,6 +9992,156 @@ msgstr "���ϹԤ�Ĺ�����ޤ���\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "�Хåե�����礹��Ȥ��˥��꤬­��ʤ��ʤ�ޤ�����\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "�����ʿ�: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "ʸˡ���顼: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "���Τ褦������ѥ�᥿�Ϥ���ޤ���: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] �ǥХ��� ̾��\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] �ǥХ���\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] �ǥХ���\n"
+
+#~ msgid "version"
+#~ msgstr "�������"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom �򳫤��ޤ���"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "/dev/urandom ���������ǡ������ɹ���ޤ���"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s ���ɹ����Ѥ˳����ޤ���"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "(%s) �ե�������������Ǥ��ޤ���"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s ���������ե�����⡼�ɤǤϤ���ޤ���"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "%s ����ǡ������ɹ���ޤ���"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "���˥������󤷤Ƥ���桼��������¿�����ޤ���\n"
+#~ "�ޤ���ǻ�Ƥ���������\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "���ʤ����¹Ԥ��Ƥ���ץ�������¿�����ޤ���\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "�ѥ���ɤϺ��� 6 ʸ��ɬ�פǤ����⤦���٤��ľ���Ƥ���������\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "�ѥ���ɤϰʲ����Ȥߤ��� 2 �İʾ�ǹ�������ͤФʤ�ޤ���:\n"
+#~ "����ʸ���ȱѾ�ʸ�����������󥢥�ե��٥å�ʸ��\n"
+#~ "�ܤ�������� passwd(1) �򸫤ޤ��礦��\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "�Ť��ѥ���ɤκ����ѤϤǤ��ޤ���\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "�桼��̾��Ʊ���褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "���ʤ��μ�̾�Τ褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "�Ȥ���: passwd [�桼��̾ [�ѥ����]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "root ��������Ĥޤ�����Ĥΰ��������Ǽ¹ԤǤ��ޤ�\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "�Ȥ���: passwd [-foqsvV] [�桼�� [�ѥ����]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s ��¹ԤǤ��ޤ���: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "��������̾�����Ĥ����ޤ���"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "root ������¾�ͤΥѥ���ɤ��ѹ��Ǥ��ޤ�\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "������¿�����ޤ���\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "�桼��̾���ɤ��ˤ⸫�Ĥ���ޤ���`%s' �������˥桼���Ǥ�����"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "��ǰ�ʤ��顢��������Υѥ���ɤ��ѹ������Ǥ��ޤ���\n"
+#~ "������ yppasswd ��ȤäƤ���������"
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "�桼��ID �ֹ�ȥ桼��̾�����פ��ޤ��󡣺��Τ���"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "%s �Υѥ���ɤ��ѹ����ޤ�\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "��ѥ���ɤ����Ϥ��Ƥ�������: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "�����ʥѥ���ɡ����ΤǤ���"
+
+#~ msgid "Enter new password: "
+#~ msgstr "���ѥ���ɤ����Ϥ��Ƥ���������"
+
+#~ msgid "Password not changed."
+#~ msgstr "�ѥ���ɤ��ѹ�����ޤ���Ǥ�����"
+
+#~ msgid "Re-type new password: "
+#~ msgstr "���ѥ���ɤ�⤦�������Ϥ��Ƥ�������: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "�֤꤬�㤤�ޤ�����Ǥ⤦���ٻ�Ƥ���������"
+
+#~ msgid "password changed, user %s"
+#~ msgstr "�ѥ���ɤ��ѹ�����ޤ������桼�� %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "* root �Υѥ���ɤ��ѹ�����ޤ��� *"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "�ѥ���ɤϥ롼�Ȥˤ�ä��ѹ�����ޤ������桼�� %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "�ѥ���ɤ����ꤹ�뤿�� setpwnam ��ƤӽФ��档\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "�ѥ���ɤ��ѹ� *����ޤ���Ǥ���*����Ǥ⤦���ٻ�Ƥ���������\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "�ѥ���ɤ��ѹ�����ޤ�����\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: ���ΥС������� 'nfs' �����פΥ��ݡ��Ȥʤ��ǥ���ѥ��뤵��Ƥ��ޤ�"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "�ٹ�: %d �ʹߤ��ΰ�������ޤ�\n"
diff --git a/po/nl.gmo b/po/nl.gmo
new file mode 100644
index 000000000..3ab62f305
--- /dev/null
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index cf305e156..5616404f3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-21 18:46-0500\n"
-"PO-Revision-Date: 2005-01-20 18:29+0100\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-25 10:35+0100\n"
 "Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -126,7 +126,7 @@ msgstr "%s: ioctl fout bij %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Grootte Apparaat\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "gebruik:\n"
@@ -170,13 +170,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "gebruik: %s [ -n ] apparaat\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s van %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -201,7 +200,7 @@ msgstr "Dubbel"
 msgid "Single"
 msgstr "Enkel"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -216,97 +215,99 @@ msgstr ""
 " -v         meer informatie weergeven\n"
 " file       bestand om te testen\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fout %d bij uitpakken! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: grootte fout in symbolische koppeling `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  uitpakken blok bij %ld tot %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: foutieve modus op `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  gat bij %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Niet-blok (%ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Niet-grootte (%ld vs. %ld) bytes\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: onjuist cramfs--slechte padlengte\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: gecompileerd zonder -x ondersteuning\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: waarschuwing--kon bestandssysteem grootte niet bepalen \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s is geen blok-apparaat of bestand\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: onjuist cramfs--bestandslengte te kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: onjuist cramfs--foutieve soort-aanduiding\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: waarschuwing--bestandslengte te lang, opgevulde afbeelding?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: onjuist cramfs--crc fout\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: waarschuwing--oude cramfs afbeelding, geen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: onjuist cramfs--slecht superblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr "%s: onjuist cramfs--map-gegevens einde (%ld) != bestandsgegevens start (%ld)\n"
+msgstr ""
+"%s: onjuist cramfs--map-gegevens einde (%ld) != bestandsgegevens start (%"
+"ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: onjuist cramfs--onjuiste bestandsgegevens plaats\n"
@@ -782,7 +783,7 @@ msgstr "te veel inodes - maximum: 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "niet genoeg ruimte, tenminste %lu blokken nodig"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -851,18 +852,20 @@ msgstr "fout bij schrijven .. ingang"
 msgid "error closing %s"
 msgstr "fout bij sluiten %s"
 
-#: disk-utils/mkfs.c:76
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr "Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] apparaat [grootte]\n"
+msgstr ""
+"Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] "
+"apparaat [grootte]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:347 getopt/getopt.c:89
-#: getopt/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Geheugentekort!\n"
 
-#: disk-utils/mkfs.c:99
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versie %s (%s)\n"
@@ -870,7 +873,8 @@ msgstr "mkfs versie %s (%s)\n"
 #: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -884,13 +888,15 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"gebruik: %s [-h] [-v] [-b blokgrootte] [-e editie] [-i bestand] [-n naam] mapnaam uitvoerbestand\n"
+"gebruik: %s [-h] [-v] [-b blokgrootte] [-e editie] [-i bestand] [-n naam] "
+"mapnaam uitvoerbestand\n"
 " -h         deze hulp weergeven\n"
 " -v         meer informatie weergeven\n"
 " -E         van alle waarschuwingen fouten maken (niet-nul afsluitstatus)\n"
 " -b         gebruik deze blokgrootte; moet gelijk zijn aan paginagrootte\n"
 " -e editie  editienummer instellen (deel van bestandssysteem id)\n"
-" -i bestand een bestandsafbeelding invoegen in het bestandssysteem (>= 2.4.0 nodig)\n"
+" -i bestand een bestandsafbeelding invoegen in het bestandssysteem (>= 2.4.0 "
+"nodig)\n"
 " -n naam    naam van cramfs bestandssysteem instellen\n"
 " -p         opvullen met %d bytes voor opstartcode\n"
 " -s         mapingangen sorteren (oude optie, wordt genegeerd)\n"
@@ -905,7 +911,8 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "Erg lange (%u bytes) bestandsnaam `%s' gevonden.\n"
-" Verhoog alstublieft MAX_INPUT_NAMELEN in mkcramfs.c en hercompileer.  Afsluiten.\n"
+" Verhoog alstublieft MAX_INPUT_NAMELEN in mkcramfs.c en hercompileer.  "
+"Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
@@ -914,8 +921,12 @@ msgstr "bestandssysteem te groot.  Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
-msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
-msgstr "MAXENTRIES overschreden.  Verhoog deze waarde in mkcramfs.c en hercompileer.  Afsluiten.\n"
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"MAXENTRIES overschreden.  Verhoog deze waarde in mkcramfs.c en "
+"hercompileer.  Afsluiten.\n"
 
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
@@ -929,8 +940,12 @@ msgstr "%6.2f%% (%+d bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
-msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
-msgstr "waarschuwing: de geschatte benodigde grootte (bovengrens) is %LdMB, maar maximale afbeeldingsgrootte is %uMB.  Dit gaat misschien niet lukken.\n"
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"waarschuwing: de geschatte benodigde grootte (bovengrens) is %LdMB, maar "
+"maximale afbeeldingsgrootte is %uMB.  Dit gaat misschien niet lukken.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
@@ -960,17 +975,15 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "niet genoeg ruimte gereserveerd voor ROM afbeelding (%Ld gereserveerd, %d gebruikt)\n"
+msgstr ""
+"niet genoeg ruimte gereserveerd voor ROM afbeelding (%Ld gereserveerd, %d "
+"gebruikt)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Schrijven ROM afbeelding mislukt (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -988,13 +1001,19 @@ msgstr "waarschuwing: bestandsgroottes afgekapt tot %luMB (min 1 byte).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "waarschuwing: uids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem zijn.)\n"
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"waarschuwing: uids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
+"zijn.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "waarschuwing: gids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem zijn.)\n"
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"waarschuwing: gids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
+"zijn.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1043,7 +1062,6 @@ msgstr "schrijven inodes mislukt"
 msgid "write failed in write_block"
 msgstr "schrijven mislukt in write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1079,7 +1097,7 @@ msgstr "zoeken mislukt tijdens testen van blokken"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Vreemde waarden in do_check: waarschijnlijk programmeerfouten\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "zoeken mislukt in check_blocks"
 
@@ -1121,80 +1139,108 @@ msgstr "vinden %s mislukt"
 msgid "will not try to make filesystem on '%s'"
 msgstr "zal niet proberen een bestandssysteem te maken op '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Slechte door gebruiker aangegeven pagina grootte %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr "Door gebruiker aangegeven pagina grootte %d wordt gebruikt, in plaats van systeemwaarden %d/%d\n"
+msgstr ""
+"Door gebruiker aangegeven pagina grootte %d wordt gebruikt, in plaats van "
+"systeemwaarden %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Pagina groottes van %d worden aangenomen (niet %d)\n"
 
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "Slechte swap-headergrootte, er is geen label weggeschreven.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "Label is ingekort.\n"
+
+#: disk-utils/mkswap.c:249
+#, c-format
+msgid "no label, "
+msgstr "geen label,"
+
+#: disk-utils/mkswap.c:257
 #, c-format
-msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Gebruik: %s [-c] [-v0|-v1] [-pPAGINAGROOTTE] /dev/naam [blokken]\n"
+msgid "no uuid\n"
+msgstr "geen uuid\n"
 
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr ""
+"Gebruik: %s [-c] [-v0|-v1] [-pPAGINAGROOTTE] [-L label] /dev/naam [blokken]\n"
+
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "teveel slechte pagina's"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1975 text-utils/more.c:1986
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Geheugentekort"
 
-#: disk-utils/mkswap.c:380
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "één slechte pagina\n"
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu slechte pagina's\n"
 
-#: disk-utils/mkswap.c:502
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fout: Nergens om wisselgeheugen op in te stellen?\n"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fout: grootte %lu is groter dan apparaatgrootte %lu\n"
 
-#: disk-utils/mkswap.c:539
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fout: onbekende versie %d\n"
 
-#: disk-utils/mkswap.c:546
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fout: wisselgeheugen moet tenminste %ldkB zijn\n"
 
-#: disk-utils/mkswap.c:563
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: waarschuwing: afkappen wisselgeheugen tot %ldkB\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: fout: label enkel met v1 swapruimte\n"
+
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Zal niet proberen wisselgeheugen in te stellen op '%s'"
 
-#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fataal: eerste pagina onleesbaar"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1208,115 +1254,82 @@ msgstr ""
 "wisselgeheugen op dat apparaat wilt maken, kunt u de -f optie gebruiken\n"
 "om het te forceren.\n"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Instellen wisselgeheugen mislukt: onleesbaar"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Instellen wisselgeheugen versie %d, grootte = %llu kB\n"
 
-#: disk-utils/mkswap.c:623
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "terugwinden wisselapparaat mislukt"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "schrijven ondertekeningspagina mislukt"
 
-#: disk-utils/mkswap.c:634
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync mislukt"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Onjuist getal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxis fout: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Zo'n parameter bestaat niet: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] apparaat naam\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] apparaat grootte sect koppen sporen strekken gat ratio spec1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] apparaat\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] apparaat\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2053
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Onbruikbaar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2055
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Vrije ruimte"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "De schijf is veranderd.\n"
 
-#: fdisk/cfdisk.c:408
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "Start het systeem opnieuw op om er zeker van te zijn dat de partitietabel juist wordt bijgewerkt.\n"
+msgstr ""
+"Start het systeem opnieuw op om er zeker van te zijn dat de partitietabel "
+"juist wordt bijgewerkt.\n"
 
 #: fdisk/cfdisk.c:411
 #, c-format
@@ -1382,724 +1395,733 @@ msgstr "logische partities niet in schijfvolgorde"
 msgid "logical partitions overlap"
 msgstr "logische partities overlappen"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "vergrootte logische partities overlappen"
 
-#: fdisk/cfdisk.c:991
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!!! Interne fout bij maken logische schijf zonder uitgebreide partitie !!!!"
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr ""
+"!!!! Interne fout bij maken logische schijf zonder uitgebreide partitie !!!!"
 
-#: fdisk/cfdisk.c:1002 fdisk/cfdisk.c:1014
-msgid "Cannot create logical drive here -- would create two extended partitions"
-msgstr "Kan hier geen logische schijf maken -- zou twee uitgebreide partities maken"
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"Kan hier geen logische schijf maken -- zou twee uitgebreide partities maken"
 
-#: fdisk/cfdisk.c:1162
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu item te lang. Menu ziet er misschien raar uit."
 
-#: fdisk/cfdisk.c:1218
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu zonder richting. Gebruik standaard: horizontaal."
 
-#: fdisk/cfdisk.c:1349
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Onjuiste toets"
 
-#: fdisk/cfdisk.c:1372
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Druk op een toets om door te gaan"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2556
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primair"
 
-#: fdisk/cfdisk.c:1419
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Een nieuwe primaire partitie maken"
 
-#: fdisk/cfdisk.c:1420 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2555
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisch"
 
-#: fdisk/cfdisk.c:1420
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Een nieuwe logische partitie maken"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476 fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Geen partitie maken"
 
-#: fdisk/cfdisk.c:1437
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interne fout !!!"
 
-#: fdisk/cfdisk.c:1440
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Grootte (in MB): "
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Partitie toevoegen aan begin vrije ruimte"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Partitie toevoegen aan einde vrije ruimte"
 
-#: fdisk/cfdisk.c:1493
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Geen ruimte om de uitgebreide partitie te maken"
 
-#: fdisk/cfdisk.c:1555
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Geen partitietabel.\n"
 
-#: fdisk/cfdisk.c:1559
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Geen partitietabel. Gestart met een lege tabel."
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Slechte handtekening op partitietabel"
 
-#: fdisk/cfdisk.c:1573
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Onbekend partitietabeltype"
 
-#: fdisk/cfdisk.c:1575
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Wilt u met een lege tabel beginnen [j/N] ?"
 
-#: fdisk/cfdisk.c:1623
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "U heeft meer cylinders aangegeven dan er op de schijf passen"
 
-#: fdisk/cfdisk.c:1655
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1657 fdisk/cfdisk.c:1837
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
-msgstr "Schijf alleen-lezen geopend -- u heeft geen toegangsrechten om te schrijven"
+msgstr ""
+"Schijf alleen-lezen geopend -- u heeft geen toegangsrechten om te schrijven"
 
-#: fdisk/cfdisk.c:1678
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan schijfgrootte niet opvragen"
 
-#: fdisk/cfdisk.c:1704
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/cfdisk.c:1734
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:1849
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf wissen!"
 
-#: fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "Weet u zeker dat u de partitietabel naar de schijf wilt schrijven? (ja of nee): "
+msgstr ""
+"Weet u zeker dat u de partitietabel naar de schijf wilt schrijven? (ja of "
+"nee): "
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nee"
 
-#: fdisk/cfdisk.c:1860
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Partitietabel niet naar schijf geschreven"
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Antwoord alstublieft `ja' of `nee'"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Schrijven partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1894 fdisk/cfdisk.c:1898
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "De partitietabel is weggeschreven naar de schijf"
 
-#: fdisk/cfdisk.c:1896
-msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr "Partitietabel geschreven, maar opnieuw inlezen mislukt.  Start opnieuw op om de tabel bij te werken."
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"Partitietabel geschreven, maar opnieuw inlezen mislukt.  Start opnieuw op om "
+"de tabel bij te werken."
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "Geen primaire partities aangegeven als opstartbaar. DOS MBR kan dit niet opstarten."
+msgstr ""
+"Geen primaire partities aangegeven als opstartbaar. DOS MBR kan dit niet "
+"opstarten."
 
-#: fdisk/cfdisk.c:1908
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan dit niet opstarten."
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan "
+"dit niet opstarten."
 
-#: fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2085 fdisk/cfdisk.c:2169
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Geef een bestandsnaam of druk op ENTER om op het scherm weer te geven: "
+msgstr ""
+"Geef een bestandsnaam of druk op ENTER om op het scherm weer te geven: "
 
-#: fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Geen   "
 
-#: fdisk/cfdisk.c:2017
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Primair"
 
-#: fdisk/cfdisk.c:2021
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisch"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2059 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:650
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: fdisk/cfdisk.c:2065 fdisk/cfdisk.c:2533 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2069
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Geen"
 
-#: fdisk/cfdisk.c:2104 fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               Eerste      Laatste\n"
 
-#: fdisk/cfdisk.c:2107
-msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
-msgstr " # Soort      Sector      Sector   Plaats    Lengte   Bestandssysteem (ID) Optie\n"
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Soort      Sector      Sector   Plaats    Lengte   Bestandssysteem (ID) "
+"Optie\n"
 
-#: fdisk/cfdisk.c:2108
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2191
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Begin---         ----Einde----     Start     Aantal\n"
 
-#: fdisk/cfdisk.c:2192
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # OptiesKop  Sect Cyl   ID  Kop  Sect Cyl     Sector    Sectoren\n"
 
-#: fdisk/cfdisk.c:2193
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Deze tabel weergeven met ruwe gegevens formaat"
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Deze tabel weergeven, geordend op sectoren"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Gewoon de partitietabel weergeven"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Tabel niet weergeven"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitioneringsprogramma gebaseerd op"
 
-#: fdisk/cfdisk.c:2260
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "cursus, waarmee u partities kunt maken, verwijderen of wijzigen"
 
-#: fdisk/cfdisk.c:2261
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "op uw harde schijf."
 
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2265
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Opdracht     Betekenis"
 
-#: fdisk/cfdisk.c:2266
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     -------"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          `Opstartbaar'-optie voor huidige partitie aan/uitzetten"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Cylinders, koppen, sectoren-per-spoor wijzigen"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WAARSCHUWING: Deze optie dient alleen te worden gebruikt"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             door mensen die weten wat ze doen."
 
-#: fdisk/cfdisk.c:2272
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Schijf gebruik maximaliseren voor huidige partitie"
 
-#: fdisk/cfdisk.c:2274
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Let op: Dit kan een partitie incompatibel maken met"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Partitietabel weergeven op scherm of naar bestand"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Er zijn verschillende formaten voor de partitie"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             waaruit u kunt kiezen:"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - Ruwe gegevens (exact wat naar de schijf zou worden geschreven)"
+msgstr ""
+"                r - Ruwe gegevens (exact wat naar de schijf zou worden "
+"geschreven)"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel geordend op sectoren"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel in ruw formaat"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Soort bestandssysteem wijzigen"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Eenheden partitiegrootte weergave wijzigen"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Roteert door MB, sectoren en cylinders"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
+msgstr ""
+"  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Omdat dit mogelijk gegevens op de schijf wist, moet"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             u bevestigen of weigeren door te antwoorden met `ja' of"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `nee'"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pijl omhoog  Aanwijzer naar vorige partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pijl omlaag  Aanwijzer naar volgende partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Het scherm opnieuw tekenen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Let op: Alle opdrachten kunnen zowel met hoofd- als kleine letter"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "worden ingevoerd (behalve W)."
 
-#: fdisk/cfdisk.c:2328 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylinders"
 
-#: fdisk/cfdisk.c:2328
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Cylinder geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2329 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Koppen"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Koppen geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Sector geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Klaar"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Klaar met wijzigen geometrie"
 
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Geef het aantal cylinders: "
 
-#: fdisk/cfdisk.c:2355 fdisk/cfdisk.c:2926
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Onjuiste waarde cylinders"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Geef het aantal koppen: "
 
-#: fdisk/cfdisk.c:2368 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Onjuiste waarde koppen"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Geef het aantal sectoren per spoor: "
 
-#: fdisk/cfdisk.c:2381 fdisk/cfdisk.c:2943
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Onjuiste waarde sectoren"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Geef het soort bestandssysteem: "
 
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan bestandsysteem soort niet veranderen tot leeg"
 
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan bestandssysteem soort niet veranderen tot uitgebreid"
 
-#: fdisk/cfdisk.c:2535
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Onbekend(%02X)"
 
-#: fdisk/cfdisk.c:2538 fdisk/cfdisk.c:2541
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Onbekend (%02X)"
 
-#: fdisk/cfdisk.c:2633
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2640
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Grootte: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Grootte: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Koppen: %d   Sectoren per spoor: %d   Cylinders: %lld"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Opties"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part soort"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Bestandssysteem"
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sectoren"
 
-#: fdisk/cfdisk.c:2659
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylinders"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Grootte (MB)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Grootte (GB)"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Huidige partitie wel/niet op opstartbaar zetten"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "De huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Schijf geometrie wijzigen (alleen experts)"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hulp"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Hulpscherm weergeven"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Schijfgebruik maximaliseren voor huidige partitie (alleen experts)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nieuw"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Weergeven"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitietabel weergeven op scherm of naar een bestand"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Soort"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Bestandssysteem soort wijzigen (DOS, Linux, OS/2 enz.)"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Eenheden"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "De gebruikte eenheden in weergave wijzigen (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Schrijven"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Partitietabel naar schijf schrijven (kan gegevens wissen)"
 
-#: fdisk/cfdisk.c:2773
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan deze partitie niet opstartbaar maken"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan geen lege partitie verwijderen"
 
-#: fdisk/cfdisk.c:2803 fdisk/cfdisk.c:2805
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan deze partitie niet maximaliseren"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Deze partitie is onbruikbaar"
 
-#: fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Deze partitie is al in gebruik"
 
-#: fdisk/cfdisk.c:2832
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan niet de soort van een lege partitie wijzigen"
 
-#: fdisk/cfdisk.c:2859 fdisk/cfdisk.c:2865
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Niet meer partities"
 
-#: fdisk/cfdisk.c:2872
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Onjuiste opdracht"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2889
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2129,12 +2151,372 @@ msgstr ""
 "\n"
 "Opties:\n"
 "-a: Pijl gebruiken in plaats van oplichting;\n"
-"-z: Start met een nul-partitietabel, in plaats van deze van schijf te lezen;\n"
+"-z: Start met een nul-partitietabel, in plaats van deze van schijf te "
+"lezen;\n"
 "-c C -h H -s S: Forceer andere waarden voor aantal cylinders, koppen en\n"
 "                sectoren/spoor dan de kernel geeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tEr is een geldig AIX label op deze schijf. Helaas\n"
+"\tondersteunt Linux deze schijven op dit moment niet.\n"
+"\tToch wat advies:\n"
+"\t1. fdisk zal de inhoud wissen bij schrijven.\n"
+"\t2. Controleer of deze schijf ECHT NIET nog deel\n"
+"\t   uit maakt van een volume groep. (Anders wist\n"
+"\t   u mogelijk de andere schijven ook, als er\n"
+"\t   geen mirror is.)\n"
+"\t3. Haal, voordat u dit fysieke volume wist, de\n"
+"\t   schijf logisch uit uw AIX machine.\n"
+"\t   (Anders wordt u een AIXpert)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"BSD label voor apparaat: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "Opdracht actie"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   een BSD partitie verwijderen"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   schijfgegevens bewerken"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   bootstrap installeren"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   bekende bestandssysteem soorten opsommen"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   dit menu weergeven"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   een nieuwe BSD partitie toevoegen"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   BSD partitietabel weergeven"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   afsluiten zonder wijzigingen op te slaan"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   terug naar hoofdmenu"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   complete schijflabel weergeven"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   bestandssysteem id van partitie wijzigen"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   eenheden (cylinders/sectoren) wijzigen"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   schijflabel naar schijf schrijven"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   BSD partitie koppelen aan niet-BSD partitie"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Partitie %s heeft ongeldige startsector 0.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Lezen schijflabel van %s bij sector %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Er is geen *BSD partitie op %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "BSD schijflabel opdracht (m voor hulp): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "Eerste %s"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "Laatste %s of +size of +sizeM of +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "soort: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "soort: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "schijf: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "label: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "opties:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " verwijderbaar"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " slechte sector"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "bytes/sector: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "sectoren/spoor: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "sporen/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "sectoren/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "cylinders: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "rpm: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "tussenruimte: %d\n"
+
+# let op: komt vaker voor
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "trackskew: %d\n"
+
+# let op: komt vaker voor
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "cylinderskew: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "schakelen kop: %ld\t\t# milliseconden\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "spoor-tot-spoor zoeken: %ld\t# milliseconden\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "schijfgegevens: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d partities:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr ""
+"#       start       eind     grootte  bestandssysteem [grootte bsize cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Schrijven schijflabel naar %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s bevat geen schijflabel.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Wilt u een schijflabel maken? (j/n) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "bytes/sector"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "sectoren/spoor"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "sporen/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "cylinders"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "sectoren/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Moet zijn: <= sectoren/spoor * sporen/cylinder (standaard).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "rpm"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "tussenruimte"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "trackskew"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "cylinderskew"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "schakelen kop"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "spoor-tot-spoor zoeken"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Bootstrap overlapt met schijflabel!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Bootstrap geïnstalleerd op %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Partitie (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "Het maximum aantal partities is gemaakt\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "Deze partitie bestaat al.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Waarschuwing: teveel partities (%d, maximum is %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"Synchroniseren schijven.\n"
+
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2146,7 +2528,8 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 "Gebruik: fdisk [-b SECTORGROOTTE] [-u] APPARAAT    Partitietabel wijzigen\n"
-"         fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT Partitietabel(len) opsommen\n"
+"         fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT Partitietabel(len) "
+"opsommen\n"
 "         fdisk -s PARTITIE            Partitiegrootte(s) in blokken geven\n"
 "         fdisk -v                     Versie fdisk weergeven\n"
 "Hier is DISK zoiets als /dev/hdb of /dev/sda en\n"
@@ -2154,7 +2537,7 @@ msgstr ""
 "-u: geef Start en Einde in sector (in plaats van cylinder) eenheden\n"
 "-b 2048: (voor sommige MO schijven) gebruik 2048-byte sectoren\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2170,227 +2553,184 @@ msgstr ""
 "   of: fdisk /dev/rd/c0d0  of: fdisk /dev/ida/c0d0  (voor RAID apparaten)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan %s niet lezen\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan niet zoeken op %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan niet schrijven naar %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislukt op %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan niet meer geheugen reserveren\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Fatale fout\n"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:367 fdisk/fdisk.c:374
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
-msgid "Command action"
-msgstr "Opdracht actie"
-
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   wel/niet alleen-lezen instellen"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd schijflabel bewerken"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   wel/niet aankoppelbaar instellen"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   een partitie verwijderen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   bekende partitiesoorten opsommen"
 
-#. sun
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:368 fdisk/fdisk.c:380
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
-#: fdisk/fdiskbsdlabel.c:134
-msgid "   m   print this menu"
-msgstr "   m   dit menu weergeven"
-
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   een nieuwe partitie toevoegen"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   een nieuwe, lege DOS partitietabel maken"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   de partitietabel weergeven"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:370 fdisk/fdisk.c:384
-#: fdisk/fdisk.c:407 fdisk/fdisk.c:424 fdisk/fdisk.c:440 fdisk/fdisk.c:457
-#: fdisk/fdiskbsdlabel.c:137
-msgid "   q   quit without saving changes"
-msgstr "   q   afsluiten zonder wijzigingen op te slaan"
-
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   een nieuwe, lege Sun schijflabel maken"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   systeem id van partitie wijzigen"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   weergave/invoer eenheden wijzigen"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   de partitietabel controleren"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabel naar schijf schrijven en afsluiten"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra functionaliteit (alleen experts)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   opstarbare partitie selecteren"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   opstartbestand ingang bewerken"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi wisselpartitie selecteren"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   wel/niet opstartbaar instellen"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   wel/niet dos compatibel instellen"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   aantal alternatieve cylinders wijzigen"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   aantal cylinders wijzigen"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ruwe gegevens in partitietabel weergeven"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   aantal extra sectoren per cylinder wijzigen"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   aantal koppen wijzigen"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   tussenruimte factor wijzigen"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   rotatiesnelheid wijzigen (rpm)"
 
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
-#: fdisk/fdiskbsdlabel.c:138
-msgid "   r   return to main menu"
-msgstr "   r   terug naar hoofdmenu"
-
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   aantal sectoren/spoor wijzigen"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   aantal fysieke cylinders wijzigen"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   begin gegevens verplaatsen in een partitie"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   uitgebreide partities opsommen"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   een IRIX (SGI) partitietabel maken"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   partitie volgorde repareren"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "U moet instellen:"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:936
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sectoren"
 
-#: fdisk/fdisk.c:591 fdisk/fdisk.c:1260 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:936
-msgid "cylinders"
-msgstr "cylinders"
-
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2399,11 +2739,11 @@ msgstr ""
 "%s%s.\n"
 "U kunt dit doen vanuit het menu met extra functies.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " en "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2422,12 +2762,12 @@ msgstr ""
 "2) opstart- en partitioneringssoftware van andere besturings-\n"
 "   systemen, zoals DOS FDISK en OS/2 FDISK\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Slechte plaats in primaire uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2436,17 +2776,17 @@ msgstr ""
 "Waarschuwing: partities na #%d worden weggelaten.\n"
 "Ze zullen worden verwijderd als u deze partitietabel bewaard.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Waarschuwing: extra koppelingsverwijzer in partitietabel %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Waarschuwing: extra gegevens in partitietabel %d worden genegeerd\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2459,17 +2799,17 @@ msgstr ""
 "dat moment is de vorige inhoud uiteraard niet meer herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Let op: sectorgrootte is %d (niet %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "U zult geen partitietabel kunnen wegschrijven.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2478,27 +2818,33 @@ msgstr ""
 "Deze schijf heeft zowel DOS als BSD identificatienummers.\n"
 "Geef de opdracht 'b' om naar BSD modus te gaan.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
-msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
 msgstr "Apparaat bevat geen geldige DOS, Sun, SGI of OSF schijflabel\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interne fout\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Extra uitgebreide partitie %d wordt genegeerd\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
-msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
-msgstr "Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal worden gecorrigeerd bij schrijven\n"
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal worden "
+"gecorrigeerd bij schrijven\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2507,83 +2853,83 @@ msgstr ""
 "\n"
 "driemaal EOF ontvangen - afsluiten..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (typ L om codes op te sommen): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standaard %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Standaardwaarde %u wordt gebruikt\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Waarde buiten bereik.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitienummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Waarschuwing: partitie %d heeft lege soortaanduiding\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Geselecteerde partitie %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Er zijn nog geen partities gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primaire partities zijn al gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Weergave/invoer eenheden worden veranderd naar %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WAARSCHUWING: Partitie %d is een uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS compatibaliteit is aan gezet\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS compatibaliteit is uit gezet\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitie %d bestaat nog niet!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2596,7 +2942,7 @@ msgstr ""
 "om partities te hebben van soort 0. U kunt een par-\n"
 "titie verwijderen met de `-d' opdracht.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2605,7 +2951,7 @@ msgstr ""
 "U kunt een partitie niet veranderen in een uitgebreide of andersom.\n"
 "Verwijder de partitie eerst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2616,7 +2962,7 @@ msgstr ""
 "SunOS/Solaris het verwacht en zelfs Linux het liefst heeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2627,52 +2973,53 @@ msgstr ""
 "partitie 11 als geheel volume (6) zoals IRIX het verwacht.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Systeemsoort van partitie %d veranderd naar %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr "Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
+msgstr ""
+"Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitie %d heeft verschillende fysieke/logische eindpunten:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitie %i begint niet op de cylinder grens:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moet zijn (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitie %i eindigt niet op een cylinder grens.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moet zijn (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2681,7 +3028,7 @@ msgstr ""
 "\n"
 "Schijf %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2690,17 +3037,17 @@ msgstr ""
 "\n"
 "Schijf %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d koppen, %d sectoren/spoor, %d cylinders"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totaal %llu sectoren"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2709,7 +3056,7 @@ msgstr ""
 "Eenheden = %s van %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -2718,7 +3065,7 @@ msgstr ""
 "Niets te doen. De ordening is al goed.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2729,16 +3076,16 @@ msgstr ""
 "Waarschijnlijk selecteerde u het verkeerde apparaat.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot      Start         Einde    Blokken  Id  Systeem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Apparaat"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -2747,7 +3094,7 @@ msgstr ""
 "\n"
 "Partitietabel ingangen zijn niet in schijfvolgorde\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2758,93 +3105,84 @@ msgstr ""
 "Schijf %s: %d koppen, %d sectoren, %d cylinders\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Grootte ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Waarschuwing: partitie %d bevat sector 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitie %d: kop %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitie %d: sector %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partities %d: cylinder %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitie %d: vorige sectoren %d stemt niet overeen met totaal %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Waarschuwing: slechte start-van-gegevens in partitie %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Waarschuwing: partitie %d overlapt partitie %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logische partitie %d niet geheel in partitie %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totaal gereserveerde sectoren %d groter dan maximum %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld niet-gereserveerde sectoren\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "Partitie %d is al gedefinieerd.  Verwijder haar alvorens haar opnieuw toe te voegen.\n"
-
-#: fdisk/fdisk.c:1945 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
-#, c-format
-msgid "First %s"
-msgstr "Eerste %s"
+msgstr ""
+"Partitie %d is al gedefinieerd.  Verwijder haar alvorens haar opnieuw toe te "
+"voegen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Geen vrije sectoren beschikbaar\n"
 
-#: fdisk/fdisk.c:2005 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
-#, c-format
-msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "Laatste %s of +size of +sizeM of +sizeK"
-
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -2857,27 +3195,23 @@ msgstr ""
 "\tnieuwe, lege DOS partitietabel. (Gebruik o.)\n"
 "\tWAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2082 fdisk/fdiskbsdlabel.c:618
-#, c-format
-msgid "The maximum number of partitions has been created\n"
-msgstr "Het maximum aantal partities is gemaakt\n"
-
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "U moet een partitie verwijderen en eerst een uitgebreide partitie toevoegen\n"
+msgstr ""
+"U moet een partitie verwijderen en eerst een uitgebreide partitie toevoegen\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alle logische partities zijn in gebruik\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr " Een primaire partitie toevoegen\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -2888,20 +3222,20 @@ msgstr ""
 "   %s\n"
 "   p   primaire partitie (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logische (5 of hoger)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   uitgebreid"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Onjuist partitienummer voor soort `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -2910,12 +3244,12 @@ msgstr ""
 "De partitietabel is gewijzigd!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Aanroepen ioctl() om partitietabel opnieuw in te lezen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -2928,7 +3262,7 @@ msgstr ""
 "De kernel gebruikt nog de oude tabel.\n"
 "De nieuwe tabel wordt na opnieuw opstarten gebruikt.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -2941,7 +3275,7 @@ msgstr ""
 "of gewijzigd, kunt u het best meer informatie opzoeken\n"
 "in het fdisk handboek.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -2950,81 +3284,85 @@ msgstr ""
 "\n"
 "Fout bij sluiten van bestand\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchroniseren schijven.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevens-plaats\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expert opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Aantal cylinders"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sector plaats wordt ingesteld voor DOS compatibaliteit\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2454
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Deze kernel vind de sectorgrootte zelf - -b optie genegeerd\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
-msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
-msgstr "Waarschuwing: de -b (sectorgrootte instellen) optie moet met één aangegeven apparaat worden gebruikt\n"
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Waarschuwing: de -b (sectorgrootte instellen) optie moet met één aangegeven "
+"apparaat worden gebruikt\n"
 
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "OSF/1 schijflabel gevonden op %s, ga in schijflabel modus.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3033,16 +3371,16 @@ msgstr ""
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef alstublieft de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand ongewijzigd\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3053,322 +3391,6 @@ msgstr ""
 "\tSorry, het experts menu is niet beschikbaar voor SGI partitietabellen.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:27
-msgid ""
-"\n"
-"\tThere is a valid AIX label on this disk.\n"
-"\tUnfortunately Linux cannot handle these\n"
-"\tdisks at the moment.  Nevertheless some\n"
-"\tadvice:\n"
-"\t1. fdisk will destroy its contents on write.\n"
-"\t2. Be sure that this disk is NOT a still vital\n"
-"\t   part of a volume group. (Otherwise you may\n"
-"\t   erase the other disks as well, if unmirrored.)\n"
-"\t3. Before deleting this physical volume be sure\n"
-"\t   to remove the disk logically from your AIX\n"
-"\t   machine.  (Otherwise you become an AIXpert)."
-msgstr ""
-"\n"
-"\tEr is een geldig AIX label op deze schijf. Helaas\n"
-"\tondersteunt Linux deze schijven op dit moment niet.\n"
-"\tToch wat advies:\n"
-"\t1. fdisk zal de inhoud wissen bij schrijven.\n"
-"\t2. Controleer of deze schijf ECHT NIET nog deel\n"
-"\t   uit maakt van een volume groep. (Anders wist\n"
-"\t   u mogelijk de andere schijven ook, als er\n"
-"\t   geen mirror is.)\n"
-"\t3. Haal, voordat u dit fysieke volume wist, de\n"
-"\t   schijf logisch uit uw AIX machine.\n"
-"\t   (Anders wordt u een AIXpert)."
-
-#: fdisk/fdiskbsdlabel.c:122
-#, c-format
-msgid ""
-"\n"
-"BSD label for device: %s\n"
-msgstr ""
-"\n"
-"BSD label voor apparaat: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:130
-msgid "   d   delete a BSD partition"
-msgstr "   d   een BSD partitie verwijderen"
-
-#: fdisk/fdiskbsdlabel.c:131
-msgid "   e   edit drive data"
-msgstr "   e   schijfgegevens bewerken"
-
-#: fdisk/fdiskbsdlabel.c:132
-msgid "   i   install bootstrap"
-msgstr "   i   bootstrap installeren"
-
-#: fdisk/fdiskbsdlabel.c:133
-msgid "   l   list known filesystem types"
-msgstr "   l   bekende bestandssysteem soorten opsommen"
-
-#: fdisk/fdiskbsdlabel.c:135
-msgid "   n   add a new BSD partition"
-msgstr "   n   een nieuwe BSD partitie toevoegen"
-
-#: fdisk/fdiskbsdlabel.c:136
-msgid "   p   print BSD partition table"
-msgstr "   p   BSD partitietabel weergeven"
-
-#: fdisk/fdiskbsdlabel.c:139
-msgid "   s   show complete disklabel"
-msgstr "   s   complete schijflabel weergeven"
-
-#: fdisk/fdiskbsdlabel.c:140
-msgid "   t   change a partition's filesystem id"
-msgstr "   t   bestandssysteem id van partitie wijzigen"
-
-#: fdisk/fdiskbsdlabel.c:141
-msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   eenheden (cylinders/sectoren) wijzigen"
-
-#: fdisk/fdiskbsdlabel.c:142
-msgid "   w   write disklabel to disk"
-msgstr "   w   schijflabel naar schijf schrijven"
-
-#: fdisk/fdiskbsdlabel.c:144
-msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   BSD partitie koppelen aan niet-BSD partitie"
-
-#: fdisk/fdiskbsdlabel.c:176
-#, c-format
-msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "Partitie %s heeft ongeldige startsector 0.\n"
-
-#: fdisk/fdiskbsdlabel.c:180
-#, c-format
-msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Lezen schijflabel van %s bij sector %d.\n"
-
-#: fdisk/fdiskbsdlabel.c:190
-#, c-format
-msgid "There is no *BSD partition on %s.\n"
-msgstr "Er is geen *BSD partitie op %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:204
-msgid "BSD disklabel command (m for help): "
-msgstr "BSD schijflabel opdracht (m voor hulp): "
-
-#: fdisk/fdiskbsdlabel.c:318
-#, c-format
-msgid "type: %s\n"
-msgstr "soort: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:320
-#, c-format
-msgid "type: %d\n"
-msgstr "soort: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:321
-#, c-format
-msgid "disk: %.*s\n"
-msgstr "schijf: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:322
-#, c-format
-msgid "label: %.*s\n"
-msgstr "label: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:323
-#, c-format
-msgid "flags:"
-msgstr "opties:"
-
-#: fdisk/fdiskbsdlabel.c:325
-#, c-format
-msgid " removable"
-msgstr " verwijderbaar"
-
-#: fdisk/fdiskbsdlabel.c:327
-#, c-format
-msgid " ecc"
-msgstr " ecc"
-
-#: fdisk/fdiskbsdlabel.c:329
-#, c-format
-msgid " badsect"
-msgstr " slechte sector"
-
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:333
-#, c-format
-msgid "bytes/sector: %ld\n"
-msgstr "bytes/sector: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:334
-#, c-format
-msgid "sectors/track: %ld\n"
-msgstr "sectoren/spoor: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:335
-#, c-format
-msgid "tracks/cylinder: %ld\n"
-msgstr "sporen/cylinder: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:336
-#, c-format
-msgid "sectors/cylinder: %ld\n"
-msgstr "sectoren/cylinder: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:337
-#, c-format
-msgid "cylinders: %ld\n"
-msgstr "cylinders: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:338
-#, c-format
-msgid "rpm: %d\n"
-msgstr "rpm: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:339
-#, c-format
-msgid "interleave: %d\n"
-msgstr "tussenruimte: %d\n"
-
-# let op: komt vaker voor
-#: fdisk/fdiskbsdlabel.c:340
-#, c-format
-msgid "trackskew: %d\n"
-msgstr "trackskew: %d\n"
-
-# let op: komt vaker voor
-#: fdisk/fdiskbsdlabel.c:341
-#, c-format
-msgid "cylinderskew: %d\n"
-msgstr "cylinderskew: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:342
-#, c-format
-msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "schakelen kop: %ld\t\t# milliseconden\n"
-
-#: fdisk/fdiskbsdlabel.c:344
-#, c-format
-msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "spoor-tot-spoor zoeken: %ld\t# milliseconden\n"
-
-#: fdisk/fdiskbsdlabel.c:346
-#, c-format
-msgid "drivedata: "
-msgstr "schijfgegevens: "
-
-#: fdisk/fdiskbsdlabel.c:355
-#, c-format
-msgid ""
-"\n"
-"%d partitions:\n"
-msgstr ""
-"\n"
-"%d partities:\n"
-
-#: fdisk/fdiskbsdlabel.c:356
-#, c-format
-msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#       start       eind     grootte  bestandssysteem [grootte bsize cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
-#, c-format
-msgid "Writing disklabel to %s.\n"
-msgstr "Schrijven schijflabel naar %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
-#, c-format
-msgid "%s contains no disklabel.\n"
-msgstr "%s bevat geen schijflabel.\n"
-
-#: fdisk/fdiskbsdlabel.c:427
-msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Wilt u een schijflabel maken? (j/n) "
-
-#: fdisk/fdiskbsdlabel.c:467
-msgid "bytes/sector"
-msgstr "bytes/sector"
-
-#: fdisk/fdiskbsdlabel.c:468
-msgid "sectors/track"
-msgstr "sectoren/spoor"
-
-#: fdisk/fdiskbsdlabel.c:469
-msgid "tracks/cylinder"
-msgstr "sporen/cylinder"
-
-#: fdisk/fdiskbsdlabel.c:477
-msgid "sectors/cylinder"
-msgstr "sectoren/cylinder"
-
-#: fdisk/fdiskbsdlabel.c:481
-#, c-format
-msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "Moet zijn: <= sectoren/spoor * sporen/cylinder (standaard).\n"
-
-#: fdisk/fdiskbsdlabel.c:483
-msgid "rpm"
-msgstr "rpm"
-
-#: fdisk/fdiskbsdlabel.c:484
-msgid "interleave"
-msgstr "tussenruimte"
-
-#: fdisk/fdiskbsdlabel.c:485
-msgid "trackskew"
-msgstr "trackskew"
-
-#: fdisk/fdiskbsdlabel.c:486
-msgid "cylinderskew"
-msgstr "cylinderskew"
-
-#: fdisk/fdiskbsdlabel.c:487
-msgid "headswitch"
-msgstr "schakelen kop"
-
-#: fdisk/fdiskbsdlabel.c:488
-msgid "track-to-track seek"
-msgstr "spoor-tot-spoor zoeken"
-
-#: fdisk/fdiskbsdlabel.c:529
-#, c-format
-msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Bootstrap: %sboot -> boot%s (%s): "
-
-#: fdisk/fdiskbsdlabel.c:554
-#, c-format
-msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Bootstrap overlapt met schijflabel!\n"
-
-#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
-#, c-format
-msgid "Bootstrap installed on %s.\n"
-msgstr "Bootstrap geïnstalleerd op %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:599
-#, c-format
-msgid "Partition (a-%c): "
-msgstr "Partitie (a-%c): "
-
-#: fdisk/fdiskbsdlabel.c:630
-#, c-format
-msgid "This partition already exists.\n"
-msgstr "Deze partitie bestaat al.\n"
-
-#: fdisk/fdiskbsdlabel.c:756
-#, c-format
-msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Waarschuwing: teveel partities (%d, maximum is %d).\n"
-
-#: fdisk/fdiskbsdlabel.c:804
-#, c-format
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"Synchroniseren schijven.\n"
-
 #: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
@@ -3425,15 +3447,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux wisselgeheugen"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux eigen systeem"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3443,8 +3465,12 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
-msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
-msgstr "Volgens MIPS Computer Systems, Inc mag het Label niet meer dan 512 bytes bevatten\n"
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"Volgens MIPS Computer Systems, Inc mag het Label niet meer dan 512 bytes "
+"bevatten\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3565,7 +3591,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Er is meer dan één schijfingang aanwezig.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Geen partities gedefinieerd\n"
@@ -3650,7 +3676,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tU heeft een ongebruikelijke naam gekozen voor het opstartbestand.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3670,11 +3695,10 @@ msgstr ""
 "Alleen het gehele schijf deel \"SGI volume\" mag dit overtreden.\n"
 "Typ JA als u zeker wilt dat u deze partitie anders wilt noemen.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3730,7 +3754,8 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:728
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
 "Waarschuwing:  BLKGETSIZE ioctl mislukt op %s.  Nu wordt cylinder geometrie\n"
@@ -3747,44 +3772,43 @@ msgstr "Proberen om parameters te houden van partitie %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTE=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Leeg"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS wisselgeheugen"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Gehele schijf"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid auto-detectie"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3797,12 +3821,12 @@ msgstr ""
 "zoals koppen, sectoren, cylinders en partities, of\n"
 "een verse label moeten forceren (s opdracht in hoofdmenu)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Auto-instellen heeft een %s%s%s gevonden\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3815,7 +3839,7 @@ msgstr ""
 "inhoud uiteraard definitief verloren zijn.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3825,72 +3849,72 @@ msgstr ""
 "   ?   auto-instellen\n"
 "   0   aangepast (met gevonden hardware standaardinstellingen)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selecteer soort (? voor automatisch, 0 voor aangepast): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Auto-instellen mislukt.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sectoren/spoor"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Afwisselende cylinders"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysieke cylinders"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Tussenruimte factor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "U kunt alle schijfparameters wijzigen vanuit het x menu"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" diskette"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux aangepast"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitie %d eindigt niet op een cylinder grens\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitie %d overlapt met andere in sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ongebruikt gat - sectoren 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ongebruikt gat - sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3899,7 +3923,7 @@ msgstr ""
 "Andere partities beslaan al de gehele schijf.\n"
 "Verwijder/verklein ze alvorens het opnieuw te proberen.\n"
 
-#: fdisk/fdisksunlabel.c:589
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3910,7 +3934,7 @@ msgstr ""
 "waarde %d %s bedekt al een andere partitie. Uw invoer is gewijzigd\n"
 "tot %d %s\n"
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3919,7 +3943,7 @@ msgstr ""
 "Als u SunOS/Solaris compatibiliteit wilt houden, kunt u deze partitie beter\n"
 "als gehele schijf (5) laten, startend bij 0, met %u sectoren\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3934,7 +3958,7 @@ msgstr ""
 "Typ JA als u erg zeker bent dat u die partitie van soort 82\n"
 "(Linux wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:654
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3953,7 +3977,7 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:668
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3966,16 +3990,16 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Start       Eind   Blokken  Id  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:698
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Aantal alternatieve cylinders"
 
-#: fdisk/fdisksunlabel.c:731
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cylinders"
 
@@ -3999,32 +4023,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Uitgebreid"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX opstartbaar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4033,7 +4051,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4126,12 +4143,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4152,8 +4167,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4163,7 +4176,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD of SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4184,12 +4196,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Oude Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / oude Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux-swap / Solaris"
@@ -4218,12 +4228,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4232,7 +4240,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4297,30 +4304,22 @@ msgstr "Niet-bestandssysteem gegevens"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS"
@@ -4329,116 +4328,109 @@ msgstr "BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC opstart"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secundair"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "zoekfout op %s - kan niet zoeken naar %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "zoekfout: verwacht 0x%08x%08x, gekregen 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "geheugentekort - opgeven\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "leesfout op %s - kan sector %lu niet lezen\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FOUT: sector %lu heeft geen msdos ondertekening\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "schrijffout op %s - kan sector %lu niet schrijven\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan bestand over sectoren van partitie (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "schrijffout op %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand niet vinden (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitie herstelbestand heeft onjuiste grootte - niet herstellen\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "geheugentekort?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fout bij lezen %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan apparaat %s niet openen voor schrijven\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fout bij schrijven sector %lu op %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Schijf %s: kan geometrie niet opvragen\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Schijf %s: kan grootte niet opvragen\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4450,22 +4442,22 @@ msgstr ""
 "waarschijnlijk zinloos.\n"
 "[Gebruik de --force optie als u dit echt wilt doen]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu koppen zijn\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu sectoren zijn\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Waarschuwing: BLKGETSIZE/HDIO_GETGEO zegt dat er %lu cylinders zijn\n"
 
-#: fdisk/sfdisk.c:521
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4474,7 +4466,7 @@ msgstr ""
 "Waarschuwing: onwaarschijnlijk aantal sectoren (%lu) - meestal hoogstens 63\n"
 "Dit zal problemen geven met alle software die C/H/S adressering gebruikt.\n"
 
-#: fdisk/sfdisk.c:525
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4483,22 +4475,33 @@ msgstr ""
 "\n"
 "Schijf %s: %lu cylinders, %lu koppen, %lu sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:607
+#: fdisk/sfdisk.c:606
 #, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "%s van partitie %s heeft een onmogelijke waarde voor kop: %lu (moet zijn tussen 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s van partitie %s heeft een onmogelijke waarde voor kop: %lu (moet zijn "
+"tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:612
+#: fdisk/sfdisk.c:611
 #, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
-msgstr "%s van partitie %s heeft onmogelijke waarde voor sector: %lu (moet zijn tussen 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s van partitie %s heeft onmogelijke waarde voor sector: %lu (moet zijn "
+"tussen 1-%lu)\n"
 
-#: fdisk/sfdisk.c:617
+#: fdisk/sfdisk.c:616
 #, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
-msgstr "%s van partitie %s heeft onmogelijke waarde voor cylinders: %lu (moet zijn tussen 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s van partitie %s heeft onmogelijke waarde voor cylinders: %lu (moet zijn "
+"tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:657
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4507,12 +4510,12 @@ msgstr ""
 "Id  Naam\n"
 "\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Opnieuw inlezen partitietabel ...\n"
 
-#: fdisk/sfdisk.c:819
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4520,45 +4523,46 @@ msgstr ""
 "Het opnieuw lezen van de partitietabel is mislukt\n"
 "Herstart het systeem nu, vóór mkfs te gebruiken\n"
 
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fout bij sluiten %s\n"
 
-#: fdisk/sfdisk.c:862
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: die partitie bestaat niet\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "onbekend formaat - nu sectoren worden gebruikt\n"
 
-#: fdisk/sfdisk.c:924
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitietabel van %s\n"
 
-#: fdisk/sfdisk.c:935
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "niet-geïmplementeerd formaat - nu wordt %s gebruikt\n"
 
-#: fdisk/sfdisk.c:939
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Eenheden = cylinders van %lu bytes, blokken van 1024 bytes, te tellen vanaf %d\n"
+"Eenheden = cylinders van %lu bytes, blokken van 1024 bytes, te tellen vanaf %"
+"d\n"
 "\n"
 
-#: fdisk/sfdisk.c:942
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   ApparaatOpstart Start Eind  #cyls    #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:947
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4567,12 +4571,12 @@ msgstr ""
 "Eenheden = sectoren van 512 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:949
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Apparaat Opstart Start     Eind  #sectoren Id  Systeem\n"
 
-#: fdisk/sfdisk.c:952
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4581,45 +4585,46 @@ msgstr ""
 "Eenheden = blokken van 1024 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:954
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start    Eind   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Eenheden = mebibytes van 1048576 bytes, blokken van 1024 bytes, te tellen vanaf %d\n"
+"Eenheden = mebibytes van 1048576 bytes, blokken van 1024 bytes, te tellen "
+"vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:959
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start Eind MiB   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:1119
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1126
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\teind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Geen partities gevonden\n"
 
-#: fdisk/sfdisk.c:1143
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4630,51 +4635,52 @@ msgstr ""
 "  is voor C/H/S=*/%ld/%ld (in plaats van %ld/%ld/%ld).\n"
 "Voor deze opsomming neem ik die geometrie aan.\n"
 
-#: fdisk/sfdisk.c:1192
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "geen partitietabel aanwezig.\n"
 
-#: fdisk/sfdisk.c:1194
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "vreemd, slechts %d partities gedefinieerd.\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
+msgstr ""
+"Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
 
-#: fdisk/sfdisk.c:1206
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en is opstartbaar\n"
 
-#: fdisk/sfdisk.c:1209
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en een niet-nul start\n"
 
-#: fdisk/sfdisk.c:1220
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Waarschuwing: partitie %s "
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "valt niet binnen partitie %s\n"
 
-#: fdisk/sfdisk.c:1232
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Waarschuwing: partities %s "
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "en %s overlappen\n"
 
-#: fdisk/sfdisk.c:1244
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4683,17 +4689,17 @@ msgstr ""
 "Waarschuwing: partitie %s bevat een deel van de partitietabel (sector %lu),\n"
 "en zal die vernielen als zij wordt gevuld\n"
 
-#: fdisk/sfdisk.c:1256
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Waarschuwing: partitie %s start op sector 0\n"
 
-#: fdisk/sfdisk.c:1260
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Waarschuwing: partitie %s loopt tot na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4701,25 +4707,27 @@ msgstr ""
 "Van de primaire partities kan er ten hoogste één uitgebreid\n"
 "zijn (hoewel dit geen probleem is onder Linux)\n"
 
-#: fdisk/sfdisk.c:1293
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s start niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1299
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s eindigt niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1317
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Waarschuwing: meerdere primaire partities zijn aangegeven als opstartbaar (actief)\n"
-"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf opstarten.\n"
+"Waarschuwing: meerdere primaire partities zijn aangegeven als opstartbaar "
+"(actief)\n"
+"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
+"opstarten.\n"
 
-#: fdisk/sfdisk.c:1324
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4727,38 +4735,43 @@ msgstr ""
 "Waarschuwing: normaal gesproken kan men alleen van primaire\n"
 "partities opstarten. LILO negeert de `opstartbaar' optie.\n"
 
-#: fdisk/sfdisk.c:1330
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Waarschuwing: er is geen primaire partitie aangegeven als opstartbaar (actief)\n"
-"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf opstarten.\n"
+"Waarschuwing: er is geen primaire partitie aangegeven als opstartbaar "
+"(actief)\n"
+"Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
+"opstarten.\n"
 
-#: fdisk/sfdisk.c:1344
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1347
+#: fdisk/sfdisk.c:1346
 #, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1353
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "eind"
 
-#: fdisk/sfdisk.c:1356
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "partitie %s: eind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
+msgstr ""
+"partitie %s: eind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1359
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie %s eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1384
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4767,7 +4780,7 @@ msgstr ""
 "Waarschuwing: start van uitgebreide partitie verschoven van %ld naar %ld\n"
 "(Alleen voor weergave. De inhoud wordt niet gewijzigd.)\n"
 
-#: fdisk/sfdisk.c:1390
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4775,227 +4788,246 @@ msgstr ""
 "Waarschuwing: uitgebreide partitie start niet op een cylinder grens.\n"
 "DOS en Linux zullen de inhoud anders interpreteren.\n"
 
-#: fdisk/sfdisk.c:1408 fdisk/sfdisk.c:1485
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "teveel partities - die na nr (%d) worden genegeerd\n"
 
-#: fdisk/sfdisk.c:1423
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "boom van partities?\n"
 
-#: fdisk/sfdisk.c:1544
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager gevonden - daar kan ik niet mee werken\n"
 
-#: fdisk/sfdisk.c:1551
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ondertekening gevonden - ik geef het op\n"
 
-#: fdisk/sfdisk.c:1571
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "vreemd..., een uitgebreide partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1578 fdisk/sfdisk.c:1589
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "vreemd..., een BSD partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1623
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "%s: onbekend partitietabeltype\n"
 
-#: fdisk/sfdisk.c:1635
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n optie is gegeven: Niets gewijzigd\n"
 
-#: fdisk/sfdisk.c:1651
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan oude sectoren mislukt - afbreken\n"
 
-#: fdisk/sfdisk.c:1656
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partitie schrijven op %s mislukt\n"
 
-#: fdisk/sfdisk.c:1733
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel - afsluiten\n"
 
-#: fdisk/sfdisk.c:1769
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: `=' verwacht na %s veld\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na %s veld\n"
 
-#: fdisk/sfdisk.c:1782
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1824
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "getal te groot\n"
 
-#: fdisk/sfdisk.c:1828
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "rotzooi na getal\n"
 
-#: fdisk/sfdisk.c:1951
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitie beschrijver\n"
 
-#: fdisk/sfdisk.c:1984
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omgevende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:2035
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "teveel invoervelden\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2069
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte (%lu)\n"
+msgstr ""
+"Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte "
+"(%lu)\n"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: slechte partitie start (eerste %lu)\n"
 
-#: fdisk/sfdisk.c:2153
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opstartbaar optie niet herkend - kies - of *\n"
 
-#: fdisk/sfdisk.c:2170 fdisk/sfdisk.c:2183
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "gedeeltelijke c,h,s specificatie?\n"
 
-#: fdisk/sfdisk.c:2194
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie niet waar die verwacht was\n"
 
-#: fdisk/sfdisk.c:2226
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "slechte invoer\n"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "teveel partities\n"
 
-#: fdisk/sfdisk.c:2281
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"Invoer in het volgende formaat; afwezige velden krijgen een standaardwaarde.\n"
+"Invoer in het volgende formaat; afwezige velden krijgen een "
+"standaardwaarde.\n"
 "<start> <grootte> <soort [E,S,L,X,hex]> <opstartbaar [-,*]> <c,h,s> <c,h,s>\n"
-"Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk <soort>).\n"
+"Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk "
+"<soort>).\n"
 
-#: fdisk/sfdisk.c:2303
-msgid "version"
-msgstr "versie"
-
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Gebruik: %s [opties] apparaat ...\n"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "apparaat: zoiets als /dev/hda of /dev/sda"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "nuttige opties:"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [of --show-size]: grootte van een partitie weergeven"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [of --id]:        partitie Id weergeven of wijzigen"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [of --list]:      partities van elk apparaat opsommen"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [of --dump]:      hetzelfde, maar in een formaat geschikt voor latere invoer"
+msgstr ""
+"    -d [of --dump]:      hetzelfde, maar in een formaat geschikt voor latere "
+"invoer"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [of --increment]: aantal cylinders etc. van 1 in plaats van 0"
 
-#: fdisk/sfdisk.c:2317
-msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
-msgstr "    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/blokken/cylinders/MB"
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/"
+"blokken/cylinders/MB"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [of --list-types]:bekende partitiesoorten opsommen"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr "    -D [of --DOS]:       voor DOS-compatibiliteit: verspil een beetje ruimte"
+msgstr ""
+"    -D [of --DOS]:       voor DOS-compatibiliteit: verspil een beetje ruimte"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [of --re-read]:   laat de kernel de partitietabel opnieuw inlezen"
+msgstr ""
+"    -R [of --re-read]:   laat de kernel de partitietabel opnieuw inlezen"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                alleen partitie met nummer # wijzigen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 niet echt naar de schijf schrijven"
 
-#: fdisk/sfdisk.c:2323
-msgid "    -O file :            save the sectors that will be overwritten to file"
-msgstr "    -O bestand :         de sectoren die overschreven zullen worden, opslaan in bestand"
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O bestand :         de sectoren die overschreven zullen worden, opslaan "
+"in bestand"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I bestand :         deze sectoren weer herstellen"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [of --version]:   versienummer weergeven"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [of --help]:      dit bericht weergeven"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "gevaarlijke opties:"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr "    -g [of --show-geometry]: weergeven hoe de kernel denkt over de geometrie"
+msgstr ""
+"    -g [of --show-geometry]: weergeven hoe de kernel denkt over de geometrie"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [of --show-pt-geometry]: weergeven hoe de kernel via de partitietabel "
+"denkt over de geometrie"
+
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5003,113 +5035,117 @@ msgstr ""
 "    -x [of --show-extended]: ook uitgebreide partities opnemen in uitvoer\n"
 "                             of, verwacht beschrijvers voor ze in invoer"
 
-#: fdisk/sfdisk.c:2331
-msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr "    -L  [of --Linux]:      niet klagen over dingen die niet relevant zijn voor Linux"
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr ""
+"    -L  [of --Linux]:      niet klagen over dingen die niet relevant zijn "
+"voor Linux"
 
-#: fdisk/sfdisk.c:2332
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [of --quiet]:      waarschuwingen onderdrukken"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    U kunt zo een andere geometrie dan de gevonden forceren:"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [of --cylinders #]:het aantal te gebruiken cylinders instellen"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [of --heads #]:    het aantal te gebruiken koppen instellen"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [of --sectors #]:  het aantal te gebruiken sectoren instellen"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "U kunt alle consistentie controles uit zetten met:"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [of --force]:      doe wat ik zeg, ook al is het dom"
 
-#: fdisk/sfdisk.c:2344
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: fdisk/sfdisk.c:2345
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s apparaat\t\t actieve partities op apparaat weergeven\n"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr "%s apparaat n1 n2 ... partities n1 ... activeren, de rest de-activeren\n"
+msgstr ""
+"%s apparaat n1 n2 ... partities n1 ... activeren, de rest de-activeren\n"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An apparaat\t partitie n activeren, alle andere de-activeren\n"
 
-#: fdisk/sfdisk.c:2511
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2629
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totaal: %llu blokken\n"
 
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "gebruik: sfdisk --print-id apparaat partitie-nummer\n"
 
-#: fdisk/sfdisk.c:2668
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "gebruik: sfdisk --change-id apparaat partitie-nummer Id\n"
 
-#: fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "gebruik: sfdisk --id apparaat partitie-nummer [Id]\n"
 
-#: fdisk/sfdisk.c:2677
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan slechts één apparaat aangeven (behalve met -l of -s)\n"
 
-#: fdisk/sfdisk.c:2703
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet lezen-schrijven openen\n"
 
-#: fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2730
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2747
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylinders, %ld koppen, %ld sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:2764
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan grootte van %s niet opvragen\n"
 
-#: fdisk/sfdisk.c:2842
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "slechte actieve byte: 0x%x in plaats van 0x80\n"
 
-#: fdisk/sfdisk.c:2860 fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5117,7 +5153,7 @@ msgstr ""
 "Klaar\n"
 "\n"
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5126,35 +5162,35 @@ msgstr ""
 "U heeft %d actieve, primaire partities. Dit maakt niets uit voor LILO,\n"
 "maar DOS MBR start alleen op van een schijf met 1 actieve partitie.\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partitie %s heeft id %x en is niet verborgen\n"
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slechte Id %lx\n"
 
-#: fdisk/sfdisk.c:2955
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:2972
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:2975
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:2981
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Even controleren of niemand deze schijf nu gebruikt ...\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5162,34 +5198,36 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Deze schijf wordt nu gebruikt - herpartitioneren is waarschijnlijk een slecht idee.\n"
-"Ontkoppel alle bestandssystemen, en schakel alle wisselgeheugen partities op deze schijf uit.\n"
+"Deze schijf wordt nu gebruikt - herpartitioneren is waarschijnlijk een "
+"slecht idee.\n"
+"Ontkoppel alle bestandssystemen, en schakel alle wisselgeheugen partities op "
+"deze schijf uit.\n"
 "Gebruik --no-reread om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:2991
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3000
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:3004
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitie %d bestaat niet, kan haar niet veranderen!\n"
 
-#: fdisk/sfdisk.c:3012
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:3017
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5197,21 +5235,21 @@ msgstr ""
 "Deze partities bevallen mij niet echt - er is niets veranderd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:3020
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Mij bevalt niet niet echt - misschien moet u Nee antwoorden\n"
 
-#: fdisk/sfdisk.c:3025
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:3032
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5220,16 +5258,16 @@ msgstr ""
 "\n"
 "sfdisk: vroegtijdig einde van invoer\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Afsluiten - niets veranderd\n"
 
-#: fdisk/sfdisk.c:3040
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord alstublieft een van y,n,q\n"
 
-#: fdisk/sfdisk.c:3048
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5238,14 +5276,16 @@ msgstr ""
 "Nieuwe partitietabel succesvol weggeschreven\n"
 "\n"
 
-#: fdisk/sfdisk.c:3054
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Als u een DOS partitie gemaakt of gewijzigd heeft, zeg /dev/foo7, gebruiken dan dd(1)\n"
-"om de eerste 512 bytes op nul te zetten:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"Als u een DOS partitie gemaakt of gewijzigd heeft, zeg /dev/foo7, gebruiken "
+"dan dd(1)\n"
+"om de eerste 512 bytes op nul te zetten:  dd if=/dev/zero of=/dev/foo7 "
+"bs=512 count=1\n"
 "(Zie fdisk(8).)\n"
 
 #: getopt/getopt.c:233
@@ -5277,28 +5317,38 @@ msgid "              parameters\n"
 msgstr "              parameters\n"
 
 #: getopt/getopt.c:328
-msgid "  -a, --alternative            Allow long options starting with single -\n"
-msgstr "  -a, --alternative            Lange opties toestaan beginnend met een enkele -\n"
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Lange opties toestaan beginnend met een "
+"enkele -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Deze kleine gebruikersaanwijzing weergeven\n"
+msgstr ""
+"  -h, --help                   Deze kleine gebruikersaanwijzing weergeven\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr "  -l, --longoptions=langeopts  Lange opties die moeten worden herkend\n"
+msgstr ""
+"  -l, --longoptions=langeopts  Lange opties die moeten worden herkend\n"
 
 #: getopt/getopt.c:331
-msgid "  -n, --name=progname          The name under which errors are reported\n"
-msgstr "  -n, --name=prognaam          De naam waaronder fouten worden gerapporteerd\n"
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=prognaam          De naam waaronder fouten worden "
+"gerapporteerd\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=opttekst       Korte opties die moeten worden herkend\n"
+msgstr ""
+"  -o, --options=opttekst       Korte opties die moeten worden herkend\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr "  -q, --quiet                  Foutrapportage van getopt(3) uit zetten\n"
+msgstr ""
+"  -q, --quiet                  Foutrapportage van getopt(3) uit zetten\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
@@ -5333,129 +5383,130 @@ msgstr "getopt (uitgebreid) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "interne fout, neem contact op met de auteur"
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "opgestart vanuit MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffiaanse BCD klok\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "klokpoort aangepast tot 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "cool SPEELTJE!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomische %s 1000 iteraties mislukt!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan /dev/port niet openen: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Ik heb geen toestemming gekregen omdat ik het niet probeerde.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan geen I/O poort toegang krijgen:  de iopl(3) aanroep mislukte.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Waarschijnlijk heeft u root privileges nodig.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Aangenomen wordt dat de hardware klok staat op %s tijd.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokale"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Waarschuwing: derde regel in adjtime bestand niet herkend\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Verwacht: `UTC' of `LOCAL' of niets.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Laatste aanpassing voor verschuiving is %ld seconden na 1969 gedaan\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Laatste calibratie gedaan %ld seconden na 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hardware klok is op %s tijd\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "onbekende"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Wachten op klok tik...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...klok tik ontvangen\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Onjuiste waarden in hardware klok: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr "Hw klok tijd : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
+msgstr ""
+"Hw klok tijd : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tijd gelezen van hardware klok: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Instellen hardware klok op %.2d:%.2d:%.2d = %ld seconden sinds 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Klok niet gewijzigd - alleen testen.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5464,27 +5515,32 @@ msgstr ""
 "Verlopen tijd sinds laatste referentietijd is %.6f seconden.\n"
 "Uitstellen tot volgende volle seconde.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr "De hardware klok bevat waarden die ofwel onjuist (bijv. 50de dag van de maand) of buiten het bereik vallen dat wij ondersteunen (bijv. het jaar 2095).\n"
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"De hardware klok bevat waarden die ofwel onjuist (bijv. 50de dag van de "
+"maand) of buiten het bereik vallen dat wij ondersteunen (bijv. het jaar "
+"2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f seconden\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Geen --date optie aangegeven.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date argument te lang\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5493,21 +5549,21 @@ msgstr ""
 "De waarde van de --date optie is geen geldige datum.\n"
 "Het bevat in het bijzonder aanhalingstekens.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Uitvoeren date opdracht: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "Uitvoeren 'date' programma in /bin/sh shell mislukt. popen() mislukt"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "antwoord van date opdracht = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5522,104 +5578,123 @@ msgstr ""
 "Het antwoord was:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"De date opdracht uitgevoerd door %s gaf iets anders dan een heel getal waar de geconverteerde tijdswaarde werd verwacht.\n"
+"De date opdracht uitgevoerd door %s gaf iets anders dan een heel getal waar "
+"de geconverteerde tijdswaarde werd verwacht.\n"
 "De opdracht was:\n"
 "  %s\n"
 "Het antwoord was:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "datumtekst %s is gelijk aan %ld seconden sinds 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
-msgstr "De hardware klok bevat geen geldige tijd, zodat we de systeemtijd er niet mee kunnen instellen.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"De hardware klok bevat geen geldige tijd, zodat we de systeemtijd er niet "
+"mee kunnen instellen.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Aanroepen settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "De systeemklok wordt niet ingesteld, uitvoeren in testmodus.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Moet superuser zijn om de systeemklok in te stellen.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() mislukt"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
-msgstr "De verchuivingsfactor wordt niet aangepast, omdat de hardware klok eerder rotzooi bevatte.\n"
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"De verchuivingsfactor wordt niet aangepast, omdat de hardware klok eerder "
+"rotzooi bevatte.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"De verschuivingsfactor wordt niet aangepast, omdat de laatste calibratietijd nul was.\n"
+"De verschuivingsfactor wordt niet aangepast, omdat de laatste calibratietijd "
+"nul was.\n"
 "De geschiedenis is dus slecht, en opnieuw calibreren is nodig.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
-msgstr "De verschuivingsfactor wordt niet aangepast, omdat het minder dan een dag is sinds de laatste calibratie.\n"
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"De verschuivingsfactor wordt niet aangepast, omdat het minder dan een dag is "
+"sinds de laatste calibratie.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Klok %.1f seconden verschoven in de laatste %d seconden ondanks een verschuivingsfactor van %f seconden/dag.\n"
+"Klok %.1f seconden verschoven in de laatste %d seconden ondanks een "
+"verschuivingsfactor van %f seconden/dag.\n"
 "De verschuivingsfactor wordt %f seconden/dag aangepast\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Tijd sinds laatste aanpassing is %d seconden\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr "Er moeten %d seconden worden ingevoegd, en er moet worden gekeken naar de tijd %.6f seconden geleden\n"
+msgstr ""
+"Er moeten %d seconden worden ingevoegd, en er moet worden gekeken naar de "
+"tijd %.6f seconden geleden\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Het adjtime bestand wordt niet aangepast - in testmodus.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5628,73 +5703,89 @@ msgstr ""
 "Er zou het volgende worden geschreven naar %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Verschuivingsaanpassing parameters niet bijgewerkt.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "De hardware klok bevat geen geldige tijd, zodat we die niet kunnen aanpassen.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"De hardware klok bevat geen geldige tijd, zodat we die niet kunnen "
+"aanpassen.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "Benodigde aanpassing is minder dan een seconden - de klok wordt niet ingesteld.\n"
+msgstr ""
+"Benodigde aanpassing is minder dan een seconden - de klok wordt niet "
+"ingesteld.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s wordt gebruikt.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Geen bruikbare klok-interface gevonden.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Instellen systeemklok mislukt.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"De kernel bewaart alleen bij Alpha's een tijdperk-waarde voor de hardware klok.\n"
+"De kernel bewaart alleen bij Alpha's een tijdperk-waarde voor de hardware "
+"klok.\n"
 "Deze versie van hwclock is gemaakt voor een ander systeem dan de Alpha\n"
 "(en werkt nu dus waarschijnlijk niet op een Alpha).  Geen actie genomen.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Verkrijgen tijdperk-waarde van de kernel mislukt.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel neemt een tijdperk-waarde aan van %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
-msgstr "Om de tijdperk-waarde in te stellen, dient u de 'epoch' optie te gebruiken om door te geven welke waarde moet worden gebruikt.\n"
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"Om de tijdperk-waarde in te stellen, dient u de 'epoch' optie te gebruiken "
+"om door te geven welke waarde moet worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Tijdperk niet instellen op %d - alleen testen.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Instellen tijdperk-waarde in kernel mislukt.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s van %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5743,17 +5834,21 @@ msgstr ""
 "  --version     versienummer weergeven\n"
 "\n"
 "Opties: \n"
-"  --utc         de hardware klok wordt gehouden op gecoördineerde universele tijd\n"
+"  --utc         de hardware klok wordt gehouden op gecoördineerde universele "
+"tijd\n"
 "  --localtime   de hardware klok wordt op lokale tijd gehouden\n"
 "  --directisa   directe toegang tot ISA bus in plaats van %s\n"
 "  --badyear     negeer jaartal van rtc, omdat de BIOS stuk is\n"
-"  --date        geeft de tijd aan waarop de hardware klok moet worden ingesteld\n"
-"  --epoch=jaar  geeft het jaartal aan dat het begin is van de tijdperk-waarde van\n"
+"  --date        geeft de tijd aan waarop de hardware klok moet worden "
+"ingesteld\n"
+"  --epoch=jaar  geeft het jaartal aan dat het begin is van de tijdperk-"
+"waarde van\n"
 "                de hardware klok\n"
-"  --noadjfile   gebruik niet /etc/adjtime. Het gebruik van --utc of --localtime\n"
+"  --noadjfile   gebruik niet /etc/adjtime. Het gebruik van --utc of --"
+"localtime\n"
 "                is hiervoor nodig\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5762,12 +5857,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                vertel welke soort Alpha u gebruikt (zie hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s heeft geen argumenten zonder opties.  U gaf %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5776,50 +5871,66 @@ msgstr ""
 "U heeft verschillende functies aangegeven.\n"
 "Er kan slechts één functie tegelijkertijd worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
-msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
-msgstr "%s: De --utc en --localtime opties sluiten elkaar uit.  U heeft beide aangegeven.\n"
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: De --utc en --localtime opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
-msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: De --adjust en --noadjfile opties sluiten elkaar uit.  U heeft beide aangegeven.\n"
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: De --adjust en --noadjfile opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Met --noadjfile moet u --utc of --localtime aangeven\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Geen bruikbare insteltijd.  Kan klok niet instellen.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Sorry, alleen de supergebruiker kan de hardware klok instellen.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sorry, alleen de supergebruiker kan de systeem klok instellen.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
-msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
-msgstr "Sorry, alleen de supergebruiker kan de tijdperk-waarde van de hardware klok in de kernel instellen.\n"
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Sorry, alleen de supergebruiker kan de tijdperk-waarde van de hardware klok "
+"in de kernel instellen.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan geen toegang krijgen tot hardware klok op een bekende manier.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
-msgid "Use the --debug option to see the details of our search for an access method.\n"
-msgstr "Gebruik de --debug optie om de details te zien over onze zoektocht naar een toegangsmethode.\n"
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Gebruik de --debug optie om de details te zien over onze zoektocht naar een "
+"toegangsmethode.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -5848,7 +5959,6 @@ msgstr "ioctl() mislukt om tijd te lezen van %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK mislukt"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Openen /dev/tty1 of /dev/vc/1 mislukt"
@@ -5900,7 +6010,9 @@ msgstr "ioctl() naar %s om bijwerkingsonderbrekingen uit te zetten, mislukt"
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "ioctl() naar %s om bijwerkingsonderbrekingen aan te zetten, onverwacht mislukt"
+msgstr ""
+"ioctl() naar %s om bijwerkingsonderbrekingen aan te zetten, onverwacht "
+"mislukt"
 
 #: hwclock/rtc.c:330
 #, c-format
@@ -5919,8 +6031,14 @@ msgstr "Openen van %s mislukt"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
-msgstr "Om de tijdperk-waarde in de kernel aan te passen, is toegang tot het 'rtc' stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit bestand bestaat niet op dit systeem.\n"
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"Om de tijdperk-waarde in de kernel aan te passen, is toegang tot het 'rtc' "
+"stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit "
+"bestand bestaat niet op dit systeem.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -5949,7 +6067,8 @@ msgstr "tijdperk instellen op %ld met RTC_EPOCH_SET ioctl naar %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Het kernel stuurprogramma voor %s heeft geen RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:447
@@ -5961,7 +6080,6 @@ msgstr "ioctl(RTC_EPOCH_SET) naar %s mislukt"
 msgid "calling open_tty\n"
 msgstr "aanroepen open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "aanroepen termio_init\n"
@@ -5970,7 +6088,6 @@ msgstr "aanroepen termio_init\n"
 msgid "writing init string\n"
 msgstr "schrijven init string\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "voor autobaud\n"
@@ -5984,7 +6101,6 @@ msgstr "wachten op cr-lf\n"
 msgid "read %c\n"
 msgstr "gelezen %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "lezen inlognaam\n"
@@ -6038,7 +6154,6 @@ msgstr "/dev: chdir() mislukt: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: geen teken-apparaat"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6053,12 +6168,10 @@ msgstr "/dev/%s: kan niet openen als standaardinvoer: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: niet open voor lezen/schrijven"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "dubbel doen\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6091,36 +6204,35 @@ msgstr "%s: invoer overloop"
 #: login-utils/agetty.c:1195
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
-"Gebruik: %s [-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H inlog_host] baud_rate,... lijn [soort terminal]\n"
-"of\t[-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H inlog_host] lijn baud_rate,... [soort terminal]\n"
+"Gebruik: %s [-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] baud_rate,... lijn [soort terminal]\n"
+"of\t[-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] lijn baud_rate,... [soort terminal]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: weinig geheugen, inloggen mislukt mogelijk\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "malloc voor ttyclass mislukt"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "malloc voor grplist mislukt"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inloggen op %s van %s standaard geweigerd.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggen op %s van %s geweigerd.\n"
@@ -6165,8 +6277,8 @@ msgstr "Wijzigen finger informatie voor %s.\n"
 msgid "Password error."
 msgstr "Wachtwoord fout."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Wachtwoord: "
@@ -6244,8 +6356,12 @@ msgstr "%s: %s is niet gerechtigd om de shell van %s te wijzigen\n"
 
 #: login-utils/chsh.c:157
 #, c-format
-msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
-msgstr "%s: uitvoerende UID komt niet overeen met UID van gebruiker die wordt gewijzigd, shell-wijziging ontzegd\n"
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: uitvoerende UID komt niet overeen met UID van gebruiker die wordt "
+"gewijzigd, shell-wijziging ontzegd\n"
 
 #: login-utils/chsh.c:163
 #, c-format
@@ -6340,34 +6456,6 @@ msgstr "Gebruik %s -l om de lijst te zien.\n"
 msgid "No known shells.\n"
 msgstr "Geen bekende shells.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kon /dev/urandom niet openen"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kon geen willekeurige gegevens lezen van /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kon %s niet openen om te lezen"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kan %s niet vinden"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s heeft niet de juiste bestandsinstellingen"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kan geen gegevens lezen van %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6375,13 +6463,14 @@ msgstr "Kan %s niet lezen, afsluiten."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "gebruik: last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
+msgstr ""
+"gebruik: last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  nog ingelogd"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6390,15 +6479,15 @@ msgstr ""
 "\n"
 "wtmp begint %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc fout.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6407,51 +6496,45 @@ msgstr ""
 "\n"
 "onderbroken %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAAL: kan tty niet opnieuw openen: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "FATAAL: slechte tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h alleen voor supergebruiker.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "gebruik: login [-fp] [gebruikersnaam]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM fout, afbreken: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kon PAM niet initialiseren: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "inlognaam: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "INLOGGEN %d MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6460,17 +6543,17 @@ msgstr ""
 "Inloggegevens onjuist\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TEVEEL INLOGPOGINGEN (%d) VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "INLOGSESSIE MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6479,7 +6562,7 @@ msgstr ""
 "\n"
 "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6488,135 +6571,120 @@ msgstr ""
 "\n"
 "Sessie instelprobleem, afbreken.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL gebruikersnaam in %s:%d. Afbreken."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Onjuiste gebruikersnaam \"%s\" in %s:%d. Afbreken."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Geheugentekort\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Onjuiste gebruikersnaam"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s inloggen geweigerd vanaf deze terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGEN %s GEWEIGERD VAN %s OP TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGEN %s GEWEIGERD OP TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Er zijn al teveel gebruikers ingelogd.\n"
-"Probeer het later opnieuw.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "U heeft teveel processen draaien.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "INBELLEN BIJ %s DOOR %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN OP %s VAN %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN OP %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN OP %s DOOR %s VAN %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN OP %s DOOR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "U heeft nieuwe e-mail.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "U heeft e-mail.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork() mislukt: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislukt: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() mislukt"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Geen map %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Inloggen met home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: geen geheugen voor shell script.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kon shell script niet uitvoeren: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: geen shell: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6625,65 +6693,65 @@ msgstr ""
 "\n"
 "%s inlognaam: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "inlognaam veel te lang.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAAM te lang"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "inlognamen mogen niet beginnen met '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "teveel losse witregels.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "EXCESSIEVE witregels"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggen is na %d seconden afgebroken vanwege een time-out\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Laatste keer inloggen: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "van %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "op %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "INLOGGEN MISLUKT VAN %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "INLOGGEN MISLUKT OP %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d INLOG MISLUKKINGEN VAN %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d INLOG MISLUKKINGEN OP %s, %s"
@@ -6703,166 +6771,30 @@ msgstr "is n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "gebruik: mesg [j | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Wie bent u?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Die groep bestaat niet."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Toegang geweigerd"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Geen shell"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Het wachtwoord moet uit de volgende categorieen tekens bevatten:\n"
-"hoofd- en kleine letters, cijfers en niet-alfanumerieke tekens.\n"
-"Zie passwd(1) voor meer informatie.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "U kunt niet het oude wachtwoord gebruiken.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Gebruik alstublieft niet iets wat lijkt op uw gebruikersnaam als wachtwoord!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Gebruik alstublieft niet iets wat lijkt op uw echte naam als wachtwoord!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Gebruik: passwd [gebruikersnaam [wachtwoord]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Alleen root mag de een- en twee-argumentsvormen gebruiken.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Gebruik: passwd [-foqsvV] [gebruiker [wachtwoord]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kan niet uitvoeren %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kan inlognaam niet vinden"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Alleen root kan het wachtwoord van anderen wijzigen.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Teveel argumenten.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kan de gebruikersnaam nergens vinden. Is `%s' echt een gebruiker?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Sorry, ik kan alleen lokale wachtwoorden wijzigen. Gebruik yppasswd in plaats hiervan."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID en gebruikersnaam komen niet overeen, bedrieger!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Het wachtwoord van %s wordt gewijzigd\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Geef het oude wachtwoord: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Onjuist wachtwoord, bedrieger."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Geef het nieuwe wachtwoord: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Wachtwoord niet gewijzigd."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Geef opnieuw het nieuwe wachtwoord: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "U heeft het verkeerd ingevoerd. Wachtwoord niet gewijzigd."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "wachtwoord gewijzigd, gebruiker %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT WACHTWOORD GEWIJZIGD"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "wachtwoord gewijzigd door root, gebruiker %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "setpwnam aanroepen om wachtwoord in te stellen.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Wachtwoord *NIET* gewijzigd.  Probeer het later opnieuw.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Wachtwoord gewijzigd.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6909,7 +6841,6 @@ msgstr "opnieuw gestart door %s: %s"
 msgid "halted by %s: %s"
 msgstr "afgesloten door %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6946,7 +6877,6 @@ msgstr "Het programma \"%s\" wordt uitgevoerd ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fout bij uitvoeren\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7036,7 +6966,6 @@ msgstr "fout bij instellen sluiten-bij-uitvoeren op /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fout bij uitvoeren finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fout bij fork() finalprog\n"
@@ -7065,7 +6994,7 @@ msgstr "openen van map mislukt\n"
 msgid "fork failed\n"
 msgstr "fork() mislukt\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1622
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "uitvoeren mislukt\n"
 
@@ -7214,12 +7143,6 @@ msgstr "onjuiste maandwaarde: gebruik 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "onjuiste jaarwaarde: gebruik 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7230,13 +7153,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "gebruik: cal [-13smjyV] [[maand] jaar]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "gebruik: %s [+formaat] [dag maand jaar]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
@@ -7282,8 +7204,11 @@ msgstr "logger: onbekende prioriteitsnaam: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
-msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr "gebruik: logger [-is] [-f bestand] [-p pri] [-t tag] [-u socket] [ bericht ... ]\n"
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"gebruik: logger [-is] [-f bestand] [-p pri] [-t tag] [-u socket] "
+"[ bericht ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
@@ -7365,7 +7290,7 @@ msgstr "%s: hernoemen %s tot %s mislukt: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "gebruik: %s van naar bestanden...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7376,22 +7301,22 @@ msgstr ""
 "Gebruik `%s [opties] %s' als u het echt wilt gebruiken.\n"
 "Script niet gestart.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "gebruik: script [-a] [-f] [-q] [-t] [bestand]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script gestart, bestand is %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script gestart op %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7400,254 +7325,253 @@ msgstr ""
 "\n"
 "Script gedaan op %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script gedaan, bestand is %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty mislukt\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Tekort aan pty's\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argument fout, gebruik\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_naam ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-AANTAL_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-AANTAL_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dump_bestandsnaam ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan stroombesparingsmodus niet instellen\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl fout: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fout bij lezen %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fout bij schrijven schermafdruk\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kon %s niet lezen, en ioctl() mislukt voor meer informatie\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM is niet gedefinieerd.\n"
@@ -7707,51 +7631,54 @@ msgstr "Bericht van %s@%s (als %s) op %s bij %s ..."
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Bericht van %s@%s op %s bij %s ..."
 
-#: mount/fstab.c:135
+#: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "waarschuwing: fout bij lezen %s: %s"
 
-#: mount/fstab.c:163 mount/fstab.c:188
+#: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "waarschuwing: kan %s niet openen: %s"
 
-#: mount/fstab.c:168
+#: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kon %s niet openen - gebruik %s in plaats daarvan\n"
 
-#: mount/fstab.c:472
+#: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "kan het blokkeerbestand %s niet maken: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan het blokkeerbestand %s niet maken: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:487
+#: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:499
+#: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "kan blokkeerbestand %s niet openen: %s (gebruik -n optie om te forceren)"
+msgstr ""
+"kan blokkeerbestand %s niet openen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:514
+#: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan blokkeerbestand %s niet blokkeren: %s\n"
 
-#: mount/fstab.c:526
+#: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan blokkeerbestand %s niet blokkeren: %s"
 
-#: mount/fstab.c:528
+#: mount/fstab.c:540
 msgid "timed out"
 msgstr "time-out"
 
-#: mount/fstab.c:535
+#: mount/fstab.c:547
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7760,22 +7687,22 @@ msgstr ""
 "Kan koppeling %s niet maken\n"
 "Mogelijk is er een oud blokkeerbestand?\n"
 
-#: mount/fstab.c:584 mount/fstab.c:622
+#: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan %s niet openen (%s) - mtab niet bijgewerkt"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fout bij schrijven %s: %s"
 
-#: mount/fstab.c:640
+#: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fout bij wijzigen modus van %s: %s\n"
 
-#: mount/fstab.c:658
+#: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
@@ -7832,7 +7759,8 @@ msgid ""
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 "%s: Kon geen enkel lus-apparaat vinden. Misschien weet deze kernel niets\n"
-"       over het lus-apparaat? (Als dat zo is kunt u die opnieuw compileren of een\n"
+"       over het lus-apparaat? (Als dat zo is kunt u die opnieuw compileren "
+"of een\n"
 "        `modprobe loop' doen.)"
 
 #: mount/lomount.c:189
@@ -7845,27 +7773,29 @@ msgstr "%s: kon geen enkel vrij lus-apparaat vinden"
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan niet blokkeren in geheugen, afsluiten.\n"
 
-#: mount/lomount.c:341
+#: mount/lomount.c:340
 #, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): succesvol\n"
 
-#: mount/lomount.c:352
+#: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kan apparaat %s niet verwijderen: %s\n"
 
-#: mount/lomount.c:362
+#: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): succes\n"
 
-#: mount/lomount.c:370
+#: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Deze versie van mount is gecompileerd zonder lus ondersteuning. Hercompileer alstublieft.\n"
+msgstr ""
+"Deze versie van mount is gecompileerd zonder lus ondersteuning. Hercompileer "
+"alstublieft.\n"
 
-#: mount/lomount.c:407
+#: mount/lomount.c:406
 #, c-format
 msgid ""
 "usage:\n"
@@ -7880,16 +7810,17 @@ msgstr ""
 "  %s -f# ongebruikte vinden\n"
 "  %s [ -e codering ] [ -o plaats ] {-f|lus_apparaat} bestand # instellen\n"
 
-#: mount/lomount.c:426 mount/sundries.c:30 mount/sundries.c:41
-#: mount/sundries.c:56 mount/sundries.c:259
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
 msgstr "niet voldoende geheugen"
 
-#: mount/lomount.c:541
+#: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "Er was geen lus-ondersteuning beschikbaar bij het compileren. Hercompileer alstublieft.\n"
+msgstr ""
+"Er was geen lus-ondersteuning beschikbaar bij het compileren. Hercompileer "
+"alstublieft.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -7905,166 +7836,186 @@ msgstr "[mntent]: regel %d in %s is slecht%s\n"
 msgid "; rest of file ignored"
 msgstr "; rest van bestand genegeerd"
 
-#: mount/mount.c:381
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: fout: het label %s komt voor op %s èn op %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: mounten van %s via UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: mounten van %s via label\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: kon %s niet openen; UUID en LABEL conversie kon dus niet worden gedaan.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: slechte UUID"
+
+#: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:386
+#: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:406
+#: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:423 mount/mount.c:676
+#: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fout bij schrijven %s: %s"
 
-#: mount/mount.c:431
+#: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fout bij wijzigen modus van %s: %s"
 
-#: mount/mount.c:482
+#: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ziet er uit al wisselgeheugen - niet aangekoppeld"
 
-#: mount/mount.c:569
+#: mount/mount.c:570
 msgid "mount failed"
 msgstr "aankoppelen mislukt"
 
-#: mount/mount.c:571
+#: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: alleen root kan %s aankoppelen op %s"
 
-#: mount/mount.c:599
+#: mount/mount.c:600
 msgid "mount: loop device specified twice"
 msgstr "mount: lus-apparaat twee keer aangegeven"
 
-#: mount/mount.c:604
+#: mount/mount.c:605
 msgid "mount: type specified twice"
 msgstr "mount: soort twee keer aangegeven"
 
-#: mount/mount.c:616
+#: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 
-#: mount/mount.c:625
+#: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: het lus-apparaat %s wordt gebruikt\n"
 
-#: mount/mount.c:630
+#: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: instellen lus-apparaat mislukt\n"
 
-#: mount/mount.c:634
+#: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: instellen lus-apparaat succesvol\n"
 
-#: mount/mount.c:671
+#: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:692
+#: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument voor -p of --pass-fd moet een getal zijn"
 
-#: mount/mount.c:705
+#: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:708
+#: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:762 mount/mount.c:1347
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork() mislukt: %s"
 
-#: mount/mount.c:850
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: deze versie is gecompileerd zonder ondersteuning voor de soort `nfs'"
-
-#: mount/mount.c:890
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: mislukt met nfs mount versie 4, probeer nu 3..\n"
 
-#: mount/mount.c:901
-msgid "mount: I could not determine the filesystem type, and none was specified"
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Kon bestandssysteemsoort niet bepalen, en geen aangegeven"
 
-#: mount/mount.c:904
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: u moet de bestandssysteem soort aangeven"
 
-#. should not happen
-#: mount/mount.c:907
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: aankoppelen mislukt"
 
-#: mount/mount.c:913 mount/mount.c:948
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: aankoppelingspunt %s is geen map"
 
-#: mount/mount.c:915
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: toegang geweigerd"
 
-#: mount/mount.c:917
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: moet supergebruiker zijn om mount te gebruiken"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:921 mount/mount.c:925
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s is bezig"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:927
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc al aangekoppeld"
 
-#: mount/mount.c:929
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s al aangekoppeld of %s bezig"
 
-#: mount/mount.c:935
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: aankoppelingspunt %s bestaat niet"
 
-#: mount/mount.c:937
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: aankoppelingspunt %s is een symbolische koppeling die nergens naar wijst"
+msgstr ""
+"mount: aankoppelingspunt %s is een symbolische koppeling die nergens naar "
+"wijst"
 
-#: mount/mount.c:940
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciale apparaat %s bestaat niet"
 
-#: mount/mount.c:950
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8073,12 +8024,12 @@ msgstr ""
 "mount: speciale apparaat %s bestaat niet\n"
 "       (een pad voorvoegsel is geen map)\n"
 
-#: mount/mount.c:963
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s nog niet aangekoppeld, of slechte optie"
 
-#: mount/mount.c:965
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8087,7 +8038,7 @@ msgstr ""
 "mount: slecht soort bestandssysteem, slechte optie, slecht superblok op %s,\n"
 "       ontbrekende codepagina of andere fout"
 
-#: mount/mount.c:975
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8095,7 +8046,7 @@ msgstr ""
 "       (kan dit het IDE-apparaat zijn waar u in feite ide-scsi\n"
 "gebruikt zodat sr0 of sda ofzo nodig is?)"
 
-#: mount/mount.c:981
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8103,7 +8054,7 @@ msgstr ""
 "       (bent u niet aan het proberen een uitgebreide partitie\n"
 "te mounten in plaats van een logische partitie binenin?)"
 
-#: mount/mount.c:998
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8111,50 +8062,51 @@ msgstr ""
 "       In sommige gevallen wordt er nuttige informatie gevonden in syslog\n"
 "- probeer dmesg | tail ofzo\n"
 
-#: mount/mount.c:1004
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "aankoppelingstabel vol"
 
-#: mount/mount.c:1006
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan superblok niet lezen"
 
-#: mount/mount.c:1010
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: onbekend apparaat"
 
-#: mount/mount.c:1015
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: onbekend soort bestanssysteem '%s'"
 
-#: mount/mount.c:1027
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: waarschijnlijk bedoelde u %s"
 
-#: mount/mount.c:1029
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mogelijk bedoelde u 'iso9660'?"
 
-#: mount/mount.c:1031
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mogelijk bedoelde u 'vfat'?"
 
-#: mount/mount.c:1034
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount: %s heeft onjuist apparaatnummer of bestandssysteem soort %s niet ondersteund"
+msgstr ""
+"mount: %s heeft onjuist apparaatnummer of bestandssysteem soort %s niet "
+"ondersteund"
 
-#. strange ...
-#: mount/mount.c:1040
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s is geen blok-apparaat, en stat mislukt?"
 
-#: mount/mount.c:1042
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8163,71 +8115,67 @@ msgstr ""
 "mount: de kernel herkent %s niet als een blok-apparaat\n"
 "       (misschien `insmod stuurprogramma'?)"
 
-#: mount/mount.c:1045
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s is geen blok-apparaat (misschien `-o loop' proberen?)"
 
-#: mount/mount.c:1048
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s is geen blok-apparaat"
 
-#: mount/mount.c:1051
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s is geen geldig blok-apparaat"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1054
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blok-apparaat "
 
-#: mount/mount.c:1056
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan %s%s niet alleen-lezen aankoppelen"
 
-#: mount/mount.c:1060
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s is schrijf-beveiligd maar expliciete `-w' optie gegeven"
 
-#: mount/mount.c:1077
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s is schrijf-beveiligd, alleen-lezen aankoppelen"
 
-#: mount/mount.c:1176
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: geen soort gegeven - Ik neem aan nfs, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1182
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: geen soort gegeven - Ik neem aan smbfs, vanwege het // voorvoegsel\n"
+msgstr ""
+"mount: geen soort gegeven - Ik neem aan smbfs, vanwege het // voorvoegsel\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1199
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: op de achtergrond \"%s\"\n"
 
-#: mount/mount.c:1210
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ik geef het op voor \"%s\"\n"
 
-#: mount/mount.c:1292
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s al aangekoppeld op %s\n"
 
-#: mount/mount.c:1425
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8264,7 +8212,8 @@ msgstr ""
 "         mount map             : bekend apparaat hier aankoppelen\n"
 "         mount -t soort apparaat map : standaard mount opdracht\n"
 "Let op dat men niet echt een apparaat aankoppeld, maar eigenlijk een\n"
-"bestandssysteem (van gegeven soort) dat op dat apparaat kan worden gevonden.\n"
+"bestandssysteem (van gegeven soort) dat op dat apparaat kan worden "
+"gevonden.\n"
 "Men kan ook een reeds zichtbare mappenboom ergens anders aankoppelen:\n"
 "       mount --bind oudemap nieuwemap\n"
 "of een subboom verplaatsen:\n"
@@ -8274,47 +8223,38 @@ msgstr ""
 "Andere opties: [-nfFrsvw] [-o opties] [-p wachtwoordfd].\n"
 "Voor meer informatie, zie  man 8 mount .\n"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: alleen root kan dat doen"
 
-#: mount/mount.c:1619
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: geen %s gevonden - nu aanmaken..\n"
 
-#: mount/mount.c:1631
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:1633
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: aankoppelen %s\n"
 
-#: mount/mount.c:1642
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "niets aangekoppeld"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan %s niet vinden in %s"
 
-#: mount/mount.c:1672
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan %s niet vinden in %s of %s"
 
-#: mount/mount_by_label.c:190
-#, c-format
-msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: kon %s niet openen; UUID en LABEL conversie kon dus niet worden gedaan.\n"
-
-#: mount/mount_by_label.c:313
-msgid "mount: bad UUID"
-msgstr "mount: slechte UUID"
-
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
@@ -8345,120 +8285,120 @@ msgstr "       Ik zal soort %s proberen\n"
 msgid "Trying %s\n"
 msgstr "Proberen %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: excessief lang host:map argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: waarschuwing: meerdere hostnamen niet ondersteund\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: aan te koppelen map niet in host:map formaat\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kan geen adres verkrijgen voor %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: slechte hp->h_length gekregen\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: excessief lang optie argument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Waarschuwing: Niet herkende proto= optie.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Waarschuwing: Optie namlen niet ondersteund.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "onbekend nfs mount parameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Waarschuwing: optie nolock niet ondersteund.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "onbekende nfs mount optie: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: slechte hp->h_length gekregen?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS over TCP is niet ondersteund.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs server zei dat de voorziening niet beschikbaar is"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "portmapper gebruikt voor vinden NFS poort\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "gebruiken poort %d voor nfs deamon\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs verbinden"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "onbekende nfs status resultaatwaarde: %d"
 
-#: mount/sundries.c:66
+#: mount/sundries.c:26
 msgid "bug in xstrndup call"
 msgstr "programmeerfout in aanroep xstrndup"
 
-#: mount/swapon.c:54
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
 "gebruik: %s [-hV]\n"
 "         %s -a [-e] [-v]\n"
-"         %s [-v] [-p prioriteit] speciaal ...\n"
+"         %s [-v] [-p prioriteit] speciaal|LABEL=volume_naam ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8469,133 +8409,137 @@ msgstr ""
 "         %s -a [-v]\n"
 "         %s [-v] speciaal ...\n"
 
-#: mount/swapon.c:170 mount/swapon.c:234
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s op %s\n"
 
-#: mount/swapon.c:174
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
-msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: kan %s niet vinden: %s\n"
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: kan geen apparaat vinden voor %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: waarschuwing: %s heeft onveilige toegangsrechten %04o, %04o aangeraden\n"
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: kan de status van %s niet opvragen: %s\n"
 
-#: mount/swapon.c:197
+#: mount/swapon.c:195
 #, c-format
-msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: Overslaan bestand %s - het lijkt gaten te hebben.\n"
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr ""
+"%s: waarschuwing: %s heeft onveilige toegangsrechten %04o, %04o aangeraden\n"
 
-#: mount/swapon.c:240
+#: mount/swapon.c:207
+#, c-format
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: Overslaan bestand %s - het lijkt gaten te hebben.\n"
+
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Geen supergebruiker.\n"
 
-#: mount/swapon.c:304 mount/swapon.c:400
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: niet %s niet openen: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: gecompileerd zonder ondersteuning voor -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan %s niet vorken"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, map: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kan geen adres krijgen voor %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: slechte hostp->h_length gekregen\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ongeldig blok-apparaat"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: niet aangekoppeld"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan niet schrijven naar superblok"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: apparaat is bezig"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: niet gevonden"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: moet supergebruiker zijn om te ontkoppelen"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2, proberen umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kon %s niet ontkoppelen - proberen %s in plaats daarvan\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s bezig - alleen-lezen her-aangekoppeld\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kon %s niet alleen-lezen her-aankoppelen\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ontkoppeld\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8603,50 +8547,50 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Gebruik: umount [-hV]\n"
-"         umount -a [-f] [-r] [-n] [-v] [-t vbestandssysteensoorten] [-O opties]\n"
+"         umount -a [-f] [-r] [-n] [-v] [-t vbestandssysteensoorten] [-O "
+"opties]\n"
 "         umount [-f] [-r] [-n] [-v] speciaal | node...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "kan \"\" niet unmounten\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Proberen te ontkoppelen %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kon %s niet vinden in mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:576
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
-#: mount/umount.c:589
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:593
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s aankoppeling komt niet overeen met fstab"
 
-#: mount/umount.c:634
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen %s kan %s ontkoppelen van %s"
 
-#: mount/umount.c:715
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
@@ -8673,10 +8617,12 @@ msgstr ""
 #: sys-utils/cytune.c:126
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Bestand %s, For drempelwaarde %lu en time-out waarde %lu, maximum tekens in fifo was %d,\n"
+"Bestand %s, For drempelwaarde %lu en time-out waarde %lu, maximum tekens in "
+"fifo was %d,\n"
 "en maximale overdrachtssnelheid in tekens/seconde was %f\n"
 
 #: sys-utils/cytune.c:190
@@ -8706,8 +8652,12 @@ msgstr "Onjuiste standaardwaarde tijdsinstelling: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
-msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
-msgstr "Gebruik: %s [-q [-i interval]] ([-s waarde]|[-S waarde]) ([-t waarde]|[-T waarde]) [-g|-G] bestand [bestand...]\n"
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Gebruik: %s [-q [-i interval]] ([-s waarde]|[-S waarde]) ([-t waarde]|[-T "
+"waarde]) [-g|-G] bestand [bestand...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -8760,8 +8710,10 @@ msgstr "Kan CYGETMON niet uitvoeren op %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu/%lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu/%lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -8770,8 +8722,10 @@ msgstr "   %f int/sec; %f ontvangen, %f verzonden (tekens/sec)\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ints, %lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:436
 #, c-format
@@ -8783,6 +8737,19 @@ msgstr "   %f int/sec; %f ontvangen (tekens/sec)\n"
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Gebruik: %s [-c] [-n niveau] [-s bufgrootte]\n"
 
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: onbekende optie, afbreken.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"Gebruik flock [--shared | --timeout=seconden] bestandsnaam commando {arg "
+"arg ...}\n"
+
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
@@ -8886,8 +8853,10 @@ msgstr "\t%s -h voor hulp.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s geeft informatie over ipc voorzieningen waarvoor u leestoegang heeft.\n"
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s geeft informatie over ipc voorzieningen waarvoor u leestoegang heeft.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -8946,8 +8915,6 @@ msgstr "kernel niet ingesteld voor gedeeld geheugen\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Grenzen gedeeld geheugen --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9445,11 +9412,14 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "gebruik: rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
+msgstr ""
+"gebruik: rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (of rdev /linux, etc.) geeft huidige ROOT apparaat aan"
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (of rdev /linux, etc.) geeft huidige ROOT apparaat aan"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9457,7 +9427,8 @@ msgstr "  rdev /dev/fd0 /dev/hda2         stelt ROOT in op /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              stelt de ROOTFLAGS in (alleen-lezen status)"
+msgstr ""
+"  rdev -R /dev/fd0 1              stelt de ROOTFLAGS in (alleen-lezen status)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9484,12 +9455,17 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     zelfde als rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr "Let op: video modes zijn: -3=Vraag, -2=Uitgebreid, -1=GewoonVga, 1=sleutel1, 2=sleutel2,..."
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Let op: video modes zijn: -3=Vraag, -2=Uitgebreid, -1=GewoonVga, 1=sleutel1, "
+"2=sleutel2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      gebruik -R 1 om root alleen-lezen aan te koppelen, -R 0 voor lezen/schrijven."
+msgstr ""
+"      gebruik -R 1 om root alleen-lezen aan te koppelen, -R 0 voor lezen/"
+"schrijven."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9562,8 +9538,11 @@ msgstr "totaal"
 
 #: sys-utils/renice.c:68
 #, c-format
-msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "gebruik: renice prioriteit [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] gebruikers ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"gebruik: renice prioriteit [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"gebruikers ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9600,7 +9579,8 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Gebruik: %s <apparaat> [ -i <IRQ> | -t <TIJD> | -c <TEKENS> | -w <WACHTEN> | \n"
+"Gebruik: %s <apparaat> [ -i <IRQ> | -t <TIJD> | -c <TEKENS> | -w <WACHTEN> "
+"| \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9716,20 +9696,23 @@ msgstr "hexdump: slechte waarde voor overslaan.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr "hexdump: [-bcCdovx] [-e fmt] [-f formaat_bestand] [-n lengte] [-s overslaan] [bestand ...]\n"
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f formaat_bestand] [-n lengte] [-s overslaan] "
+"[bestand ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "gebruik: %s [-dflpcsu] [+regelnummer | +/patroon] naam1 naam2 ...\n"
 
-#: text-utils/more.c:485
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: onbekende optie \"'-%c\"\n"
 
-#: text-utils/more.c:517
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9740,8 +9723,7 @@ msgstr ""
 "*** %s: map ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:560
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9752,45 +9734,45 @@ msgstr ""
 "******** %s: Geen tekstbestand ********\n"
 "\n"
 
-#: text-utils/more.c:663
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Gebruik q of Q om af te sluiten]"
 
-#: text-utils/more.c:755
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Meer--"
 
-#: text-utils/more.c:757
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Volgende bestand: %s)"
 
-#: text-utils/more.c:762
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Druk op de spatiebalk om door te gaan, 'q' om af te sluiten.]"
 
-#: text-utils/more.c:1161
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...%d pagina's terug"
 
-#: text-utils/more.c:1163
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...1 pagina terug"
 
-#: text-utils/more.c:1206
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...1 regel overslaan"
 
-#: text-utils/more.c:1208
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...%d regels overslaan"
 
-#: text-utils/more.c:1245
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9800,17 +9782,19 @@ msgstr ""
 "***Terug***\n"
 "\n"
 
-#: text-utils/more.c:1283
+#: text-utils/more.c:1237
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"De meeste opdrachten optioneel voorafgegaan door gehele getallen (k).  Standaard tussen haakjes.\n"
+"De meeste opdrachten optioneel voorafgegaan door gehele getallen (k).  "
+"Standaard tussen haakjes.\n"
 "Ster (*) geeft aan dat argument de nieuwe standaardinstelling wordt.\n"
 
-#: text-utils/more.c:1290
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9832,54 +9816,61 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<spatie>                 Geef volgende k regels weer van tekst [huidige schermgrootte]\n"
-"z                       Geef volgende k regels weer van tekst [huidige schermgrootte]*\n"
+"<spatie>                 Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]\n"
+"z                       Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]*\n"
 "<enter>                Geef volgende k regels weer van tekst [1]*\n"
-"d of ctrl-D             Schuif k regels op [huidige schuifgrootte, in het begin 11]*\n"
+"d of ctrl-D             Schuif k regels op [huidige schuifgrootte, in het "
+"begin 11]*\n"
 "q of Q of <interrupt>   Afsluiten voor meer\n"
 "s                       Naar voren k regels overslaan [1]\n"
 "f                       Naar voren k schermen overslaan [1]\n"
 "b of ctrl-B             Naar achteren k schermen overslaan [1]\n"
-"'                       Ga naar de plaats waar de vorige zoekopdracht startte\n"
+"'                       Ga naar de plaats waar de vorige zoekopdracht "
+"startte\n"
 "=                       Geef huidige regelnummer weer\n"
-"/<reguliere uitdrukking>   Zoek de kde overeenkomst van reguliere uitdrukking [1]\n"
-"n                       Zoek de kde overeenkomst van vorige reguliere uitdrukking [1]\n"
+"/<reguliere uitdrukking>   Zoek de kde overeenkomst van reguliere "
+"uitdrukking [1]\n"
+"n                       Zoek de kde overeenkomst van vorige reguliere "
+"uitdrukking [1]\n"
 "!<cmd> of :!<cmd>       Voer <cmd> uit in een subshell\n"
 "v                       Start /usr/bin/vi op de huidige regel\n"
 "ctrl-L                  Teken het scherm opnieuw\n"
 ":n                      Ga naar het kde volgende bestand [1]\n"
 ":p                      Ga naar het kde vorige bestand [1]\n"
-":f                      Geef de huidige bestandsnaam en het regelnummer weer\n"
+":f                      Geef de huidige bestandsnaam en het regelnummer "
+"weer\n"
 ".                       Herhaal de vorige opdracht\n"
 
-#: text-utils/more.c:1359 text-utils/more.c:1364
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Druk op 'h' voor instructies.]"
 
-#: text-utils/more.c:1398
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" regel %d"
 
-#: text-utils/more.c:1400
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Geen bestand] regel %d"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Overloop\n"
 
-#: text-utils/more.c:1531
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...overslaan\n"
 
-#: text-utils/more.c:1560
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Reguliere uitdrukking knoeiwerk"
 
-#: text-utils/more.c:1572
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9887,15 +9878,15 @@ msgstr ""
 "\n"
 "Patroon niet gevonden\n"
 
-#: text-utils/more.c:1575 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Patroon niet gevonden"
 
-#: text-utils/more.c:1636
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kan niet fork()\n"
 
-#: text-utils/more.c:1675
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -9903,19 +9894,19 @@ msgstr ""
 "\n"
 "...Overslaan "
 
-#: text-utils/more.c:1679
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Overslaan tot bestand "
 
-#: text-utils/more.c:1681
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Overslaan terug naar bestand "
 
-#: text-utils/more.c:1959
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Regels te lang"
 
-#: text-utils/more.c:2002
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Geen vorige opdracht om voor te vervangen"
 
@@ -9968,89 +9959,89 @@ msgstr "hexdump: slecht formaat {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: slecht conversieteken %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
-msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr "%s: Gebruik: %s [-number] [-p tekst] [-cefnrs] [+regel] [+/patroon/] [bestanden]\n"
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Gebruik: %s [-number] [-p tekst] [-cefnrs] [+regel] [+/patroon/] "
+"[bestanden]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: optie vereist een argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: onjuiste optie -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...overslaan naar voren\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...overslaan naar achteren\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Geen volgend bestand"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Geen vorig bestand"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Leesfout bestand %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Onverwacht EOF in bestand %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Onbekende fout in bestand %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan geen tijdelijk bestand maken\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE fout: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Geen onthouden zoektekst"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kan niet openen "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "opgeslagen"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !opdracht niet toegestaan in rflag modus.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislukt, probeer het later opnieuw\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Volgende bestand: "
 
@@ -10064,6 +10055,16 @@ msgstr "Reserveren bufferruimte mislukt\n"
 msgid "usage: rev [file ...]\n"
 msgstr "gebruik: rev [bestand ...]\n"
 
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "Kan \"%s\" niet openen voor lezen\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "Gebruik: tailf logbestand\n"
+
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
@@ -10093,3 +10094,159 @@ msgstr "Invoerregel te lang.\n"
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "Geheugentekort bij groeiende buffer.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Onjuist getal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxis fout: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Zo'n parameter bestaat niet: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] apparaat naam\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] apparaat grootte sect koppen sporen strekken gat ratio spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] apparaat\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] apparaat\n"
+
+#~ msgid "version"
+#~ msgstr "versie"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kon /dev/urandom niet openen"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kon geen willekeurige gegevens lezen van /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kon %s niet openen om te lezen"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kan %s niet vinden"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s heeft niet de juiste bestandsinstellingen"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kan geen gegevens lezen van %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Er zijn al teveel gebruikers ingelogd.\n"
+#~ "Probeer het later opnieuw.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "U heeft teveel processen draaien.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Het wachtwoord moet uit de volgende categorieen tekens bevatten:\n"
+#~ "hoofd- en kleine letters, cijfers en niet-alfanumerieke tekens.\n"
+#~ "Zie passwd(1) voor meer informatie.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "U kunt niet het oude wachtwoord gebruiken.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "Gebruik alstublieft niet iets wat lijkt op uw gebruikersnaam als "
+#~ "wachtwoord!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "Gebruik alstublieft niet iets wat lijkt op uw echte naam als wachtwoord!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Gebruik: passwd [gebruikersnaam [wachtwoord]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Alleen root mag de een- en twee-argumentsvormen gebruiken.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Gebruik: passwd [-foqsvV] [gebruiker [wachtwoord]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kan niet uitvoeren %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kan inlognaam niet vinden"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Alleen root kan het wachtwoord van anderen wijzigen.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Teveel argumenten.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Kan de gebruikersnaam nergens vinden. Is `%s' echt een gebruiker?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Sorry, ik kan alleen lokale wachtwoorden wijzigen. Gebruik yppasswd in "
+#~ "plaats hiervan."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID en gebruikersnaam komen niet overeen, bedrieger!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Het wachtwoord van %s wordt gewijzigd\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Geef het oude wachtwoord: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Onjuist wachtwoord, bedrieger."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Geef het nieuwe wachtwoord: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Wachtwoord niet gewijzigd."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Geef opnieuw het nieuwe wachtwoord: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "U heeft het verkeerd ingevoerd. Wachtwoord niet gewijzigd."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "wachtwoord gewijzigd, gebruiker %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT WACHTWOORD GEWIJZIGD"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "wachtwoord gewijzigd door root, gebruiker %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "setpwnam aanroepen om wachtwoord in te stellen.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Wachtwoord *NIET* gewijzigd.  Probeer het later opnieuw.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Wachtwoord gewijzigd.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr ""
+#~ "mount: deze versie is gecompileerd zonder ondersteuning voor de soort "
+#~ "`nfs'"
diff --git a/po/po2tbl.sed b/po/po2tbl.sed
deleted file mode 100644
index b3bcca4d7..000000000
--- a/po/po2tbl.sed
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-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
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  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/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 000000000..5cbc70a0c
--- /dev/null
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e92b25ca4..ed285a8f5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -124,7 +124,7 @@ msgstr "%s: erro de leitura em %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Uso:\n"
@@ -168,13 +168,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -199,7 +198,7 @@ msgstr "Dupla"
 msgid "Single"
 msgstr "Simples"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -209,97 +208,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, fuzzy, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, fuzzy, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, fuzzy, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: n�o compilado com suporte a minix v2\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, fuzzy, c-format
 msgid "%s is not a block device or file\n"
 msgstr "mount: %s n�o � um dispositivo de blocos"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: op��o erro de parser\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -777,7 +776,7 @@ msgstr "muitos inodes - m�ximo � 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pouco espa�o, � necess�rio pelo menos %lu blocos"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -846,19 +845,19 @@ msgstr "erro gravando .. entrada"
 msgid "error closing %s"
 msgstr "erro fechando %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Uso: mkfs [-V] [-t tipoSistArq] [op��es-sistArq] dispositivo [tamanho]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: mem�ria insuficiente!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs vers�o %s (%s)\n"
@@ -901,7 +900,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -954,10 +952,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, fuzzy, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1030,7 +1024,6 @@ msgstr "n�o foi poss�vel gravar inodes"
 msgid "write failed in write_block"
 msgstr "grava��o falhou em write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1066,7 +1059,7 @@ msgstr "busca falhou durante teste de blocos"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
@@ -1110,107 +1103,107 @@ msgstr "n�o foi poss�vel stat %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "n�o ser� tentado criar sistema de arquivos em '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Tamanho de p�gina especificado pelo usu�rio %d inv�lido\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Usando tamanho de p�gina especificado pelo usu�rio %d, em vez dos valores do "
 "sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Assumindo p�ginas de tamanho %d (n�o %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "r�tulo"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTamP�g] dispositivo [blocos]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "n�mero excessivo de p�ginas inv�lidas"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Mem�ria insuficiente"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "uma p�gina inv�lida\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d p�ginas inv�lidas\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s - erro: nenhum lugar para ativar permuta (swap)?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: erro - tamanho %ld � maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s - erro: vers�o %d desconhecida\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s - erro: a �rea de permuta (swap) precisa ter pelo menos %ld kB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s -- aviso: reduzindo �rea de permuta (swap) para %ld kB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s - erro: nenhum lugar para ativar permuta (swap)?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "N�o ser� tentado criar dispositivo de permuta (swap) em '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "fatal: primeira p�gina ileg�vel"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1225,126 +1218,88 @@ msgstr ""
 "dispositivo, use\n"
 "a op��o -f para for�ar a cria��o.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "N�o foi poss�vel configurar espa�o de permuta (swap): ileg�vel"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espa�o de permuta (swap) vers�o %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "N�o foi poss�vel rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "N�o foi poss�vel gravar a p�gina de assinatura"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync falhou"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "N�mero inv�lido: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Erro de sintaxe: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "N�o h� tal par�metro definido: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "Uso: %s [ -p ] dispositivo\n"
-
-#: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] disp tam set cabe� trilhas ext   interv taxa spec1 "
-"fmt_interv\n"
-
-#: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] disp\n"
-
-#: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] disp\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Inutiliz�vel"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Espa�o livre"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "HPFS do OS/2"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "IFS do OS/2"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reinicialize o sistema para assegurar que a tabela de parti��es seja "
 "atualizada corretamente.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1357,334 +1312,315 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do cfdisk para obter informa��es adicionais.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "N�o foi poss�vel ler a unidade de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "N�o foi poss�vel gravar na unidade de disco"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "N�mero excessivo de parti��es"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "A parti��o come�a antes do setor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "A parti��o termina antes do setor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "A parti��o come�a depois do fim do disco"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "A parti��o se estende at� depois do fim do disco"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "parti��es l�gicas fora da ordem do disco"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "parti��es l�gicas sobrepostas"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "parti��es l�gicas aumentadas sobrepostas"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "!!!! Erro interno ao criar unidade l�gica sem parti��o estendida !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "N�o � poss�vel criar unidade l�gica aqui -- criaria duas parti��es estendidas"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu longo demais. O menu pode ficar com aspecto estranho."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sem dire��o. Assumindo horizontal como padr�o."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Tecla ilegal"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Prim�ria"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Cria uma nova parti��o prim�ria"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "L�gica"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Cria uma nova parti��o l�gica"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "N�o criar uma parti��o"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Erro interno !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Tamanho (em MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "In�cio"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Adicionar parti��o no in�cio do espa�o livre"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Fim"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Adicionar parti��o no final do espa�o livre"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Espa�o insuficiente para cria��o de parti��o estendida"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Assinatura inv�lida na tabela de parti��es"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Mostrar somente a tabela de parti��es"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 "Foram especificados mais cilindros do que a quantidade que cabe no disco"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "N�o foi poss�vel abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aberto somente para leitura - voc� n�o tem permiss�o para gravar"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "N�o foi poss�vel obter o tamanho do disco"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Parti��o prim�ria inv�lida"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Parti��o l�gica inv�lida"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Tem certeza de que deseja gravar a tabela de parti��es no disco? (sim ou "
 "nao):"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "A tabela de parti��es N�O foi gravada no disco"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de parti��es no disco..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "A tabela de parti��es foi gravada no disco"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabela de parti��es gravada, mas a releitura da tabela falhou. Reinicialize "
 "para atualizar a tabela."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "N�o existem parti��es prim�rias marcadas como inicializ�veis. MBR DOS n�o "
 "pode inicializar isso."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Mais de uma parti��o prim�ria est� marcada como inicializ�vel. MBR DOS n�o "
 "pode inicializar isso."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Digite um nome de arquivo ou pressione ENTER para exibir na tela: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "N�o foi poss�vel abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/l�g"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Prim�ria"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   L�gica"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Conclu�do"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de parti��es de %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Prim.    �lt.\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1693,7 +1629,7 @@ msgstr ""
 " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
 "Op��es\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1702,481 +1638,478 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- In�cio ---       ---- Fim ----       N�m. inicial de\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Ops.  Cab. Set. Cil.  ID  Cab. Set. Cil.   Setor   Setores\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de parti��es"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "N�o mostrar a tabela"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Este � o cfdisk, um programa de particionamento de disco baseado em fun��es "
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "curses, que permite criar, excluir e alterar parti��es na unidade"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "de disco r�gido."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Alterna a op��o da parti��o atual como inicializ�vel."
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a parti��o atual."
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Altera par�metros de cilindros, cabe�as, setores por trilha"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVISO: Esta op��o s� deve ser usada por pessoas que"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que est�o fazendo."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da parti��o atual."
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a parti��o incompat�vel com"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova parti��o a partir do espa�o livre."
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Mostra a tabela de parti��es na tela ou em um arquivo."
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             uma parti��o:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Dados brutos (exatamente o que seria gravado no disco)."
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de parti��es."
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibi��o do tamanho das parti��es."
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Grava tabela de parti��es no disco (� necess�rio usar W "
 "mai�sculo)."
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Como esta op��o pode destruir dados no disco, voc� deve"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a grava��o indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `n�o'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a parti��o anterior."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Seta p/ baixo    Move o cursor para a pr�xima parti��o."
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Todos os comandos podem ser digitados em letras mai�sculas ou"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "min�sculas (exceto W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Cabe�as"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabe�as"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Conclu�do"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "A altera��o da geometria foi conclu�da"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Digite o n�mero de cilindros: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inv�lido"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Digite o n�mero de cabe�as: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Valor de cabe�as inv�lido"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o n�mero de setores por trilha: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Valor de setores inv�lido"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "N�o foi poss�vel alterar o tipo de sistema de arquivos para vazio"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "N�o foi poss�vel alterar o tipo de sistema de arquivos para estendido"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/l�g"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconhecido (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabe�as: %d  Setores por Trilha: %d  Cilindros: %d"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Op��es"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[R�tulo]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a op��o da parti��o atual como inicializ�vel"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Excluir a parti��o atual"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usu�rios avan�ados)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximizar o uso de disco para a parti��o atual (somente para usu�rios "
 "avan�ados)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Criar nova parti��o a partir do espa�o livre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Mostrar tabela de parti��es na tela ou imprimir em um arquivo"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de parti��es"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Alterar o tipo do sistema de arquivos (DOS, Linux, OS/2 e outros)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mudar unidades mostradas para o tamanho das parti��es (MB, setores, "
 "cilindros)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Gravar tabela de parti��es no disco (isto poder� destruir dados)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "N�o foi poss�vel tornar esta parti��o inicializ�vel."
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "N�o foi poss�vel excluir uma parti��o vazia"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "N�o foi poss�vel maximizar esta parti��o"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Esta parti��o � inutiliz�vel"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Esta parti��o j� est� sendo usada"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "N�o foi poss�vel alterar o tipo de uma parti��o vazia"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Sem mais parti��es"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Comando inv�lido"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2250,9 +2183,9 @@ msgstr ""
 "\n"
 "R�tulo BSD do dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Comando - a��o"
 
@@ -2272,10 +2205,9 @@ msgstr "   i   instala c�digo de inicializa��o (bootstrap)"
 msgid "   l   list known filesystem types"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
@@ -2287,14 +2219,14 @@ msgstr "   n   cria uma nova parti��o BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   mostra a tabela de parti��es BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as altera��es"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
@@ -2329,21 +2261,21 @@ msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Lendo r�tulo de disco de %s no setor %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
-#, c-format
+#, fuzzy, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr "N�o existe parti��o %BSD em %s.\n"
+msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando para r�tulo de disco BSD (tecle m para obter ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s ou +tamanho ou +tamanho M ou  +tamanho K"
@@ -2388,8 +2320,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " badsect"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2490,8 +2420,8 @@ msgstr "setores/trilha"
 msgid "tracks/cylinder"
 msgstr "trilhas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -2548,7 +2478,7 @@ msgstr "Bootstrap (c�digo de inicializa��o) instalado em %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Parti��o (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "O n�mero m�ximo de parti��es foi criado\n"
@@ -2572,7 +2502,7 @@ msgstr ""
 "\n"
 "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2594,7 +2524,7 @@ msgstr ""
 "-u: d� In�cio e Fim em unidades de setor (em vez de cilindro).\n"
 "-b 2048: (para certas unidades MO) usar setores de  2048 bytes.\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2611,199 +2541,185 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "N�o foi poss�vel ler %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "N�o foi poss�vel realizar busca em %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "N�o foi poss�vel gravar em %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "N�o foi poss�vel alocar mais qualquer mem�ria\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Erro fatal\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma op��o de somente leitura"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita r�tulo BSD no disco"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a op��o \"mont�vel\""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma parti��o"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de parti��o conhecidos"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova parti��o"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de parti��es DOS vazia"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de parti��es"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo r�tulo de disco Sun vazio"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identifica��o da parti��o para o sistema"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de parti��es"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usu�rios avan�ados)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   torna a parti��o inicializ�vel"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicializa��o"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma parti��o de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a op��o \"inicializ�vel\""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a op��o \"compatibilidade\""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar n�mero de cilindros alternativos"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar n�mero de cilindros"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   mostrar os dados sem formata��o da tabela de parti��es"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar n�mero de setores extras por cilindro"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   alterar n�mero de cabe�as"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rota��o (RPM)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar n�mero de setores/trilha"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover in�cio dos dados em uma parti��o"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   listar parti��es estendidas"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   criar uma tabela de parti��es IRIX"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   corrige ordem de parti��o"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Voc� precisa configurar"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "cabe�as"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2812,11 +2728,11 @@ msgstr ""
 "%s%s.\n"
 "Voc� pode fazer isto a partir do menu de fun��es extras.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2836,29 +2752,29 @@ msgstr ""
 "2) inicializa��o e programas de particionamento de outros OSs\n"
 "   (p.ex., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Deslocamento inv�lido em uma parti��o prim�ria estendida\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Aviso: ponteiro de v�nculo extra na tabela de parti��es %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Aviso: ignorando dados extras na tabela de parti��es %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2871,24 +2787,24 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: o tamanho do setor � %d (n�o %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Voc� n�o poder� gravar a tabela de parti��es.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2897,17 +2813,17 @@ msgstr ""
 "O dispositivo n�o cont�m nem uma tabela de parti��es DOS v�lida nem um "
 "r�tulo de disco Sun, OSF ou SGI\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando parti��o estendida extra %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2916,7 +2832,7 @@ msgstr ""
 "Aviso: a op��o inv�lida 0x%04x da tabela de parti��es %d ser� corrigida por "
 "grava��o (w)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2925,83 +2841,83 @@ msgstr ""
 "\n"
 "EOF (fim de arquivo) recebido tr�s vezes - saindo...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (digite L para listar os c�digos): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, padr�o %d):"
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Usando valor padr�o %d\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "N�mero da parti��o"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a parti��o %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignorando parti��o estendida extra %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nenhuma parti��o definida\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVISO: A parti��o %d � uma parti��o estendida\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "A op��o de compatibilidade DOS est� ativada\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A op��o de compatibilidade DOS n�o est� ativada\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A parti��o %d ainda n�o existe!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3014,7 +2930,7 @@ msgstr ""
 "tipo 0 n�o � recomend�vel. Voc� pode excluir\n"
 "uma parti��o usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3023,7 +2939,7 @@ msgstr ""
 "Voc� n�o pode alterar uma parti��o normal para estendida ou vice-versa.\n"
 "Exclua a parti��o antes.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3034,7 +2950,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e at� mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3045,59 +2961,59 @@ msgstr ""
 "e a parti��o 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "O tipo da parti��o %d foi alterado para %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "A parti��o %d possui in�cios f�sico/l�gico diferentes (n�o Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     f�s. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "A parti��o %d possui fins f�sico/l�gico diferentes:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "A parti��o %i n�o inicia em um limite de cilindro:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "A parti��o %d n�o termina em um limite de cilindro.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3107,7 +3023,7 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -3115,19 +3031,19 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3136,7 +3052,7 @@ msgstr ""
 "Nada a fazer. Ordem j� est� correta\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3144,16 +3060,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    In�cio      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3162,7 +3078,7 @@ msgstr ""
 "\n"
 "Parti��es l�gicas fora da ordem do disco\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3173,85 +3089,85 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "No OA  Cb Set  Cil  Cb Set  Cil    In�cio    Tam  ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Aviso: a parti��o %d cont�m o setor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Parti��o %d: a cabe�a %d � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Parti��o %d: o setor %d � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Parti��o %d: o cilindro %d � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Parti��o %d: os setores anteriores %d n�o est�o de acordo com o total: %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Aviso: in�cio de dados inv�lido na parti��o %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Aviso: a parti��o %d sobrep�e-se � parti��o %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a parti��o %d est� vazia\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "A parti��o l�gica %d n�o est� completamente na parti��o %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "O total de setores alocados, %d, � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d setores n�o alocados\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "A parti��o %d j� est� definida. Exclua essa parti��o antes de adicion�-la "
 "novamente.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "N�o h� setores livres dispon�veis\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3260,24 +3176,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Voc� precisa excluir alguma parti��o e adicionar uma parti��o estendida "
 "antes\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "parti��es l�gicas fora da ordem do disco"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Parti��o prim�ria inv�lida"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3288,20 +3204,20 @@ msgstr ""
 "   %s\n"
 "   p   parti��o prim�ria (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   l�gica (5 ou superior)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "N�mero de parti��o inv�lido para o tipo `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3310,12 +3226,12 @@ msgstr ""
 "A tabela de parti��es foi alterada!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de parti��es.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3324,7 +3240,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3337,77 +3253,77 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do fdisk para obter informa��es adicionais.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "A parti��o %d n�o possui �rea de dados\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Novo in�cio dos dados"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Comando avan�ado (m para ajuda): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "N�mero de cabe�as"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "N�mero de setores"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "O disco %s n�o cont�m uma tabela de parti��es v�lida\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este kernel localiza o tamanho de setor por conta pr�pria - op��o -b "
 "ignorada\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3416,19 +3332,18 @@ msgstr ""
 "Aviso: a op��o -b (configurar tamanho de setor) deve ser usada com um "
 "dispositivo especificado\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Detectado um r�tulo OSF/1 em %s, entrando em modo de r�tulo.\n"
 "Para retornar ao modo de tabela de parti��es do DOS, use o comando 'r'.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3437,16 +3352,16 @@ msgstr ""
 "\n"
 "O arquivo de boot atual �: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3514,15 +3429,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3601,7 +3516,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s setor %5u tamanho %8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3660,7 +3574,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Mais do que uma entrada de disco inteiro presente.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nenhuma parti��o definida\n"
@@ -3745,7 +3659,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVoc� escolheu um nome de arquivo de inicializa��o incomum.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3767,11 +3680,10 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta parti��o de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3842,44 +3754,43 @@ msgstr "Tentando manter os par�metros da parti��o %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tIN�CIO=%d\tCOMPRIMENTO=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Vazia"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "root SunOS"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "permuta SunOS"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "usr SunOS"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Disco inteiro"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "stand SunOS"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "var SunOS"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "home SunOS"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Detec��o autom�tica de RAID Linux"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3892,12 +3803,12 @@ msgstr ""
 "setores e\n"
 "parti��es ou for�ar um r�tulo novo (comando s no menu principal).\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "A configura��o autom�tica encontrou um(a) %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3910,7 +3821,7 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3920,72 +3831,72 @@ msgstr ""
 "   ?   configura��o autom�tica\n"
 "   0   personalizada (com padr�es detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selecione o tipo (? para autom�tica, 0 para personalizada): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "A configura��o autom�tica falhou.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Setores/trilha"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Cilindros Alternativos"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Cilindros f�sicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rota��o (RPM)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Voc� pode alterar todos os par�metros do disco a partir do menu x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete de 3,5 pol."
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "A parti��o %d n�o termina em um limite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "A parti��o %d sobrep�e-se a outras nos setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo n�o utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo n�o utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3994,7 +3905,7 @@ msgstr ""
 "Outras parti��es j� cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4005,7 +3916,7 @@ msgstr ""
 "%d %s cobre alguma outra parti��o. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4014,7 +3925,7 @@ msgstr ""
 "Se voc� deseja manter compatibilidade com SunOS/Solaris, considere deixar\n"
 "esta parti��o como um disco inteiro (5), come�ando em 0, com %u setores\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4029,7 +3940,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja rotular esta parti��o como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4048,7 +3959,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4061,16 +3972,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Op��o   In�cio      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4094,32 +4005,26 @@ msgstr "FAT16 < 32 M"
 msgid "Extended"
 msgstr "Estendida"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS ou NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX inicializ�vel"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "Gerenc. Inicializ. OS/2"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 #, fuzzy
 msgid "W95 FAT32"
@@ -4130,7 +4035,6 @@ msgstr "FAT32 Win95"
 msgid "W95 FAT32 (LBA)"
 msgstr "FAT32 Win95 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 #, fuzzy
 msgid "W95 FAT16 (LBA)"
@@ -4228,12 +4132,10 @@ msgstr "DM OnTrack"
 msgid "OnTrack DM6 Aux1"
 msgstr "DM6 OnTrack Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "DM6 OnTrack Aux3"
@@ -4254,8 +4156,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Edisk Priam"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4265,7 +4165,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ou SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4286,12 +4185,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Minix antigo"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Linux antigo/Minix"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4322,12 +4219,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "Hiberna��o IBM Thinkpad"
@@ -4336,7 +4231,6 @@ msgstr "Hiberna��o IBM Thinkpad"
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4402,31 +4296,23 @@ msgstr "Dados N�o-FS"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Utilit�rio Dell"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 #, fuzzy
 msgid "BootIt"
 msgstr "Inicializar"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "Acesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "sist. arq. BeOS"
@@ -4435,119 +4321,112 @@ msgstr "sist. arq. BeOS"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secund�rio"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erro de busca em %s - n�o foi poss�vel buscar at� %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erro de busca: desejado 0x%08x%08x, obtido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "mem�ria insuficiente - desistindo\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erro de leitura em %s - n�o foi poss�vel ler o setor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRO: o setor %lu n�o possui uma assinatura MS-DOS\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "erro de grava��o em %s - n�o foi poss�vel gravar no setor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 "n�o foi poss�vel abrir o arquivo de salvamento de setor da parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "erro de grava��o em %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "n�o foi poss�vel stat arquivo de restaura��o de parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "o arquivo de restaura��o da parti��o possui tamanho incorreto - n�o "
 "restaurando\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "mem�ria insuficiente?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "n�o foi poss�vel abrir o arquivo de restaura��o de parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "erro na leitura de %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "n�o foi poss�vel abrir o dispositivo %s para grava��o\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erro na grava��o do setor %lu em %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: n�o foi poss�vel obter a geometria\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: n�o foi poss�vel obter o tamanho\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4558,22 +4437,22 @@ msgstr ""
 "inteiro. Usar fdisk nela provavelmente n�o trar� qualquer resultado\n"
 "(use a op��o --force se realmente quiser realizar esta opera��o).\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %lu cabe�as\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %lu setores\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que h� %lu cilindros\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4583,7 +4462,7 @@ msgstr ""
 "Isto causar� problemas a todo software que usar endere�amento Cil/Cab/"
 "Setor.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4592,7 +4471,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabe�as, %lu setores/trilha\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4600,7 +4479,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para cabe�a: %lu (deveria estar "
 "entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4609,7 +4488,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para setor: %lu (deveria estar "
 "entre 1 e %lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4618,7 +4497,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para o cilindro: %lu (deveria "
 "estar entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4627,12 +4506,12 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relendo a tabela de parti��es...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4640,31 +4519,31 @@ msgstr ""
 "O comando para reler a tabela de parti��es falhou.\n"
 "Reinicialize o sistema agora, antes de usar o mkfs.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: parti��o inexistente\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "formato n�o reconhecido - usando setores\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabela de parti��o de %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato n�o implementado - usando %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4674,12 +4553,12 @@ msgstr ""
 "de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio    Fim   Cils    Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4688,12 +4567,12 @@ msgstr ""
 "Unidades = setores de 512 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp   Boot    In�cio      Fim  Setores   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4702,12 +4581,12 @@ msgstr ""
 "Unidades = blocos de 1024 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp   Boot   In�cio      Fim   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4717,33 +4596,33 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio  Fim     MB   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tin�cio: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o termina no cilindro %ld, al�m do final do disco\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Nenhuma parti��o encontrada\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4754,86 +4633,86 @@ msgstr ""
 " para Cil/Cab/Set = */%ld/%ld (em vez de %ld/%ld/%ld).\n"
 "Para esta listagem ser� assumida aquela geometria.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranho, somente %d parti��es est�o definidas.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Aviso: a parti��o %s possui tamanho 0, mas n�o est� marcada como vazia\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e � inicializ�vel\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e in�cio diferente de zero\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Aviso: a parti��o %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n�o est� contida na parti��o %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Aviso: as parti��es %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s se sobrep�em\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Aviso: a parti��o %s come�a no setor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Aviso: a parti��o %s se estende al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 #, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr "Dentre as parti��es prim�rias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o termina em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4843,7 +4722,7 @@ msgstr ""
 "Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4851,7 +4730,7 @@ msgstr ""
 "Aviso: normalmente o boot pode ser dado somente de parti��es prim�rias.\n"
 "O LILO desconsidera o flag `inicializ�vel'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4860,12 +4739,12 @@ msgstr ""
 "Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "status"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4873,163 +4752,162 @@ msgstr ""
 "parti��o %s - in�cio: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "envio"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "parti��o %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o %s termina no cilindro %ld, al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, fuzzy, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr "Aviso: deslocamento inicia na parti��o extd de  %ld para %ld\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 #, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr "Aviso: a parti��o extendida n�o inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "n�mero excessivo de parti��es - ignorando aquelas al�m do n� %d\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "�rvore de parti��es?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gerenciador de disco detectado - n�o � poss�vel tratar\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "Assinatura DM6 encontrada - desistindo\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estranho... uma parti��o estendida de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estranho... uma parti��o BSD de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a op��o -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "N�o foi poss�vel salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erro de entrada: caractere inesperado %c ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada n�o reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "n�mero grande demais\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "lixo ap�s o n�mero\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "sem espa�o para o descritor da parti��o\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "n�o foi poss�vel criar a parti��o estendida envolt�ria\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "n�mero excessivo de campos de entrada\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "N�o h� espa�o para mais\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Tipo inv�lido\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Aviso: tamanho dado (%lu) excede o tamanho m�ximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Aten��o: parti��o vazia\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Aviso: in�cio de parti��o inv�lido (mais adiantado %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "op��o de inicializa��o n�o reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "especifica��o cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Parti��o estendida n�o est� no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "entrada inv�lida\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "N�mero excessivo de parti��es\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5041,47 +4919,43 @@ msgstr ""
 "Normalmente s� � necess�rio especificar <in�cio> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "vers�o"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "op��es �teis:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lista o tamanho de uma parti��o"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da parti��o"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as parti��es de cada dispositivo"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      idem, mas em um formato adequado para entrada "
 "posterior"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [ou --increment]: numera os cilindros, etc. a partir de 1, em vez de 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5089,56 +4963,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/"
 "cilindros/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lista os tipos de parti��o conhecidos"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       para compatibilidade com DOS: desperdi�a um pouco "
 "de espa�o"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [ou --re-read]:   faz o kernel reler a tabela de parti��es"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a parti��o de n�mero #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 n�o grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O arquivo :          salva os setores que ser�o sobrescritos em arquivo"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a vers�o"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "op��es perigosas:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5146,7 +5020,7 @@ msgid ""
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5154,119 +5028,119 @@ msgstr ""
 "    -x [ou --show-extended]: tamb�m lista parti��es estendidas na sa�da\n"
 "                             ou espera descritores para elas na entrada"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      n�o reclama de coisas irrelevantes para o Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Voc� pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ou --cylinders #]:define o n�mero de cilindros a usar"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    define o n�mero de cabe�as a usar"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ou --sectors #]:  define o n�mero de setores a usar"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Voc� pode desativar todas as verifica��es de consist�ncia com:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      fa�a o que eu mandar, mesmo que seja idiota"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\tlista parti��es as ativas no dispositivo\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2... ativa as parti��es n1..., deixando inativas as "
 "demais\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An dispositivo\n"
 " ativa a parti��o n, desativa as demais\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo n�mero-parti��o\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id dispositivo n�mero-parti��o ID\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo n�mero-parti��o [ID]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "pode especificar somente um dispositivo (exceto com -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabe�as, %ld setores/trilha\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte ativo inv�lido: 0x%x em vez de 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5274,7 +5148,7 @@ msgstr ""
 "Conclu�do\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5283,35 +5157,35 @@ msgstr ""
 "Voc� possui %d parti��es prim�rias ativas. Isto n�o faz diferen�a para o\n"
 "LILO, mas o MBR DOS s� inicializar� em discos com uma parti��o ativa.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a parti��o %s possui ID %x e n�o est� escondida\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inv�lida: %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Este disco est� atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: n�o foi poss�vel encontrar %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s n�o � um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Verificando se ningu�m est� usando este disco no momento...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5324,30 +5198,30 @@ msgstr ""
 "todas as parti��es de permuta deste disco. Use a op��o --no-reread para "
 "suprimir esta verifica��o.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Use a op��o --force para cancelar todas as verifica��es.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situa��o antiga:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A parti��o %d n�o existe; n�o � poss�vel alter�-la.\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Situa��o nova:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5355,21 +5229,21 @@ msgstr ""
 "Eu n�o gosto destas parti��es: nada foi alterado\n"
 "(se voc� realmente quiser us�-las, use a op��o --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Eu n�o gosto disto - provavelmente voc� deveria responder N�o\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Voc� est� satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5378,16 +5252,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5396,7 +5270,7 @@ msgstr ""
 "Nova tabela de parti��es gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5501,135 +5375,135 @@ msgstr "getopt (melhorado) 1.1.0)\n"
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "boot executado do MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Rel�gio BCD Ruffian\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta do rel�gio ajustada para 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s at�mico falhou por 1000 itera��es!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "N�o � poss�vel abrir /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "N�o consegui obter permiss�o porque n�o tentei.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s � incapaz de obter acesso � porta de E/S: a chamada iopl(3) falhou.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Provavelmente s�o necess�rios privil�gios de root.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Pressupondo que o rel�gio de hardware � mantido na hora %s.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "local"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Aviso: a terceira linha do arquivo adjtime n�o foi reconhecida\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Esperado: `UTC', `LOCAL'  ou nada.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, fuzzy, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "�ltimo ajuste de varia��o feito %d segundos ap�s 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, fuzzy, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "�ltima calibra��o feita %d segundos ap�s 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "O rel�gio de hardware est� na hora %s\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "desconhecida"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Aguardando tique do rel�gio...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... tique do rel�gio obtido\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Valores inv�lidos no rel�gio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora do rel�gio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
 "desde 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hora lida do rel�gio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, fuzzy, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Configurando o rel�gio de hardware para %.2d:%.2d:%.2d = %d segundos desde "
 "1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Rel�gio n�o alterado - apenas testando.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5638,7 +5512,7 @@ msgstr ""
 "O tempo decorrido desde o hor�rio de refer�ncia foi de %.6f segundos.\n"
 " Atrasando mais para chegar ao pr�ximo segundo cheio.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5648,22 +5522,22 @@ msgstr ""
 "50� dia do m�s) ou al�m do intervalo que podemos manipular (p.ex., ano "
 "2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "N�o. Op��o --date especificada\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, fuzzy, c-format
 msgid "--date argument too long\n"
 msgstr "fsname nome muito longo"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5672,22 +5546,22 @@ msgstr ""
 "O valor da op��o --date n�o � uma data v�lida.\n"
 "Especificamente, ele cont�m aspas.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Emitindo comando date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "N�o foi poss�vel executar o programa 'date' no shell /bin/sh: popen() falhou"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "resposta do comando date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5702,7 +5576,7 @@ msgstr ""
 "A resposta foi:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5719,12 +5593,12 @@ msgstr ""
 "A resposta foi:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, fuzzy, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "String de date %s equivale a %d segundos desde 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5733,37 +5607,37 @@ msgstr ""
 "O rel�gio de hardware n�o cont�m uma hora v�lida. Em fun��o disso, n�o � "
 "poss�vel configurar a hora do sistema a partir dele.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Chamando settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "O rel�gio do sistema n�o est� sendo ajustado: executando em modo de teste.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "� necess�rio ser superusu�rio para ajustar o rel�gio do sistema.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() falhou"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5772,7 +5646,7 @@ msgstr ""
 "O fator de varia��o n�o est� sendo ajustado porque o rel�gio de hardware "
 "continha lixo anteriormente.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, fuzzy, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5781,7 +5655,7 @@ msgstr ""
 "O fator de varia��o n�o est� sendo ajustado porque menos de um dia se passou "
 "desde a �ltima calibra��o.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5790,7 +5664,7 @@ msgstr ""
 "O fator de varia��o n�o est� sendo ajustado porque menos de um dia se passou "
 "desde a �ltima calibra��o.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, fuzzy, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5801,24 +5675,24 @@ msgstr ""
 "varia��o de %f segundos/dia.\n"
 "Ajustando o fator de varia��o em %f segundos/dia.\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "O tempo desde o �ltimo ajuste � de %d segundos\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "� necess�rio inserir %d segundos e referenciar a hora de %.6f segundos "
 "atr�s\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "O arquivo adjtime n�o est� sendo atualizado: modo de teste.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5827,12 +5701,12 @@ msgstr ""
 "Teria gravado o seguinte em %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Par�metros de ajuste de varia��o n�o atualizados.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5840,29 +5714,29 @@ msgstr ""
 "O rel�gio de hardware n�o cont�m uma hora v�lida, portanto n�o � poss�vel "
 "ajust�-lo.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "O ajuste necess�rio � menor do que um segundo, portanto o rel�gio n�o ser� "
 "ajustado.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Usando %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "N�o foi encontrada uma interface de rel�gio utiliz�vel.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "N�o � poss�vel ajustar o rel�gio do sistema.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5876,17 +5750,17 @@ msgstr ""
 "assim, sup�e-se que n�o est� sendo executada em uma Alpha no momento).  "
 "Nenhuma a��o foi realizada.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "N�o foi poss�vel obter o valor de epoch do kernel.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "O kernel est� pressupondo um valor de epoch de %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5895,17 +5769,22 @@ msgstr ""
 "Para configurar o valor de epoch, � necess�rio usar a op��o 'epoch' para "
 "informar para que valor configur�-lo.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Epoch n�o configurado para %d; apenas testando.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "N�o � poss�vel configurar o valor de epoch no kernel.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s de %s\n"
+
+#: hwclock/hwclock.c:1196
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5968,7 +5847,7 @@ msgstr ""
 "  --epoch=ano  Especifica o ano inicial do valor \n"
 "                de epoch do rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5978,12 +5857,12 @@ msgstr ""
 "                informa a hwclock o tipo de Alpha que voc� tem (consulte "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s n�o aceita argumentos que n�o sejam de op��o. Voc� forneceu %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5992,7 +5871,7 @@ msgstr ""
 "Voc� especificou m�ltiplas op��es de fun��o.\n"
 "Voc� s� pode executar uma fun��o por vez.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6001,7 +5880,7 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6010,28 +5889,28 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "N�o h� um hor�rio para ajuste utiliz�vel. N�o � poss�vel ajustar o rel�gio.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6040,13 +5919,13 @@ msgstr ""
 "Somente o superusu�rio pode alterar o epoch do rel�gio de hardware no "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "N�o � poss�vel acessar o Rel�gio de Hardware por nenhum m�todo conhecido.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6082,7 +5961,6 @@ msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK falhou"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 #, fuzzy
 msgid "Can't open /dev/tty1 or /dev/vc/1"
@@ -6179,9 +6057,6 @@ msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6208,7 +6083,6 @@ msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "calling termio_init\n"
@@ -6217,7 +6091,6 @@ msgstr "calling termio_init\n"
 msgid "writing init string\n"
 msgstr "writing string init\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "before autobaud\n"
@@ -6231,7 +6104,6 @@ msgstr "waiting for cr-lf\n"
 msgid "read %c\n"
 msgstr "read %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "reading login name\n"
@@ -6285,7 +6157,6 @@ msgstr "/dev: chdir() falhou: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s n�o � um dispositivo de caracteres"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6300,12 +6171,10 @@ msgstr "/dev/%s: n�o foi poss�vel abrir como entrada padr�o: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: n�o est� aberto para leitura/grava��o"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duping\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6348,30 +6217,25 @@ msgstr ""
 "ou\t[-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H "
 "host_login] linha taxa_baud,... [tipo_term]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: pouca mem�ria; o login pode falhar\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "n�o foi poss�vel malloc para ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "n�o foi poss�vel malloc para grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login em %s de %s negado como padr�o.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login em %s de %s negado.\n"
@@ -6416,8 +6280,8 @@ msgstr "Alterando informa��es de finger de %s.\n"
 msgid "Password error."
 msgstr "Erro de senha."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Senha:"
@@ -6596,34 +6460,6 @@ msgstr "Use %s -l para ver a lista.\n"
 msgid "No known shells.\n"
 msgstr "Nenhum interpretador de comandos conhecido.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "n�o foi poss�vel abrir /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "n�o foi poss�vel ler dados aleat�rios de /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "n�o foi poss�vel abrir %s para leitura"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "n�o foi poss�vel stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s n�o possui os modos de arquivo corretos"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "n�o foi poss�vel ler dados de %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6633,11 +6469,11 @@ msgstr "N�o foi poss�vel ler %s; saindo."
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Uso: last [-#] [-f arquivo] [-t tty] [-h nome_host] [usu�rio ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ainda conectado"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6646,15 +6482,15 @@ msgstr ""
 "\n"
 "wtmp inicia %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: falha de malloc.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6663,51 +6499,45 @@ msgstr ""
 "\n"
 "interrompido %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: n�o foi poss�vel abrir %s: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h somente pode ser especificado pelo superusu�rio.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usu�rio]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "N�o foi poss�vel inicializar o PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "LOGIN FALHOU: %d A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6716,18 +6546,18 @@ msgstr ""
 "Login incorreto\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 "N�MERO EXCESSIVO DE TENTATIVAS DE LOGIN (%d) A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "SESS�O DE LOGIN FALHOU: A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6736,143 +6566,128 @@ msgstr ""
 "\n"
 "Login incorreto\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "%s: mem�ria insuficiente!\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Nome de usu�rio inv�lido"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s: LOGIN RECUSADO A PARTIR DE %s NO TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"N�mero m�ximo de usu�rios j� conectados.\n"
-"Tente novamente mais tarde.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "N�mero excessivo de processos em execu��o.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, fuzzy, c-format
 msgid "You have new mail.\n"
 msgstr "Voc� tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, fuzzy, c-format
 msgid "You have mail.\n"
 msgstr "Voc� tem mensagens %s na caixa de correio.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diret�rio %s n�o existe!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: n�o h� mem�ria para script de interpretador de comandos.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: n�o foi poss�vel executar o script do interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: n�o existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6881,65 +6696,65 @@ msgstr ""
 "\n"
 "%s usu�rio: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login n�o podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "N�mero excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado ap�s %d segundos\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo login: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -6959,165 +6774,30 @@ msgstr "� n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Uso: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Quem � voc�?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: grupo inexistente."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permiss�o negada"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Interpretador de comandos inexistente"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Voc� n�o pode reutilizar a senha antiga.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "N�o use algo como seu nome de usu�rio como senha!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "N�o use algo como seu nome real como senha!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uso: passwd [nome_usu�rio [senha]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Somente root pode usar os formatos de um e dois argumentos.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uso: passwd [-foqsvV] [nome_usu�rio [senha]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "N�o foi poss�vel exec %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "N�o foi poss�vel localizar o nome de login"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Somente root pode alterar senhas de terceiros.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "N�mero excessivo de argumentos.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"N�o foi poss�vel encontrar o nome de usu�rio em nenhum lugar. `%s' realmente "
-"� um nome de usu�rio?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Eu s� posso alterar senhas locais. Use yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Nome de usu�rio e UID n�o correspondem, impostor!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Alterando a senha para o usu�rio %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Informe a senha anterior: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Senha incorreta, impostor."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Informe a nova senha: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "A senha N�O foi alterada."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Redigite a nova senha: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Voc� n�o a informou corretamente. A senha n�o foi alterada."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "senha alterada, usu�rio %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "A SENHA DO ROOT FOI ALTERADA"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "senha alterada pelo root, usu�rio %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "chamando setpwnam para definir a senha.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "A senha *N�O* foi alterada. Tente novamente mais tarde.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Senha alterada.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7164,7 +6844,6 @@ msgstr "%s por %s: %s"
 msgid "halted by %s: %s"
 msgstr "%s por %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7201,7 +6880,6 @@ msgstr "Executando o programa \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Erro ao executar\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7291,7 +6969,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr "erro executando fnalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "erro fazendo fork finalprog\n"
@@ -7320,7 +6997,7 @@ msgstr "abertura do diret�rio falhou\n"
 msgid "fork failed\n"
 msgstr "o fork falhou\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "exec falhou\n"
 
@@ -7470,12 +7147,6 @@ msgstr "valor de m�s inv�lido: use 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7486,13 +7157,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "Uso: cal [-mjyV] [[m�s] ano]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Uso: %s [+formato] [dia m�s ano]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "Dia de S�o Tib"
 
@@ -7624,7 +7294,7 @@ msgstr "%s: n�o foi poss�vel renomear %s para %s. falha: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "chamada: %s de para arquivos...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7635,22 +7305,22 @@ msgstr ""
 "Use `%s [op��es] %s' se voc� realmente quer usar isto.\n"
 "Script n�o iniciado.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, fuzzy, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Uso: script [-a] [-f] [-q] [arquivo]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo � %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7659,254 +7329,253 @@ msgstr ""
 "\n"
 "Script conclu�do em %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script conclu�do, o arquivo � %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: erro de argumento; uso\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nome_terminal ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file arquivo_descarga ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq num_freq ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "n�o � poss�vel alterar o estado do modo de conserva��o de energia\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erro de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Erro ao gravar descarga de tela\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "n�o foi poss�vel ler %s e n�o � poss�vel realizar ioctl da descarga\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
@@ -7981,10 +7650,6 @@ msgstr "Aviso: n�o foi poss�vel abrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: n�o foi poss�vel abrir %s - usando %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8289,85 +7954,76 @@ msgstr "mount: n�o foi poss�vel abrir %s para configura��o da velocidade"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta vers�o foi compilada sem suporte ao tipo `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: falhou com o mount do nfs vers�o 4, tentando com o 3..\n"
 " \n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: n�o foi poss�vel determinar o tipo do sistema de arquivos e nenhum "
 "foi especificado"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: voc� precisa especificar o tipo do sistema de arquivos"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: o ponto de montagem %s n�o � um diret�rio"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: permiss�o negada"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: � necess�rio ser superusu�rio para montar"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc j� montado"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s j� montado ou %s ocupado"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s n�o existe"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: o ponto de montagem %s � um v�nculo simb�lico para lugar algum"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s n�o existe"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8376,12 +8032,12 @@ msgstr ""
 "mount: o dispositivo especial %s n�o existe\n"
 "       (um prefixo de caminho n�o � um diret�rio)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s j� n�o est� montado ou op��o inv�lida"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8391,72 +8047,71 @@ msgstr ""
 "inv�lido em %s,\n"
 "       ou n�mero excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: n�o foi poss�vel ler o superbloco"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente voc� queria dizer %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: talvez voc� quisesse dizer iso9660?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: talvez voc� quisesse dizer iso9660?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s possui n�mero de dispositivo incorreto ou o tipo de sistema de "
 "arquivos %s n�o � suportado"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s n�o � um dispositivo de blocos e stat falha?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8465,72 +8120,67 @@ msgstr ""
 "mount: o kernel n�o reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s n�o � um dispositivo de blocos (talvez tentar `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n�o � um dispositivo de blocos"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s n�o � um dispositivo de blocos v�lido"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: n�o foi poss�vel montar %s%s somente para leitura"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s � protegido contra grava��o mas a op��o -w foi passada"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s � protegido contra grava��o; montando somente para leitura"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nenhum tipo foi fornecido - supondo smbfs por causa xxx\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8577,34 +8227,34 @@ msgstr ""
 "Outras op��es: [-nfFrsvw] [-o op��es].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: opera��o exclusiva de root"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: tal parti��o n�o foi encontrada"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: n�o foi poss�vel localizar %s em %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: n�o foi poss�vel localizar %s em %s ou %s"
@@ -8639,98 +8289,98 @@ msgstr "       experimentarei o tipo %s\n"
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir excessivamente longo\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: aviso: nomes de host m�ltiplos n�o s�o suportados\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: diret�rio a montar n�o est� no formato host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: n�o � poss�vel obter endere�o para %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: obtido hp->h_length inv�lido\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de op��o excessivamente longo\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Aviso: op��o proto= n�o reconhecida.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Aviso: a op��o namlen n�o � suportada.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "par�metro de montagem de nfs desconhecido: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Aviso: a op��o nolock n�o � suportada.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "op��o de montagem de nfs desconhecida: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: obtido hp->h_length inv�lido?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP n�o � suportado.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "usado portmapper para localizar porta NFS\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "usando porta %d para o daemon do nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valor de retorno de status de nfs desconhecido: %d"
@@ -8739,7 +8389,7 @@ msgstr "valor de retorno de status de nfs desconhecido: %d"
 msgid "bug in xstrndup call"
 msgstr "erro na chamada a xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8752,7 +8402,7 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8764,141 +8414,139 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: n�o foi poss�vel stat %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: aviso: %s possui permiss�es inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, diret�rio: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: n�o foi poss�vel obter endere�o de %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: obtido hostp->h_length inv�lido\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inv�lido"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n�o montado"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: n�o foi poss�vel gravar superbloco"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: o dispositivo est� ocupado"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n�o encontrado"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusu�rio para desmontar"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de blocos n�o permitidos no sistema de arquivos"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "n�o existe umount2, tentando umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "n�o foi poss�vel efetuar umount em %s - tentando %s em vez dele\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: n�o foi poss�vel remontar %s somente para leitura\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: n�o foi poss�vel localizar a lista de sistemas de arquivos a "
 "desmontar"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, fuzzy, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8909,48 +8557,47 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | n�...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "N�o foi poss�vel localizar %s em mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n�o est� montado (de acordo com mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s est� montado m�ltiplas vezes"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n�o est� na fstab (e voc� n�o � root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a montagem de %s n�o est� de acordo com a fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: opera��o exclusiva de root"
 
@@ -9108,7 +8755,7 @@ msgstr "%s: sinal desconhecido %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9277,8 +8924,6 @@ msgstr "o kernel n�o est� configurado para mem�ria compartilhada\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "- Limites da mem�ria compartilhada -\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -10065,17 +9710,17 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f arq_fmt] [-n compr] [-s pular] "
 "[arquivo ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Uso: %s [-dflpcsu] [+n�mero_da_linha | +/padr�o] nome1 nome2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10086,8 +9731,7 @@ msgstr ""
 "*** %s: diret�rio ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10098,47 +9742,47 @@ msgstr ""
 "******** %s: n�o � um arquivo de texto ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Use q ou Q para sair]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mais--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pressione espa�o para continuar, 'q' para sair.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, fuzzy, c-format
 msgid "...back %d pages"
 msgstr "...voltar %d p�gina(s)"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 #, fuzzy
 msgid "...back 1 page"
 msgstr "...voltar %d p�gina(s)"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 #, fuzzy
 msgid "...skipping one line"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10148,7 +9792,7 @@ msgstr ""
 "***Voltar***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10156,7 +9800,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10179,34 +9823,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pressione 'h' para obter instru��es.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linha %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[N�o � um arquivo] linha %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Estouro\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...pulando\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Express�o regular malformada"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10214,15 +9858,15 @@ msgstr ""
 "\n"
 "Padr�o n�o encontrado\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Padr�o n�o encontrado"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "n�o foi poss�vel realizar fork\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10230,21 +9874,21 @@ msgstr ""
 "\n"
 "...Pulando "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Pulando "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "de volta ao arquivo"
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Linha longa demais"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "N�o h� comando anterior para ser substitu�do"
 
@@ -10297,98 +9941,95 @@ msgstr "hexdump: formato inv�lido{%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: caractere de convers�o inv�lido %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "a op��o `%s' exige um argumento\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Tecla ilegal"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 #, fuzzy
 msgid "No next file"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 #, fuzzy
 msgid "No previous file"
 msgstr "Nenhuma parti��o definida\n"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erro de leitura em %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: n�o foi poss�vel ler arquivo tempor�rio.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 #, fuzzy
 msgid "RE error: "
 msgstr ", erro"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 #, fuzzy
 msgid "Cannot open "
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 #, fuzzy
 msgid "saved"
 msgstr "envio"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "A senha *N�O* foi alterada. Tente novamente mais tarde.\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Pr�ximo arquivo: %s)"
@@ -10443,6 +10084,151 @@ msgstr "Linha de entrada longa demais.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Falta mem�ria quando o buffer cresce.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "N�mero inv�lido: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Erro de sintaxe: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "N�o h� tal par�metro definido: '%s'\n"
+
+#, fuzzy
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "Uso: %s [ -p ] dispositivo\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "       %s [ -p ] disp tam set cabe� trilhas ext   interv taxa spec1 "
+#~ "fmt_interv\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "       %s [ -c | -y | -n | -d ] disp\n"
+
+#, fuzzy
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "       %s [ -c | -y | -n ] disp\n"
+
+#~ msgid "version"
+#~ msgstr "vers�o"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "n�o foi poss�vel abrir /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "n�o foi poss�vel ler dados aleat�rios de /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "n�o foi poss�vel abrir %s para leitura"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "n�o foi poss�vel stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s n�o possui os modos de arquivo corretos"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "n�o foi poss�vel ler dados de %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "N�mero m�ximo de usu�rios j� conectados.\n"
+#~ "Tente novamente mais tarde.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "N�mero excessivo de processos em execu��o.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Voc� n�o pode reutilizar a senha antiga.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "N�o use algo como seu nome de usu�rio como senha!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "N�o use algo como seu nome real como senha!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uso: passwd [nome_usu�rio [senha]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Somente root pode usar os formatos de um e dois argumentos.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uso: passwd [-foqsvV] [nome_usu�rio [senha]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "N�o foi poss�vel exec %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "N�o foi poss�vel localizar o nome de login"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Somente root pode alterar senhas de terceiros.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "N�mero excessivo de argumentos.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "N�o foi poss�vel encontrar o nome de usu�rio em nenhum lugar. `%s' "
+#~ "realmente � um nome de usu�rio?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr "Eu s� posso alterar senhas locais. Use yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Nome de usu�rio e UID n�o correspondem, impostor!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Alterando a senha para o usu�rio %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Informe a senha anterior: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Senha incorreta, impostor."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Informe a nova senha: "
+
+#~ msgid "Password not changed."
+#~ msgstr "A senha N�O foi alterada."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Redigite a nova senha: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Voc� n�o a informou corretamente. A senha n�o foi alterada."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "senha alterada, usu�rio %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "A SENHA DO ROOT FOI ALTERADA"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "senha alterada pelo root, usu�rio %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "chamando setpwnam para definir a senha.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "A senha *N�O* foi alterada. Tente novamente mais tarde.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Senha alterada.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: esta vers�o foi compilada sem suporte ao tipo `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Aviso: excluindo parti��es ap�s %d\n"
diff --git a/po/quot.sed b/po/quot.sed
new file mode 100644
index 000000000..0122c4631
--- /dev/null
+++ b/po/quot.sed
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
new file mode 100644
index 000000000..2436c49e7
--- /dev/null
+++ b/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 000000000..65b143623
--- /dev/null
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index f09d14307..2ec7ba0c3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,14 +1,15 @@
+# Translation of util-linux-2.12q.po to Russian
 # Translation of util-linux-2.12m.po to Russian
 # Copyright (C) 2003 Free Software Foundation Inc.
 # This file is put in the public domain.
-# Pavel Maryanov <acid_jack@ukr.net>, 2003, 2004.
+# Pavel Maryanov <acid_jack@ukr.net>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-21 18:46-0500\n"
-"PO-Revision-Date: 2004-12-22 12:42+0200\n"
+"Project-Id-Version: util-linux-2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-25 15:41+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -114,7 +115,7 @@ msgstr "%s: ������ ���������� ������-������� �� %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "��    ��   ���   ���   �������     ������    ����������\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "�������������:\n"
@@ -158,13 +159,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "�������������: %s [ -n ] ����������\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s �� %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +189,7 @@ msgstr "�������"
 msgid "Single"
 msgstr "���������"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -204,97 +204,99 @@ msgstr ""
 " -v         ��������� �����\n"
 " ����       ���� ��� ��������\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: ������ %d ��� ����������! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: ������ ������� � ������������� ������ `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  ��������������� ���� %ld � %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: ��������� ����� �� `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  '����' � %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: ��������� (%ld) �����\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: ������������ (%ld ������ %ld) �����\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: �������� cramfs - ��������� ����� ����\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: �������������� ��� ��������� -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: �������������� - ���������� ���������� ������ �������� �������\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s �� �������� ������� ����������� ��� ������\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: �������� cramfs - ������ ����� ������� ���\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: �������� cramfs - ��������� magic\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: �������������� - ������ ����� ������� �����. ����������� �����?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: �������� cramfs - ������ crc\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: �������������� - ������ ����� cramfs, ��� CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: �������� cramfs - ��������� ���������\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr "%s: �������� cramfs - ����� ������ �������� (%ld) != ������ ������ ����� (%ld)\n"
+msgstr ""
+"%s: �������� cramfs - ����� ������ �������� (%ld) != ������ ������ ����� (%"
+"ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: �������� cramfs - ��������� �������� ������ �����\n"
@@ -770,7 +772,7 @@ msgstr "������� ����� inode'��, �������� - 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "�� ������� �����, ����� ��� ������� %lu ������"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "����������: %s\n"
@@ -839,18 +841,18 @@ msgstr "������ ������ .. ��������"
 msgid "error closing %s"
 msgstr "������ �������� %s"
 
-#: disk-utils/mkfs.c:76
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "�������������: mkfs [-V] [-t ���_��] [�����_��] ���������� [������]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:347 getopt/getopt.c:89
-#: getopt/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: �� ������� ������!\n"
 
-#: disk-utils/mkfs.c:99
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs ������ %s (%s)\n"
@@ -858,7 +860,8 @@ msgstr "mkfs ������ %s (%s)\n"
 #: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
-"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
 " -h         print this help\n"
 " -v         be verbose\n"
 " -E         make all warnings errors (non-zero exit status)\n"
@@ -872,16 +875,20 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"�������������: %s [-h] [-v] [-b ���_���] [-e �������] [-i ����] [-n ���] ���_��� ���_����\n"
+"�������������: %s [-h] [-v] [-b ���_���] [-e �������] [-i ����] [-n ���] "
+"���_��� ���_����\n"
 " -h         ����� ���� �������\n"
 " -v         ��������� �����\n"
-" -E         �������� ���� ������ � ��������������� (��������� ������ ������)\n"
-" -b ���_��� ������������� ����� ������� �����, ������ ��������� ������� ��������\n"
+" -E         �������� ���� ������ � ��������������� (��������� ������ "
+"������)\n"
+" -b ���_��� ������������� ����� ������� �����, ������ ��������� ������� "
+"��������\n"
 " -e ������� ��������� ������ ������� (����� fsid)\n"
 " -i ����    ������� ����� ������ � �������� ������� (��������� >= 2.4.0)\n"
 " -n ���     ��������� ����� �������� ������� cramfs\n"
 " -p         ���������� %d ������� ��� ������������ ����\n"
-" -s         ���������� ����������� �������� (���������� �����, ������������)\n"
+" -s         ���������� ����������� �������� (���������� �����, "
+"������������)\n"
 " -z         �������� ����� ��� (��������� >= 2.3.39)\n"
 " ���_���    �������� ������� ��������� �������� �������\n"
 " ���_����   �������� ����\n"
@@ -893,7 +900,8 @@ msgid ""
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "������� ������� ������� (%u ����) ��� ����� `%s'.\n"
-" ����������, ��������� MAX_INPUT_NAMELEN � mkcramfs.c � ����������������.  ���������� ������.\n"
+" ����������, ��������� MAX_INPUT_NAMELEN � mkcramfs.c � ����������������.  "
+"���������� ������.\n"
 
 #: disk-utils/mkfs.cramfs.c:463
 #, c-format
@@ -902,8 +910,12 @@ msgstr "�������� ������� ������� ������.  ���������� ������.\n"
 
 #: disk-utils/mkfs.cramfs.c:514
 #, c-format
-msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
-msgstr "�������� MAXENTRIES.  ��������� ��� �������� � mkcramfs.c � ����������������.  ���������� ������.\n"
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"�������� MAXENTRIES.  ��������� ��� �������� � mkcramfs.c � "
+"����������������.  ���������� ������.\n"
 
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
@@ -917,8 +929,13 @@ msgstr "%6.2f%% (%+d ����)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:819
 #, c-format
-msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
-msgstr "��������������: �������������� ��������� ������ (������� �������) ���������� %Ld��, � ������������ ������ ������ - %u��.  �������� ��������������� ���������� ������.\n"
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"��������������: �������������� ��������� ������ (������� �������) ���������� "
+"%Ld��, � ������������ ������ ������ - %u��.  �������� ��������������� "
+"���������� ������.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
 #, c-format
@@ -948,21 +965,19 @@ msgstr "CRC: %x\n"
 #: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr "�� ������� �����, ����������� ��� ROM-������ (%Ld ��������, %d ������������)\n"
+msgstr ""
+"�� ������� �����, ����������� ��� ROM-������ (%Ld ��������, %d "
+"������������)\n"
 
 #: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "������ ROM-������ ����������� �������� (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "��������������: ����� ������ ��������� �� 255 ����.\n"
+msgstr "��������������: ����� ������ ��������� �� 255 ����.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 #, c-format
@@ -976,13 +991,19 @@ msgstr "��������������: ������� ������ ��������� �� %lu�� (����� 1 ����).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "��������������: uid'� ��������� �� %u ���.  (��� ����� �������� ������������.)\n"
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"��������������: uid'� ��������� �� %u ���.  (��� ����� �������� "
+"������������.)\n"
 
 #: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr "��������������: gid'� ��������� �� %u ���.  (��� ����� �������� ������������.)\n"
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"��������������: gid'� ��������� �� %u ���.  (��� ����� �������� "
+"������������.)\n"
 
 #: disk-utils/mkfs.cramfs.c:933
 #, c-format
@@ -1031,7 +1052,6 @@ msgstr "���������� �������� inode'�"
 msgid "write failed in write_block"
 msgstr "������ � write_block ����������� ��������"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1067,7 +1087,7 @@ msgstr "����� �� ����� �������� ������ ���������� ��������"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "���������� �������� � do_check: �������� ����\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "����� � check_blocks ���������� ��������"
 
@@ -1109,80 +1129,109 @@ msgstr "���������� ���������� ��������� %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "������� ������� �������� ������� �� '%s' ��������� �� �����"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "�������� ������ �������� %d, ��������� �������������\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr "������������ �������� ������������� ������ �������� %d, ������ ��������� �������� %d/%d\n"
+msgstr ""
+"������������ �������� ������������� ������ �������� %d, ������ ��������� "
+"�������� %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "��������������� ������ �������� %d (�� %d)\n"
+msgstr "��������������� ������ ������� %d (�� %d)\n"
+
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "�������� ������ swap-���������, ����� �� ��������.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "����� ���� ���������.\n"
 
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:249
 #, c-format
-msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "�������������: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/��� [�����]\n"
+msgid "no label, "
+msgstr "��� �����, "
+
+#: disk-utils/mkswap.c:257
+#, c-format
+msgid "no uuid\n"
+msgstr "��� uuid\n"
+
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr ""
+"�������������: %s [-c] [-v0|-v1] [-pPAGESZ] [-L �����] /dev/��� [�����]\n"
 
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "������� ����� ������ �������"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1975 text-utils/more.c:1986
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "�� ������� ������"
 
-#: disk-utils/mkswap.c:380
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "���� ������ ��������\n"
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ������ �������\n"
 
-#: disk-utils/mkswap.c:502
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ������: ����� �� ���������� ���� ��������?\n"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: ������: ������ %lu ������, ��� ������ ���������� %lu\n"
 
-#: disk-utils/mkswap.c:539
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ������: ����������� ������ %d\n"
 
-#: disk-utils/mkswap.c:546
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: ������: ������������ ��� �������� ������ ���� �� ������� ���� %ld��\n"
+msgstr ""
+"%s: ������: ������������ ��� �������� ������ ���� �� ������� ���� %ld��\n"
 
-#: disk-utils/mkswap.c:563
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: ��������������: ������������ ��� �������� ����������� �� %ld��\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: ������: ����� ������ �� ����-������������ v1\n"
+
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "������� ������� ���������� ��� �������� �� '%s' ��������� �� �����"
 
-#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "�������: ������ �������� ������������"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1195,115 +1244,83 @@ msgstr ""
 "��������. ���� �� ������. ���� �� ������������� ������ ������� ���� v0\n"
 "�� ���� ����������, ����������� ����� -f ��� ��������������� ��������.\n"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "���������� ���������� ������������ ��� ��������: ����������"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "��������������� ������������ ��� �������� ������ %d, ������ = %llu ��\n"
+msgstr ""
+"��������������� ������������ ��� �������� ������ %d, ������ = %llu ��\n"
 
-#: disk-utils/mkswap.c:623
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "���������� ���������� ���������� ��� ��������"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "���������� �������� �������� � ����������"
 
-#: disk-utils/mkswap.c:634
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync ���������� ��������"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "�������� �����: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "������ ����������: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "��� ������ ������ ����������: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] dev ���\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr "   %s [ -p ] dev ��� ������ ������� ������� ������� ���������� ������� ���� 1 fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] dev\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] dev\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2053
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "��������������"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2055
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "��������� ������������"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "���� ��� �������.\n"
 
-#: fdisk/cfdisk.c:408
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "������������� �������, ����� ��������� � ���, ��� ������� �������� ��������� ���������.\n"
+msgstr ""
+"������������� �������, ����� ��������� � ���, ��� ������� �������� ��������� "
+"���������.\n"
 
 #: fdisk/cfdisk.c:411
 #, c-format
@@ -1371,724 +1388,734 @@ msgstr "���������� ������� ���� �� �� ������� ������"
 msgid "logical partitions overlap"
 msgstr "���������� ������� �������������"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "����������� ���������� ����� �������������"
 
-#: fdisk/cfdisk.c:991
-msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!!! ���������� ������ ��� �������� ����������� ����� ��� ������������ ������� !!!!"
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr ""
+"!!!! ���������� ������ ��� �������� ����������� ����� ��� ������������ "
+"������� !!!!"
 
-#: fdisk/cfdisk.c:1002 fdisk/cfdisk.c:1014
-msgid "Cannot create logical drive here -- would create two extended partitions"
-msgstr "���������� ������� ����� ���������� ���� -- ���� �� ������� ��� ����������� �������"
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"���������� ������� ����� ���������� ���� -- ���� �� ������� ��� ����������� "
+"�������"
 
-#: fdisk/cfdisk.c:1162
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "����� ���� ������� �������. ���� ����� ��������� �������."
 
-#: fdisk/cfdisk.c:1218
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "���� ��� �����������. �� ��������� ������������ ��������������."
 
-#: fdisk/cfdisk.c:1349
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "������������ ����"
 
-#: fdisk/cfdisk.c:1372
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "������� ������� ��� �����������"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2556
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:1419
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "������� ����� �������� ������"
 
-#: fdisk/cfdisk.c:1420 fdisk/cfdisk.c:2024 fdisk/cfdisk.c:2555
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "����������"
 
-#: fdisk/cfdisk.c:1420
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "������� ����� ���������� ������"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476 fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "������"
 
-#: fdisk/cfdisk.c:1421 fdisk/cfdisk.c:1476
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "�� ��������� ������"
 
-#: fdisk/cfdisk.c:1437
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! ���������� ������ !!!"
 
-#: fdisk/cfdisk.c:1440
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "������ (� ��): "
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "������"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "�������� ������ � ������ ���������� ������������"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:1475
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "�������� ������ � ����� ���������� ������������"
 
-#: fdisk/cfdisk.c:1493
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "��� ����� ��� �������� ������������ �������"
 
-#: fdisk/cfdisk.c:1555
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "��� ������� ��������.\n"
 
-#: fdisk/cfdisk.c:1559
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "��� ������� ��������. �������� ������� � ����."
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "�������� ��������� � ������� ��������"
 
-#: fdisk/cfdisk.c:1573
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "����������� ��� ������� ��������"
 
-#: fdisk/cfdisk.c:1575
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "������ ������ ������� � ���� [�/�] ?"
 
-#: fdisk/cfdisk.c:1623
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "�� ������� ��������� ������, ��� ����� ���� �� �����"
 
-#: fdisk/cfdisk.c:1655
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "���������� ������� �������� ����������"
 
-#: fdisk/cfdisk.c:1657 fdisk/cfdisk.c:1837
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "���� ������ ������ ��� ������ - � ��� ��� ���������� �� ������"
 
-#: fdisk/cfdisk.c:1678
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "���������� �������� ������ �����"
 
-#: fdisk/cfdisk.c:1704
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "������ �������� ������"
 
-#: fdisk/cfdisk.c:1734
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "������ ���������� ������"
 
-#: fdisk/cfdisk.c:1849
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "��������������!!  ��� ����� ���������� ������ �� ����� �����!"
 
-#: fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "�� �������, ��� ������ �������� ������� �������� �� ����? (�� ��� ���): "
+msgstr ""
+"�� �������, ��� ������ �������� ������� �������� �� ����? (�� ��� ���): "
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "���"
 
-#: fdisk/cfdisk.c:1860
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "������� �������� �� �������� �� ����"
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "��"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "����������, ������� `��' ��� `���'"
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "������� �������� ������������ �� ����..."
 
-#: fdisk/cfdisk.c:1894 fdisk/cfdisk.c:1898
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "������� �������� �������� �� ����"
 
-#: fdisk/cfdisk.c:1896
-msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr "������� �������� ��������, �� ��������� ������ ������� ����������� ��������.  ���������������, ����� �������� �������."
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"������� �������� ��������, �� ��������� ������ ������� ����������� "
+"��������.  ���������������, ����� �������� �������."
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "��� �������� ��������, ���������� ��� �����������. DOS'������ MBR �� ����� ��������� ��������."
+msgstr ""
+"��� �������� ��������, ���������� ��� �����������. DOS'������ MBR �� ����� "
+"��������� ��������."
 
-#: fdisk/cfdisk.c:1908
-msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "�����, ��� ���� �������� ������ ������� ��� �����������. DOS'������ MBR �� ����� ��������� ��������."
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"�����, ��� ���� �������� ������ ������� ��� �����������. DOS'������ MBR �� "
+"����� ��������� ��������."
 
-#: fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2085 fdisk/cfdisk.c:2169
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "������� ��� ����� ��� ������� RETURN, ����� ������� �� �����: "
 
-#: fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "���������� ������� ���� '%s'"
 
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "�������� ����������: %s\n"
 
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "������ 0:\n"
 
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "������ %d:\n"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   ���   "
 
-#: fdisk/cfdisk.c:2017
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   ���/���"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   ��������"
 
-#: fdisk/cfdisk.c:2021
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   ����������"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2059 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:650
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "�����������"
 
-#: fdisk/cfdisk.c:2065 fdisk/cfdisk.c:2533 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "�����������"
 
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2069
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2104 fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "������� �������� ��� %s\n"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "              ������   �������.\n"
 
-#: fdisk/cfdisk.c:2107
-msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
-msgstr " # ���        ������      ������   ����.     �����    ��� ����.����.  (ID) ����\n"
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # ���        ������      ������   ����.     �����    ��� ����.����.  (ID) "
+"����\n"
 
-#: fdisk/cfdisk.c:2108
-msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
-msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2191
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----������----      ----�����-----    ������    �����\n"
 
-#: fdisk/cfdisk.c:2192
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # ����� ���. ���� ���   ID  ���. ���� ���     ������    ��������\n"
 
-#: fdisk/cfdisk.c:2193
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "������� �������, ��������� ������ ����� ������"
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "������� �������, ������������� �� ��������"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "������ ������� ������� ��������"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "�� �������� �������"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "����� ������� ��� cfdisk"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "��� cfdisk - ��������� ��������� ��� �������� �����, �������"
 
-#: fdisk/cfdisk.c:2260
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "��������� ��� ���������, ������� � �������� ������� ��"
 
-#: fdisk/cfdisk.c:2261
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "����� ���������� �� ������� �����."
 
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2265
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "�������      ��������"
 
-#: fdisk/cfdisk.c:2266
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ������������ ������������ ����� �������� �������"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          �������� �������� �������"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ����� ���������� ���������, �������, �������� �� �������"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ��������������: ��� ����� ������ �������������� ������"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             ����, ��� �����, ��� �� ������."
 
-#: fdisk/cfdisk.c:2272
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          ����� ���� �������"
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ������� �� ��������� ������������� �������� �������"
 
-#: fdisk/cfdisk.c:2274
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             ����������: ��� ����� ������� ������ ������������� � "
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          �������� ������ ������� �� ��������� ������������"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          ����� ������� �������� �� ����� ��� � ����"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             ���������� ��������� ��������� ��������"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             ��� ��������, �� ������� �� ������ �������:"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - ����� ������ (���������������, ��� ����� �������� �� ����)"
+msgstr ""
+"                r - ����� ������ (���������������, ��� ����� �������� �� "
+"����)"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - �������, ������������� �� ��������"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - ������� � ������� ����� ������"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          ����� �� ��������� ��� ������ ������� ��������"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          ����� ���� �������� �������"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ��������� ������� ��������� ������������� ������� �������"
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             ���������� ����� ��, ������� � ��������"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          ������ ������� �������� �� ���� (��������� ������ ��������� W)"
+msgstr ""
+"  W          ������ ������� �������� �� ���� (��������� ������ ��������� W)"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             �.�. ��� ����� ��������� ������ �� �����, �� ������"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ����������� ��� �������� ������, ������ `��' ���"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `���'"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "������� ����� ����������� ������� �� ���������� ������"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "������� ���� ����������� ������� �� ��������� ������"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ��������������� ������"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          ����� ���� �������"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "����������: ��� ������� ����� ���� ������� � �������"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "��� ������ �������� (�� ����������� ������)."
 
-#: fdisk/cfdisk.c:2328 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:2328
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "�������� ��������� ��������"
 
-#: fdisk/cfdisk.c:2329 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "�������� ��������� �������"
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "�������� ��������� �������"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2331
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "������ � ���������� ���������"
 
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "������� ���������� ���������:"
 
-#: fdisk/cfdisk.c:2355 fdisk/cfdisk.c:2926
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "�������� �������� ���������"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "������� ���������� �������:"
 
-#: fdisk/cfdisk.c:2368 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "�������� �������� �������"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "������� ���������� �������� �� �������:"
 
-#: fdisk/cfdisk.c:2381 fdisk/cfdisk.c:2943
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "�������� �������� ��������"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "������� ��� �������� �������:"
 
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "���������� �������� ��� �� �� ������"
 
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "���������� �������� ��� �� �� �����������"
 
-#: fdisk/cfdisk.c:2535
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2538 fdisk/cfdisk.c:2541
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "���/���"
 
-#: fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "����������� (%02X)"
 
-#: fdisk/cfdisk.c:2633
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "�������� ����������: %s"
 
-#: fdisk/cfdisk.c:2640
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "������: %lld ����, %lld ��"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "������: %lld ����, %lld.%lld ��"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "�������: %d   �������� �� �������: %d   ���������: %lld"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "��� �������"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "��� ��"
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[�����]"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    �������"
 
-#: fdisk/cfdisk.c:2659
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  ��������"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  ������ (��)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  ������ (��)"
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "������."
 
-#: fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "����������� ����������� ���� �������� �������"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "������� ������� ������"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "���������"
 
-#: fdisk/cfdisk.c:2719
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "�������� ��������� ����� (������ ��� ���������)"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2720
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "������� ����� �������"
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "����."
 
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "������� �� ��������� ������������� �������� ������� (������ ��� ���������)"
+msgstr ""
+"������� �� ��������� ������������� �������� ������� (������ ��� ���������)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "������� ����� ������ �� ��������� ������������"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2723
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "������� ������� �������� �� ����� ��� � ����"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "����� �� ��������� ��� ������ ������� ��������"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2725
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "�������� ��� �������� ������� (DOS, Linux, OS/2 � �.�.)"
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "��. ���."
 
-#: fdisk/cfdisk.c:2726
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "�������� ������� ��������� ������������� ������� ������� (��, ����., ���.)"
+msgstr ""
+"�������� ������� ��������� ������������� ������� ������� (��, ����., ���.)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "�������� ������� �������� �� ���� (��� ����� ��������� ������)"
 
-#: fdisk/cfdisk.c:2773
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "���������� ������� ���� ������ �����������"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "���������� ������� ������ ������"
 
-#: fdisk/cfdisk.c:2803 fdisk/cfdisk.c:2805
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "���������� ��������������� ���� ������"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "���� ������ ��������������"
 
-#: fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "���� ������ ��� ������������"
 
-#: fdisk/cfdisk.c:2832
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "���������� �������� ��� ������� �������"
 
-#: fdisk/cfdisk.c:2859 fdisk/cfdisk.c:2865
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "�������� ������ ���"
 
-#: fdisk/cfdisk.c:2872
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "�������� �������"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2889
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2123,7 +2150,366 @@ msgstr ""
 "                ������� � ����� �������� �� �������.\n"
 "\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\t�� ���� ����� ���� ������ ����� AIX.\n"
+"\t� ��������� �� ������ ������ Linux ��\n"
+"\t����� ������������ ��� �����. ��� ��\n"
+"\t����� ��� ��������� �������:\n"
+"\t1. ��� ������ fdisk �������� ��� ������\n"
+"\t   �� �����.\n"
+"\t2. ���������, ����� ���� ���� �� �������\n"
+"\t   ������ ������ ������ �����. (����� ��\n"
+"\t   ������ ������� ��� ��������� �����,\n"
+"\t   ���� ��� �� �����������.)\n"
+"\t3. ����� ��������� ����� �����������\n"
+"\t   ���� ���������, ��� ��������� �������\n"
+"\t   ���� �� AIX ����� ������. (�����, ��\n"
+"]\t   ������� AIXpert'��)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"����� BSD ��� ����������: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "�������� �������"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   �������� ������� BSD"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   �������������� ������ �����"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   ��������� bootstrap"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   ������ ����� ��������� �������� ������"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   ����� ����� ����"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   ���������� ������ ������� BSD"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   ����� ������� �������� BSD"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   ����� ��� ���������� ���������"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   ������� � ������� ����"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   ����������� ������ ����� �����"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   ��������� id �������� ������� �������"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   ��������� ������ ��������� (��������/�������)"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   ������ ����� ����� �� ����"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   ���������� ������� BSD � �������� ��-BSD"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "������ %s �������� �������� ��������� ������� ������.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "�������� ����� ����� %s � ������� %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "�� %s ��� ������� *BSD.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "������� ����� ����� BSD (m ��� �������): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "������ %s"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "��������� %s ��� +size ��� +sizeM ��� +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "���: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "���: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "����: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "�����: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "�����:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " �������"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " bad-������"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "����/������: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "�������/�������: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "�������/�������: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "�������/�������: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "��������: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "��/���: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "�����������: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "������� �������: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "������� ��������: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "������������ �������: %ld\t\t# �����������\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "����� �������: %ld\t# �����������\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "������ �����: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d �������:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#      ������     �����      ������   ��� ��   [fsize bsize   cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "����� ����� ������������ �� %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s �� �������� ����� �����.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "������ ������� ����� �����? (�/�) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "����/������"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "�������/�������"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "�������/�������"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "��������"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "�������/�������"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "������ ���� <= �������/������� * �������/������� (�� ���������).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "��/���"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "�����������"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "������� �������"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "������� ��������"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "������������ �������"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "����� �������"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Bootstrap ������������� � ������ �����!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Bootstrap ���������� �� %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "������ (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "���� ������� ����������� ��������� ���������� ��������\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "���� ������ ��� ����������.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "��������������: ������� ����� �������� (%d, �������� - %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"���������������� �����.\n"
+
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2143,7 +2529,7 @@ msgstr ""
 "-u: ���������� ������ � ����� � �������� ������� (������ ��������)\n"
 "-b 2048: (��� ��������� MO-������) ������������� 2048-�������� ��������\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2159,227 +2545,184 @@ msgstr ""
 "  ���: fdisk /dev/rd/c0d0  ���: fdisk /dev/ida/c0d0  (��� RAID-���������)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "���������� ��������� %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "���������� ����� �� %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "���������� �������� %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ���������� �������� �� %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "���������� �������� ��� ������\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "������������ ������\n"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:367 fdisk/fdisk.c:374
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
-msgid "Command action"
-msgstr "�������� �������"
-
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   ������������ ����� ��������"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �������������� ����� ����� bsd"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ������������ ����� ������������"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   �������� �������"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   ������ ��������� ����� �������� ������"
 
-#. sun
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:368 fdisk/fdisk.c:380
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
-#: fdisk/fdiskbsdlabel.c:134
-msgid "   m   print this menu"
-msgstr "   m   ����� ����� ����"
-
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   ���������� ������ �������"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   �������� ����� ������ ������� �������� DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   ����� ������� ��������"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:370 fdisk/fdisk.c:384
-#: fdisk/fdisk.c:407 fdisk/fdisk.c:424 fdisk/fdisk.c:440 fdisk/fdisk.c:457
-#: fdisk/fdiskbsdlabel.c:137
-msgid "   q   quit without saving changes"
-msgstr "   q   ����� ��� ���������� ���������"
-
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   �������� ����� ������ ����� ����� Sun"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   ��������� id ������� �������"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   ��������� ������ ��������� ������/�����������"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   �������� ������� ��������"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   ������ ������� �������� �� ���� � �����"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   �������������� ���������������� (������ ��� ���������)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   ����� ������������ �������"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   �������������� ����������� ������������ �����"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   ����� ������� ��� �������� sgi"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ������������ ����� ��������"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   ������������ ����� dos-�������������"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ��������� ���������� �������������� ���������"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   ��������� ���������� ���������"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ����� ����� ������ � ������� ��������"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ��������� ���������� �������������� �������� �� �������"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   ��������� ���������� �������"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   ��������� ������������ �����������"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ��������� �������� �������� (��/���)"
 
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
-#: fdisk/fdiskbsdlabel.c:138
-msgid "   r   return to main menu"
-msgstr "   r   ������� � ������� ����"
-
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   ��������� ���������� �������� �� �������"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ��������� ���������� ���������� ���������"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   ����������� ������ ������ �������"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ������ ����������� ��������"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   �������� ������� �������� IRIX (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   ����������� ������� ��������"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "�� ������ ����������"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "�������"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:936
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "�������"
 
-#: fdisk/fdisk.c:591 fdisk/fdisk.c:1260 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:936
-msgid "cylinders"
-msgstr "��������"
-
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2388,11 +2731,11 @@ msgstr ""
 "%s%s.\n"
 "�� ������ ������� ��� �� ���� �������������� �������.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " � "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2411,12 +2754,12 @@ msgstr ""
 "2) ��������� � ����������� �������� �� ������ ��\n"
 "   (����., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "�������� �������� � �������� ����������� �������\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2425,17 +2768,19 @@ msgstr ""
 "��������������: ������������ ������� ����� #%d.\n"
 "��� ����� �������, ���� �� ��������� ��� ������� ��������.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "��������������: ��������� �� �������������� ������ � ������� �������� %d\n"
+msgstr ""
+"��������������: ��������� �� �������������� ������ � ������� �������� %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr "��������������: ������������ �������������� ������ � ������� �������� %d\n"
+msgstr ""
+"��������������: ������������ �������������� ������ � ������� �������� %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2449,17 +2794,17 @@ msgstr ""
 "������������.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "����������: ������ ������� - %d (�� %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "�� ������ �� � ��������� �������� ������� ��������.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2468,27 +2813,35 @@ msgstr ""
 "�� ���� ����� ������� ������� DOS � BSD.\n"
 "������� �������  'b' ��� �������� � ����� BSD.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
-msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
-msgstr "���������� �� �������� �� ������ ������� �������� DOS, �� ����� ����� Sun, SGI ��� OSF\n"
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr ""
+"���������� �� �������� �� ������ ������� �������� DOS, �� ����� ����� Sun, "
+"SGI ��� OSF\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "���������� ������\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "������������ �������������� ����������� ������ %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
-msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
-msgstr "��������������: �������� ���� 0x%04x ������� �������� %d ����� ��������� �������\n"
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"��������������: �������� ���� 0x%04x ������� �������� %d ����� ��������� "
+"�������\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2497,83 +2850,83 @@ msgstr ""
 "\n"
 "������ ������� EOF - ���������� ������...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "����������������� ��� (������� L ��� ��������� ������ �����): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, �� ��������� %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "������������ �������� �� ��������� %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "�������� �� ��������� ���������.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "����� �������"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "��������������: ������ %d ����� ������ ���\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "��������� ������ %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "������� ��� �� ����������!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "��� �������� ������� ��� ���� ����������!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "�������"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "������"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "��������� ������ ��������� ������/����������� �� %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "��������������: ������ %d �� �������� ����������� ��������\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "���� DOS-������������� ����������\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "���� DOS-������������� �� ����������\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "������ %d ��� �� ����������!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2587,7 +2940,7 @@ msgstr ""
 "���������. �� ������ ������� ������,\n"
 "��������� ������� `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2596,7 +2949,7 @@ msgstr ""
 "�� �� ������ �������� ������ �� ����������� ��� ��������\n"
 "������� ������� ���.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2607,7 +2960,7 @@ msgstr ""
 "��� ���� ������� SunOS/Solaris, � ������� ������� ���� ��� Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2618,52 +2971,52 @@ msgstr ""
 "� ������ 11 � ���� ������ ���� (6), ��� ���� ������� IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "��������� ��� ������� %d ������� �� %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "������ %d ����� ��������� ����������/���������� ������ (��-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ���=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "�����=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "������ %d ����� ��������� ����������/���������� ���������:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "������ %i ���������� �� �� ������� ��������:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "������ ���� (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "������ %i �� ������������� �� ������� ��������.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "������ ���� (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2672,7 +3025,7 @@ msgstr ""
 "\n"
 "���� %s: %ld ��, %lld ����\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2681,17 +3034,17 @@ msgstr ""
 "\n"
 "���� %s: %ld.%ld ��, %lld ����\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d �������, %d ��������/�������, %d ���������"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", ����� %llu ��������"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2700,7 +3053,7 @@ msgstr ""
 "������� = %s �� %d * %d = %d ����\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -2709,7 +3062,7 @@ msgstr ""
 "������ ���������. ����������� ��� � �������.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2720,16 +3073,16 @@ msgstr ""
 "��������, �� ������� �������� ����������.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ����     ������       �����       �����   Id  �������\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "����-��"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +3091,7 @@ msgstr ""
 "\n"
 "������ ������� �������� ����������� �� � �������� �������\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2749,93 +3102,84 @@ msgstr ""
 "���� %s: %d �������, %d ��������, %d ���������\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "#  AF ��� ���  ��� ��� ���  ���    ������      ���� ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "��������������: ������ %d �������� ������� ������\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "������ %d: ������� %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "������ %d: ������ %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "������ %d: ������� %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "������ %d: ���������� ������� %d ������������ ���������� �������� %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "��������������: �������� ������ ������ � ������� %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "��������������: ������ %d ����������� ������ %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "��������������: ������ %d ����\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "���������� ������ %d �� ��������� ������� � ������� %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
-msgstr "��������� ���������� ���������� �������� %d ������, ��� �������� %lld\n"
+msgstr ""
+"��������� ���������� ���������� �������� %d ������, ��� �������� %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld ��������� ��������\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "������ %d ��� ���������.  ������� ��� ����� ���, ��� ����� �������� ���.\n"
-
-#: fdisk/fdisk.c:1945 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
-#, c-format
-msgid "First %s"
-msgstr "������ %s"
+msgstr ""
+"������ %d ��� ���������.  ������� ��� ����� ���, ��� ����� �������� ���.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "������ %d ��� �������\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "����������� ��������� ��������� �������\n"
 
-#: fdisk/fdisk.c:2005 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
-#, c-format
-msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "��������� %s ��� +size ��� +sizeM ��� +sizeK"
-
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -2850,27 +3194,23 @@ msgstr ""
 "\t��������������: ��� ���� ���������� ��\n"
 "\t������ ����� ����� ���������.\n"
 
-#: fdisk/fdisk.c:2082 fdisk/fdiskbsdlabel.c:618
-#, c-format
-msgid "The maximum number of partitions has been created\n"
-msgstr "���� ������� ����������� ��������� ���������� ��������\n"
-
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "������� �� ������ ������� ��������� ������� � �������� ����������� ������\n"
+msgstr ""
+"������� �� ������ ������� ��������� ������� � �������� ����������� ������\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "������������� ��� ���������� �������\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "����������� �������� ������\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -2881,20 +3221,20 @@ msgstr ""
 "   %s\n"
 "   p   �������� ������ (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   ���������� (5 ��� �����)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   �����������"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "�������� ����� ������� ��� ���� `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -2903,12 +3243,12 @@ msgstr ""
 "������� �������� ���� ��������!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "���������� ioctl() ��� ������������� ������� ��������.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -2917,11 +3257,12 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 "\n"
-"��������������: ������������� ������� �������� ����������� �������� � ������� %d: %s.\n"
+"��������������: ������������� ������� �������� ����������� �������� � "
+"������� %d: %s.\n"
 "���� ��� ��� ���������� ������ �������.\n"
 "����� ������� ����� ������������ ��� ��������� ������������.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -2935,7 +3276,7 @@ msgstr ""
 "�������� ����������� fdisk ��� ���������\n"
 "�������������� ����������.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -2944,81 +3285,88 @@ msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "���������������� �����.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "������ %d �� ����� ������� � �������\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "����� ������ ������"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "������� �������� (m ��� �������): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "���������� ���������"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "���������� �������"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "���������� ��������"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr "��������������: ��������������� �������� ������� ��� ������������� � DOS\n"
+msgstr ""
+"��������������: ��������������� �������� ������� ��� ������������� � DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "�� ����� %s ����������� ������ ������� ��������\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2454
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ����������� �������\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "��� ���� ���� ������� ������ ������� - ����� -b ���������������\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
-msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
-msgstr "��������������: ����� -b (��������� ������� �������) ������ ���� ������������ � ����� ��������� �����������\n"
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"��������������: ����� -b (��������� ������� �������) ������ ���� "
+"������������ � ����� ��������� �����������\n"
 
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-msgstr "���������� ����� ����� OSF/1 �� %s, ����������� ������� � ����� ����� �����.\n"
+msgstr ""
+"���������� ����� ����� OSF/1 �� %s, ����������� ������� � ����� ����� "
+"�����.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "������� (m ��� �������): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3027,16 +3375,16 @@ msgstr ""
 "\n"
 "������� boot-����: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "����������, ������� ��� ������ boot-�����: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-���� �� �������\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3047,323 +3395,6 @@ msgstr ""
 "\t� ��������� ���� �������� ��� ������ �������� SGI �� ��������.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:27
-msgid ""
-"\n"
-"\tThere is a valid AIX label on this disk.\n"
-"\tUnfortunately Linux cannot handle these\n"
-"\tdisks at the moment.  Nevertheless some\n"
-"\tadvice:\n"
-"\t1. fdisk will destroy its contents on write.\n"
-"\t2. Be sure that this disk is NOT a still vital\n"
-"\t   part of a volume group. (Otherwise you may\n"
-"\t   erase the other disks as well, if unmirrored.)\n"
-"\t3. Before deleting this physical volume be sure\n"
-"\t   to remove the disk logically from your AIX\n"
-"\t   machine.  (Otherwise you become an AIXpert)."
-msgstr ""
-"\n"
-"\t�� ���� ����� ���� ������ ����� AIX.\n"
-"\t� ��������� �� ������ ������ Linux ��\n"
-"\t����� ������������ ��� �����. ��� ��\n"
-"\t����� ��� ��������� �������:\n"
-"\t1. ��� ������ fdisk �������� ��� ������\n"
-"\t   �� �����.\n"
-"\t2. ���������, ����� ���� ���� �� �������\n"
-"\t   ������ ������ ������ �����. (����� ��\n"
-"\t   ������ ������� ��� ��������� �����,\n"
-"\t   ���� ��� �� �����������.)\n"
-"\t3. ����� ��������� ����� �����������\n"
-"\t   ���� ���������, ��� ��������� �������\n"
-"\t   ���� �� AIX ����� ������. (�����, ��\n"
-"]\t   ������� AIXpert'��)."
-
-#: fdisk/fdiskbsdlabel.c:122
-#, c-format
-msgid ""
-"\n"
-"BSD label for device: %s\n"
-msgstr ""
-"\n"
-"����� BSD ��� ����������: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:130
-msgid "   d   delete a BSD partition"
-msgstr "   d   �������� ������� BSD"
-
-#: fdisk/fdiskbsdlabel.c:131
-msgid "   e   edit drive data"
-msgstr "   e   �������������� ������ �����"
-
-#: fdisk/fdiskbsdlabel.c:132
-msgid "   i   install bootstrap"
-msgstr "   i   ��������� bootstrap"
-
-#: fdisk/fdiskbsdlabel.c:133
-msgid "   l   list known filesystem types"
-msgstr "   l   ������ ����� ��������� �������� ������"
-
-#: fdisk/fdiskbsdlabel.c:135
-msgid "   n   add a new BSD partition"
-msgstr "   n   ���������� ������ ������� BSD"
-
-#: fdisk/fdiskbsdlabel.c:136
-msgid "   p   print BSD partition table"
-msgstr "   p   ����� ������� �������� BSD"
-
-#: fdisk/fdiskbsdlabel.c:139
-msgid "   s   show complete disklabel"
-msgstr "   s   ����������� ������ ����� �����"
-
-#: fdisk/fdiskbsdlabel.c:140
-msgid "   t   change a partition's filesystem id"
-msgstr "   t   ��������� id �������� ������� �������"
-
-#: fdisk/fdiskbsdlabel.c:141
-msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   ��������� ������ ��������� (��������/�������)"
-
-#: fdisk/fdiskbsdlabel.c:142
-msgid "   w   write disklabel to disk"
-msgstr "   w   ������ ����� ����� �� ����"
-
-#: fdisk/fdiskbsdlabel.c:144
-msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   ���������� ������� BSD � �������� ��-BSD"
-
-#: fdisk/fdiskbsdlabel.c:176
-#, c-format
-msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "������ %s �������� �������� ��������� ������� ������.\n"
-
-#: fdisk/fdiskbsdlabel.c:180
-#, c-format
-msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "�������� ����� ����� %s � ������� %d.\n"
-
-#: fdisk/fdiskbsdlabel.c:190
-#, c-format
-msgid "There is no *BSD partition on %s.\n"
-msgstr "�� %s ��� ������� *BSD.\n"
-
-#: fdisk/fdiskbsdlabel.c:204
-msgid "BSD disklabel command (m for help): "
-msgstr "������� ����� ����� BSD (m ��� �������): "
-
-#: fdisk/fdiskbsdlabel.c:318
-#, c-format
-msgid "type: %s\n"
-msgstr "���: %s\n"
-
-#: fdisk/fdiskbsdlabel.c:320
-#, c-format
-msgid "type: %d\n"
-msgstr "���: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:321
-#, c-format
-msgid "disk: %.*s\n"
-msgstr "����: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:322
-#, c-format
-msgid "label: %.*s\n"
-msgstr "�����: %.*s\n"
-
-#: fdisk/fdiskbsdlabel.c:323
-#, c-format
-msgid "flags:"
-msgstr "�����:"
-
-#: fdisk/fdiskbsdlabel.c:325
-#, c-format
-msgid " removable"
-msgstr " �������"
-
-#: fdisk/fdiskbsdlabel.c:327
-#, c-format
-msgid " ecc"
-msgstr " ecc"
-
-#: fdisk/fdiskbsdlabel.c:329
-#, c-format
-msgid " badsect"
-msgstr " bad-������"
-
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:333
-#, c-format
-msgid "bytes/sector: %ld\n"
-msgstr "����/������: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:334
-#, c-format
-msgid "sectors/track: %ld\n"
-msgstr "�������/�������: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:335
-#, c-format
-msgid "tracks/cylinder: %ld\n"
-msgstr "�������/�������: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:336
-#, c-format
-msgid "sectors/cylinder: %ld\n"
-msgstr "�������/�������: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:337
-#, c-format
-msgid "cylinders: %ld\n"
-msgstr "��������: %ld\n"
-
-#: fdisk/fdiskbsdlabel.c:338
-#, c-format
-msgid "rpm: %d\n"
-msgstr "��/���: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:339
-#, c-format
-msgid "interleave: %d\n"
-msgstr "�����������: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:340
-#, c-format
-msgid "trackskew: %d\n"
-msgstr "������� �������: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:341
-#, c-format
-msgid "cylinderskew: %d\n"
-msgstr "������� ��������: %d\n"
-
-#: fdisk/fdiskbsdlabel.c:342
-#, c-format
-msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "������������ �������: %ld\t\t# �����������\n"
-
-#: fdisk/fdiskbsdlabel.c:344
-#, c-format
-msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "����� �������: %ld\t# �����������\n"
-
-#: fdisk/fdiskbsdlabel.c:346
-#, c-format
-msgid "drivedata: "
-msgstr "������ �����: "
-
-#: fdisk/fdiskbsdlabel.c:355
-#, c-format
-msgid ""
-"\n"
-"%d partitions:\n"
-msgstr ""
-"\n"
-"%d �������:\n"
-
-#: fdisk/fdiskbsdlabel.c:356
-#, c-format
-msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#      ������     �����      ������   ��� ��   [fsize bsize   cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
-#, c-format
-msgid "Writing disklabel to %s.\n"
-msgstr "����� ����� ������������ �� %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
-#, c-format
-msgid "%s contains no disklabel.\n"
-msgstr "%s �� �������� ����� �����.\n"
-
-#: fdisk/fdiskbsdlabel.c:427
-msgid "Do you want to create a disklabel? (y/n) "
-msgstr "������ ������� ����� �����? (�/�) "
-
-#: fdisk/fdiskbsdlabel.c:467
-msgid "bytes/sector"
-msgstr "����/������"
-
-#: fdisk/fdiskbsdlabel.c:468
-msgid "sectors/track"
-msgstr "�������/�������"
-
-#: fdisk/fdiskbsdlabel.c:469
-msgid "tracks/cylinder"
-msgstr "�������/�������"
-
-#: fdisk/fdiskbsdlabel.c:477
-msgid "sectors/cylinder"
-msgstr "�������/�������"
-
-#: fdisk/fdiskbsdlabel.c:481
-#, c-format
-msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "������ ���� <= �������/������� * �������/������� (�� ���������).\n"
-
-#: fdisk/fdiskbsdlabel.c:483
-msgid "rpm"
-msgstr "��/���"
-
-#: fdisk/fdiskbsdlabel.c:484
-msgid "interleave"
-msgstr "�����������"
-
-#: fdisk/fdiskbsdlabel.c:485
-msgid "trackskew"
-msgstr "������� �������"
-
-#: fdisk/fdiskbsdlabel.c:486
-msgid "cylinderskew"
-msgstr "������� ��������"
-
-#: fdisk/fdiskbsdlabel.c:487
-msgid "headswitch"
-msgstr "������������ �������"
-
-#: fdisk/fdiskbsdlabel.c:488
-msgid "track-to-track seek"
-msgstr "����� �������"
-
-#: fdisk/fdiskbsdlabel.c:529
-#, c-format
-msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Bootstrap: %sboot -> boot%s (%s): "
-
-#: fdisk/fdiskbsdlabel.c:554
-#, c-format
-msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Bootstrap ������������� � ������ �����!\n"
-
-#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
-#, c-format
-msgid "Bootstrap installed on %s.\n"
-msgstr "Bootstrap ���������� �� %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:599
-#, c-format
-msgid "Partition (a-%c): "
-msgstr "������ (a-%c): "
-
-#: fdisk/fdiskbsdlabel.c:630
-#, c-format
-msgid "This partition already exists.\n"
-msgstr "���� ������ ��� ����������.\n"
-
-#: fdisk/fdiskbsdlabel.c:756
-#, c-format
-msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "��������������: ������� ����� �������� (%d, �������� - %d).\n"
-
-#: fdisk/fdiskbsdlabel.c:804
-#, c-format
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"���������������� �����.\n"
-
 #: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
@@ -3420,15 +3451,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux ����"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux ��������."
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3438,8 +3469,12 @@ msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:163
 #, c-format
-msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
-msgstr "� ������������ � MIPS Computer Systems, Inc ����� �� ������ ��������� ����� 512 ����\n"
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"� ������������ � MIPS Computer Systems, Inc ����� �� ������ ��������� ����� "
+"512 ����\n"
 
 #: fdisk/fdisksgilabel.c:182
 #, c-format
@@ -3559,7 +3594,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "������������ ����� ������ ������ ��� ����� �����.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "������� �� ����������\n"
@@ -3644,7 +3679,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t�� ������� ��������� ��� boot-�����.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3665,11 +3699,10 @@ msgstr ""
 "������ ������ ����� ����� \"SGI volume\" ����� �������� ���.\n"
 "������� ��, ���� �� �������, ��� ��������� ���� ������ ��������.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "��\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3726,11 +3759,13 @@ msgstr ""
 #: fdisk/fdisksgilabel.c:728
 #, c-format
 msgid ""
-"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
-"��������������: BLKGETSIZE ioctl ���������� �������� �� %s. ������������ �������� ��������� �������� %d.\n"
-"��� �������� ����� ���� ��������� ��� ��������� > 33.8 ��.\n"
+"��������������: BLKGETSIZE ioctl ���������� �������� �� %s. ������������ "
+"�������� ��������� �������� %d.\n"
+"��� �������� ����� ���� ��������� ��� ��������� > 33.8 ��.\n"
 
 #: fdisk/fdisksgilabel.c:741
 #, c-format
@@ -3742,44 +3777,43 @@ msgstr "����������� ������� ��������� ��������� ������� %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t������=%d\t�����=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "������"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "��������������� Linux raid"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3794,12 +3828,12 @@ msgstr ""
 "��� ������������� �������� ����� (�������\n"
 "s � ������� ����)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "���������������� ����� %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3813,7 +3847,7 @@ msgstr ""
 "������������.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3823,72 +3857,72 @@ msgstr ""
 "   ?   �������������� ������������\n"
 "   0   ���������� (�� ���������� �� ��������� ��� ������������� ������������)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "�������� ��� (? - ����, 0 - ����������): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "���������������� ����������� ��������.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "�������/�������"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "�������������� ��������"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "���������� ��������"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "�������� �������� (��/���)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "����������� �����������"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "�������������� ������� �� �������"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "�� ������ �������� ��� ��������� ����� �� ���� x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" ����"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux ��������"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "������ %d �� ������������� �� ������� ��������\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "������ %d ������������� � ������� � �������� %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "�������������� ���������� - ������� 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "�������������� ���������� - ������� %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3897,7 +3931,7 @@ msgstr ""
 "������ ������� ��� ���������� ���� ����.\n"
 "������� ��������� ��� ��������� �� ����� ��������� ��������.\n"
 
-#: fdisk/fdisksunlabel.c:589
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3908,7 +3942,7 @@ msgstr ""
 "%d %s ��������� ������ ������. ��� ����� ��� �������\n"
 "�� %d %s\n"
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3917,7 +3951,7 @@ msgstr ""
 "���� �� ������ ������������ ������������� � SunOS/Solaris, ������������\n"
 "�������� ���� ������ ��� ���� disk (5), ������� � 0, � %u ���������\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3933,7 +3967,7 @@ msgstr ""
 "�������, ��� ������ �������� ���� ������ ��� 82\n"
 "82 (Linux ����): "
 
-#: fdisk/fdisksunlabel.c:654
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3952,7 +3986,7 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:668
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3965,16 +3999,16 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ����   ������     �����     �����   Id  �������\n"
 
-#: fdisk/fdisksunlabel.c:698
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "���������� �������������� ���������"
 
-#: fdisk/fdisksunlabel.c:731
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "���������� ���������� ���������"
 
@@ -3998,32 +4032,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "�����������"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX �����������"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot-��������"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4032,7 +4060,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4125,12 +4152,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4151,8 +4176,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4162,7 +4185,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ��� SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4183,12 +4205,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / ������ Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux ���� / Solaris"
@@ -4217,12 +4237,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4231,7 +4249,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4296,30 +4313,22 @@ msgstr "������ �� ��"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS ��"
@@ -4328,116 +4337,110 @@ msgstr "BeOS ��"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC ����."
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ���������"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "������ ������ �� %s - ���������� ����� %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "������ ������: ����� 0x%08x%08x, �������� 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "�������� ������ - ������\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "������ ������ � %s - ���������� ��������� ������ %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "������: ������ %lu �� ����� ��������� msdos\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "������ ������ �� %s - ���������� �������� ������ %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "���������� ������� ���� � ����������� �������� ������� (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "������ ������ �� %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "���������� ���������� ��������� ����� �������������� ������� (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr "���� �������������� ������� ����� �������� ������ - �������������� ��������\n"
+msgstr ""
+"���� �������������� ������� ����� �������� ������ - �������������� ��������\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "�������� ������?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "���������� ������� ���� �������������� �������  (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "������ ������ %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "���������� ������� ���������� %s ��� ������\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "������ ������ ������� %lu �� %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "���� %s: ���������� �������� ���������\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "���� %s: ���������� �������� ������\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4449,22 +4452,23 @@ msgstr ""
 "�������� �� ����� ������.\n"
 "[����������� ����� --force, ���� �� ������������� ������ �����]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "��������������: HDIO_GETGEO �������, ��� ������� %lu �������\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "��������������: HDIO_GETGEO �������, ��� ������� %lu ��������\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr "��������������: BLKGETSIZE/HDIO_GETGEO �������, ��� ������� %lu ���������\n"
+msgstr ""
+"��������������: BLKGETSIZE/HDIO_GETGEO �������, ��� ������� %lu ���������\n"
 
-#: fdisk/sfdisk.c:521
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4473,7 +4477,7 @@ msgstr ""
 "��������������: ������������� ���������� �������� (%lu) - ������ �� 63\n"
 "��� ������� �������� � ���� ��������, ������������ ��������� C/H/S.\n"
 
-#: fdisk/sfdisk.c:525
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4482,22 +4486,33 @@ msgstr ""
 "\n"
 "���� %s: %lu ���������, %lu �������, %lu ��������/�������\n"
 
-#: fdisk/sfdisk.c:607
+#: fdisk/sfdisk.c:606
 #, c-format
-msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr "%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� "
+"0-%lu)\n"
 
-#: fdisk/sfdisk.c:612
+#: fdisk/sfdisk.c:611
 #, c-format
-msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
-msgstr "%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� 1-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� "
+"1-%lu)\n"
 
-#: fdisk/sfdisk.c:617
+#: fdisk/sfdisk.c:616
 #, c-format
-msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
-msgstr "%s ������� %s ����� ����������� �������� ��� ���������: %lu (������ ���� ����� 0-%lu)\n"
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s ������� %s ����� ����������� �������� ��� ���������: %lu (������ ���� "
+"����� 0-%lu)\n"
 
-#: fdisk/sfdisk.c:657
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4506,12 +4521,12 @@ msgstr ""
 "Id  ���\n"
 "\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "�������������� ������� ��������...\n"
 
-#: fdisk/sfdisk.c:819
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4520,31 +4535,31 @@ msgstr ""
 "����������� ��������. ����������� ����\n"
 "������� ����� �������������� mkfs\n"
 
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "������ �������� %s\n"
 
-#: fdisk/sfdisk.c:862
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ��� ������ �������\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "�������������� ������ - ������������ �������\n"
 
-#: fdisk/sfdisk.c:924
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# ������� �������� %s\n"
 
-#: fdisk/sfdisk.c:935
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "��������������� ������ - ������������ %s\n"
 
-#: fdisk/sfdisk.c:939
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4553,12 +4568,12 @@ msgstr ""
 "������� = �������� �� %lu ����, ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:942
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "  ����-�� ����   ���   �����    #���     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:947
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4567,12 +4582,12 @@ msgstr ""
 "������� = ������� �� 512 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:949
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "  ����-�� ����   ������     �����   #�������  Id  �������\n"
 
-#: fdisk/sfdisk.c:952
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4581,12 +4596,12 @@ msgstr ""
 "������� = ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:954
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "  ����-�� ����  ������     �����     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4595,31 +4610,31 @@ msgstr ""
 "������� = mebi-����� �� 1048576 ����, ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:959
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  ����-�� ����   ��� �����    �iB     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:1119
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t������: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1126
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t�����: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ ������������� �� �������� %ld, ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "������� �� �������\n"
 
-#: fdisk/sfdisk.c:1143
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4631,51 +4646,53 @@ msgstr ""
 "(������ %ld/%ld/%ld).\n"
 "��� �������� ����� ��������������� ��� ���������.\n"
 
-#: fdisk/sfdisk.c:1192
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "������� �������� �����������.\n"
 
-#: fdisk/sfdisk.c:1194
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "�������, ���������� ������ ������� %d.\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr "��������������: ������ %s ����� ������� ������, �� �� �� ������� ��� ������\n"
+msgstr ""
+"��������������: ������ %s ����� ������� ������, �� �� �� ������� ��� ������\n"
 
-#: fdisk/sfdisk.c:1206
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "��������������: ������ %s ����� ������� ������ � �������� �����������\n"
+msgstr ""
+"��������������: ������ %s ����� ������� ������ � �������� �����������\n"
 
-#: fdisk/sfdisk.c:1209
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "��������������: ������ %s ����� ������� ������ � ��������� ������\n"
 
-#: fdisk/sfdisk.c:1220
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "��������������: ������ %s "
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "�� ��������� � ������� %s\n"
 
-#: fdisk/sfdisk.c:1232
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "��������������: ������� %s "
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "� ������������� � %s\n"
 
-#: fdisk/sfdisk.c:1244
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4684,17 +4701,17 @@ msgstr ""
 "��������������: ������ %s �������� ����� ������� �������� (������ %lu),\n"
 "� �������� �� ��� ����������\n"
 
-#: fdisk/sfdisk.c:1256
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "��������������: ������ %s ���������� � �������� �������\n"
 
-#: fdisk/sfdisk.c:1260
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "��������������: ������ %s ������������� �� ����� �����\n"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4702,17 +4719,17 @@ msgstr ""
 "����� �������� �������� �������� ������ ���� �����\n"
 "���� �������� (��� �� �����, ��� Linux ��� �� ��������)\n"
 
-#: fdisk/sfdisk.c:1293
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "��������������: ������ %s �� ���������� �� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1299
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "��������������: ������ %s �� ������������� �� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1317
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4720,46 +4737,51 @@ msgstr ""
 "��������������: ����� ������ ������� �������� ��� ����������� (��������)\n"
 "��� �� ����� �������� ��� LILO, �� DOS'������ MBR �� �������� ���� ����.\n"
 
-#: fdisk/sfdisk.c:1324
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"��������������: ������ �������� ����� ���� ��������� ������ � �������� ��������\n"
+"��������������: ������ �������� ����� ���� ��������� ������ � �������� "
+"��������\n"
 "LILO ���������� ���� `�����������'.\n"
 
-#: fdisk/sfdisk.c:1330
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"��������������: ��� ��������� �������, ����������� ��� ����������� (��������)\n"
+"��������������: ��� ��������� �������, ����������� ��� ����������� "
+"(��������)\n"
 "��� �� ����� �������� ��� LILO, �� DOS'������ MBR �� �������� ���� ����.\n"
 
-#: fdisk/sfdisk.c:1344
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "������"
 
-#: fdisk/sfdisk.c:1347
+#: fdisk/sfdisk.c:1346
 #, c-format
-msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "������ %s: ������: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"������ %s: ������: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1353
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "�����"
 
-#: fdisk/sfdisk.c:1356
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "������ %s: �����: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
+msgstr ""
+"������ %s: �����: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1359
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ %s ������������� �� �������� %ld, ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1384
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4768,7 +4790,7 @@ msgstr ""
 "��������������: ������ ������������ ������� �������� � %ld �� %ld\n"
 "(������ ��� ������ ��������, ��� ��������� ��� �����������.)\n"
 
-#: fdisk/sfdisk.c:1390
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4776,341 +4798,361 @@ msgstr ""
 "��������������: ����������� ������ �� ���������� �� ������� �������.\n"
 "DOS � Linux ����� ���������������� ���������� ��-������.\n"
 
-#: fdisk/sfdisk.c:1408 fdisk/sfdisk.c:1485
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "������� ����� �������� - ������������ ��� ��������� ������ (%d)\n"
 
-#: fdisk/sfdisk.c:1423
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "������ ��������?\n"
 
-#: fdisk/sfdisk.c:1544
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "��������� �������� ������ - ���������� ����������\n"
 
-#: fdisk/sfdisk.c:1551
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "������� ��������� DM6  - ������\n"
 
-#: fdisk/sfdisk.c:1571
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "�������... ����������� ������ �������� �������?\n"
 
-#: fdisk/sfdisk.c:1578 fdisk/sfdisk.c:1589
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "�������... ������ BSD �������� �������?\n"
 
-#: fdisk/sfdisk.c:1623
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: �������������� ��� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1635
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "��� ������ ���� -n: ������ �� ��������\n"
 
-#: fdisk/sfdisk.c:1651
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "������ ���������� ������ �������� - ����������� ����������\n"
 
-#: fdisk/sfdisk.c:1656
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "������ ������ ������� �� %s\n"
 
-#: fdisk/sfdisk.c:1733
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "������� ��� ������������� ������ ����� - ����������� �����\n"
 
-#: fdisk/sfdisk.c:1769
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "������ �����: `=' �������� ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "������ �����: ����������� ������ %c ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1782
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "�������������� ����: %s\n"
 
-#: fdisk/sfdisk.c:1824
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "����� ������� �������\n"
 
-#: fdisk/sfdisk.c:1828
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1951
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "��� ����� ��� ����������� �������\n"
 
-#: fdisk/sfdisk.c:1984
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "���������� ������� ���������� ����������� ������\n"
 
-#: fdisk/sfdisk.c:2035
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "������� ����� ����� �����\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2069
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "����� ������ ���\n"
 
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "�������� ���\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "��������������: ��������� ������ (%lu) ��������� ����������� ���������� ������ (%lu)\n"
+msgstr ""
+"��������������: ��������� ������ (%lu) ��������� ����������� ���������� "
+"������ (%lu)\n"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "��������������: ������ ������\n"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "��������������: �������� ������ ������� (����� %lu)\n"
 
-#: fdisk/sfdisk.c:2153
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "������������� ����������� ���� - �������� - ��� *\n"
 
-#: fdisk/sfdisk.c:2170 fdisk/sfdisk.c:2183
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "��������� ������������ c,h,s?\n"
 
-#: fdisk/sfdisk.c:2194
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "����������� ������ �� ���, ��� ��������\n"
 
-#: fdisk/sfdisk.c:2226
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "�������� ����\n"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "������� ����� ��������\n"
 
-#: fdisk/sfdisk.c:2281
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
-"���� � ��������� �������; ������������� ���� �������� �������� �� ���������.\n"
+"���� � ��������� �������; ������������� ���� �������� �������� �� "
+"���������.\n"
 "<������> <������> <��� [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
-"������ ��� ���������� ������ ������� <������> � <������> (� �������� <���>).\n"
-
-#: fdisk/sfdisk.c:2303
-msgid "version"
-msgstr "������"
+"������ ��� ���������� ������ ������� <������> � <������> (� �������� "
+"<���>).\n"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "����������: ���-�� ����� /dev/hda ��� /dev/sda"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "�������� �����:"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [��� --show-size]: ������ �������� ��������"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [��� --id]:        ����� ��� ��������� Id �������"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [��� --list]:      ������ �������� ������� ����������"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr "    -d [��� --dump]:      ����, �� � �������, ���������� ��� ����������� �����"
+msgstr ""
+"    -d [��� --dump]:      ����, �� � �������, ���������� ��� ����������� "
+"�����"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [��� --increment]: ����� ��������� � �.�. � 1, � �� � 0"
 
-#: fdisk/sfdisk.c:2317
-msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
-msgstr "    -uS, -uB, -uC, -uM:   �����/����� � �������� �������/�����/��������/��"
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:   �����/����� � �������� �������/�����/��������/��"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [��� --list-types]:������ ��������� ����� ��������"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr "    -D [��� --DOS]:       ��� DOS-�������������: ����������� ������� �����"
+msgstr ""
+"    -D [��� --DOS]:       ��� DOS-�������������: ����������� ������� �����"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [��� --re-read]:   ������������� ����� ������� ��������"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 ��������� ������ ������� � ������� #"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  �� ����� ���� �� ���������� �� ����"
 
-#: fdisk/sfdisk.c:2323
-msgid "    -O file :            save the sectors that will be overwritten to file"
-msgstr "    -O ���� :             ���������� � ���� ��������, ������� ����� ������������"
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O ���� :             ���������� � ���� ��������, ������� ����� "
+"������������"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I ���� :             �������������� ���� ��������"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [��� --version]:   ����� ������ ������"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [��� --help]:      ����� ����� ���������"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "������� �����:"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [��� --show-geometry]: ����� ���������, ���������� �����"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [��� --show-pt-geometry]: ����� ���������, ���������� �� ������� "
+"��������"
+
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [��� --show-extended]: ����� ����� ������ ����������� �������� �� ������\n"
+"    -x [��� --show-extended]: ����� ����� ������ ����������� �������� �� "
+"������\n"
 "                              ��� ��������� ����������� ��� ��� �� �����"
 
-#: fdisk/sfdisk.c:2331
-msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [��� --Linux]:      ������������� �����, ���������� ��� Linux"
 
-#: fdisk/sfdisk.c:2332
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [��� --quiet]:      ���������� ��������������� ���������"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "�� ������ ��������� ������������ ���������, ���������:"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [��� --cylinders #]:��������� ����� ������������ ���������"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [��� --heads #]:    ��������� ����� ������������ �������"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [��� --sectors #]:  ��������� ����� ������������ ��������"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "�� ������ ��������� �������� ���� ������������:"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [��� --force]:      ��������� ��, ��� � �����, ���� ���� ��� ��������"
+msgstr ""
+"    -f  [��� --force]:      ��������� ��, ��� � �����, ���� ���� ��� ��������"
 
-#: fdisk/sfdisk.c:2344
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "�������������:"
 
-#: fdisk/sfdisk.c:2345
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ����������\t\t ������� ������ �������� �������� ����������\n"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr "%s ���������� n1 n2 ... ���������� ������� n1 ... � ������������� ���������\n"
+msgstr ""
+"%s ���������� n1 n2 ... ���������� ������� n1 ... � ������������� ���������\n"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -���������� \t ���������� ������ n, ������������� ������ �������\n"
 
-#: fdisk/sfdisk.c:2511
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "��� �������?\n"
 
-#: fdisk/sfdisk.c:2629
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "�����: %llu ������\n"
 
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "�������������: sfdisk --print-id ���������� �����_�������\n"
 
-#: fdisk/sfdisk.c:2668
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "�������������: sfdisk --change-id ���������� �����_������� Id\n"
 
-#: fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "�������������: sfdisk --id ���������� �����_������� [Id]\n"
 
-#: fdisk/sfdisk.c:2677
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "����� ������� ������ ���� ���������� (����� ���, ��� �  -l ��� -s)\n"
 
-#: fdisk/sfdisk.c:2703
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "���������� ������� %s ��� ������-������\n"
 
-#: fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "���������� ������� %s ��� ������\n"
 
-#: fdisk/sfdisk.c:2730
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: ��\n"
 
-#: fdisk/sfdisk.c:2747
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld ���������, %ld �������, %ld ��������/�������\n"
 
-#: fdisk/sfdisk.c:2764
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "���������� �������� ������ %s\n"
 
-#: fdisk/sfdisk.c:2842
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "�������� active-����: 0x%x ������ 0x80\n"
 
-#: fdisk/sfdisk.c:2860 fdisk/sfdisk.c:2913 fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5118,7 +5160,7 @@ msgstr ""
 "������\n"
 "\n"
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5127,35 +5169,35 @@ msgstr ""
 "� ��� ������� %d �������� �������� �������. ��� �� ����� �������� ��� LILO,\n"
 "�� DOS'������ MBR �������� ������ ���� � ����� �������� ��������.\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "������ %s ����� id %x � �� �������� �������\n"
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "�������� Id %lx\n"
 
-#: fdisk/sfdisk.c:2955
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "���� ���� ������ ������������.\n"
 
-#: fdisk/sfdisk.c:2972
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "������������ ������: ���������� ����� %s\n"
 
-#: fdisk/sfdisk.c:2975
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "��������������: %s �� �������� ������� �����������\n"
 
-#: fdisk/sfdisk.c:2981
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "�����������, ����� ������ ����� �� ����������� ���� ����...\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5164,33 +5206,34 @@ msgid ""
 msgstr ""
 "\n"
 "���� ������ ������������ - ������ �����, �������� - ��� ������ ����.\n"
-"������������� ��� �������� ������� � ��������� ��� ������� �������� ����� �����.\n"
+"������������� ��� �������� ������� � ��������� ��� ������� �������� ����� "
+"�����.\n"
 "����������� ���� --no-reread ��� ������ ���� ��������.\n"
 
-#: fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "����������� ���� --force ��� ���������� ���� ��������.\n"
 
-#: fdisk/sfdisk.c:2991
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "��\n"
 
-#: fdisk/sfdisk.c:3000
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "������ ��������:\n"
 
-#: fdisk/sfdisk.c:3004
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "������ %d �� ����������, ���������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3012
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "����� ��������:\n"
 
-#: fdisk/sfdisk.c:3017
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5198,21 +5241,21 @@ msgstr ""
 "�� �������� ��� ��� ������� - ������ �� ��������.\n"
 "(���� �� ������������� ������ �����, ����������� ����� --force.)\n"
 
-#: fdisk/sfdisk.c:3020
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "�� �������� ��� ��� - ��������, ��� ������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3025
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "��� ���������� ����� �������? [���] "
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�� ������ �������� ��� �� ����? [���] "
 
-#: fdisk/sfdisk.c:3032
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5221,16 +5264,16 @@ msgstr ""
 "\n"
 "sfdisk: ��������������� ��������� �����\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "���������� ������ - ������ �� ��������\n"
 
-#: fdisk/sfdisk.c:3040
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "����������, �������� �, � ��� �\n"
 
-#: fdisk/sfdisk.c:3048
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5239,14 +5282,16 @@ msgstr ""
 "����� ������� �������� ������� ��������\n"
 "\n"
 
-#: fdisk/sfdisk.c:3054
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"���� �� ������� ��� �������� ������ DOS, ������, /dev/foo7, ����������� ����� dd(1),\n"
-"����� �������� ������ 512 ����:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"���� �� ������� ��� �������� ������ DOS, ������, /dev/foo7, ����������� "
+"����� dd(1),\n"
+"����� �������� ������ 512 ����:  dd if=/dev/zero of=/dev/foo7 bs=512 "
+"count=1\n"
 "(��. fdisk(8).)\n"
 
 #: getopt/getopt.c:233
@@ -5278,20 +5323,26 @@ msgid "              parameters\n"
 msgstr "              ���������\n"
 
 #: getopt/getopt.c:328
-msgid "  -a, --alternative            Allow long options starting with single -\n"
-msgstr "  -a, --alternative            ���������� ������� �����, ������������ � ������ -\n"
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            ���������� ������� �����, ������������ � "
+"������ -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   ��� ��������� ����������� �� �������������\n"
+msgstr ""
+"  -h, --help                   ��� ��������� ����������� �� �������������\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   ������� ����� ��� �������������\n"
 
 #: getopt/getopt.c:331
-msgid "  -n, --name=progname          The name under which errors are reported\n"
-msgstr "  -n, --name=���_���������     ���, �� �������� ������� ����� �� �������\n"
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=���_���������     ���, �� �������� ������� ����� �� �������\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
@@ -5299,7 +5350,8 @@ msgstr "  -o, --options=������_�����   �������� ����� ��� �������������\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr "  -q, --quiet                  ���������� ������ �� ������� getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  ���������� ������ �� ������� getopt(3)\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
@@ -5307,7 +5359,8 @@ msgstr "  -Q, --quiet-output           ��� ������� �������� ������\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr "  -s, --shell=����             ��������� ������� ����. � ������� ��� �����\n"
+msgstr ""
+"  -s, --shell=����             ��������� ������� ����. � ������� ��� �����\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
@@ -5315,7 +5368,8 @@ msgstr "  -T, --test                   �������� ������ getopt(1)\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unqote                 �� ��������� � ������� �������� ������\n"
+msgstr ""
+"  -u, --unqote                 �� ��������� � ������� �������� ������\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
@@ -5334,129 +5388,132 @@ msgstr "getopt (�������������������) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "���������� ������, ��������� � �������."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "�������� �� MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD-����\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "���� ����� ��������� �� 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "�������� �������!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: ������� %s ���������� �������� ��� 1000 ��������!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "���������� ������� /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "���������� ���� �������� ����������, ������ �� ���� ��������� �������.\n"
+msgstr ""
+"���������� ���� �������� ����������, ������ �� ���� ��������� �������.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr "%s ���������� �������� ������ � ����� I/O:  ����� iopl(3) ���������� ��������.\n"
+msgstr ""
+"%s ���������� �������� ������ � ����� I/O:  ����� iopl(3) ���������� "
+"��������.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "��������, ��� ����� ���������� root'�.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "���������������, ��� ���������� ���� ���������� �� %s �������.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "��������"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: ��������������: �������������� ������ ������ � ����� adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(���������: `UTC' ��� `LOCAL' ��� ������.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "���� ��������� ������������� ���������� - %ld ������ ����� 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "���� ��������� ���������� - %ld ������ ����� 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "���������� ���� ���������� �� %s �������\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "�����������"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "��������� ������� �����...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...�������� ������� �����\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "�������� �������� � ���������� �����: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "���������� �����: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld ������ � 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "�����, ����������� � ���������� �����: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "���������� ���� ��������������� � %.2d:%.2d:%.2d = %ld ������ � 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "���� �� �������� - ������ ������������.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5465,27 +5522,32 @@ msgstr ""
 "�����, ��������� � ������ �������, ��������� %.6f ������.\n"
 "�������������� �������� ��� ���������� ��������� ������ �������.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr "�������� ���������� ����� �������� ��������, ������� ���� ������� (����., 50-� ���� ������), ���� ��������� �� ��������� ������������ ��������� (����, 2095 ���).\n"
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"�������� ���������� ����� �������� ��������, ������� ���� ������� (����., 50-"
+"� ���� ������), ���� ��������� �� ��������� ������������ ��������� (����, "
+"2095 ���).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f ������\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "�� ������� ����� --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "�������� --date ������� �������\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5494,21 +5556,23 @@ msgstr ""
 "�������� ����� --date �� �������� ������ �����.\n"
 "� ���������, ��� �������� �������.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "�������� ������� ����: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "���������� ��������� ��������� 'date' � ����� /bin/sh. popen() ���������� ��������"
+msgstr ""
+"���������� ��������� ��������� 'date' � ����� /bin/sh. popen() ���������� "
+"��������"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "����� ������� date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5523,66 +5587,76 @@ msgstr ""
 "����� ���:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"������� date, ��������� %s, ���������� ���-�� ����� ������ �����, ����� ��� ��������� ��������������� �������� �������.\n"
+"������� date, ��������� %s, ���������� ���-�� ����� ������ �����, ����� ��� "
+"��������� ��������������� �������� �������.\n"
 "������� ����:\n"
 "  %s\n"
 "����� ���:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "������ ���� %s ��������� %ld �������� � 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
-msgstr "���������� ���� �� �������� ������� �������, ������� � ��� ���������� ���������� ��������� �����.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"���������� ���� �� �������� ������� �������, ������� � ��� ���������� "
+"���������� ��������� �����.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "���������� settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "��������� ���� �� �����������, ������ ��� ������ � �������� ������.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "��� ��������� ��������� ����� ����� ����� �����������������.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() ���������� ��������"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
-msgstr "������������� ������������ ���������� �� ���������, ������ ��� ���������� ���� ����� ��������� �����.\n"
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"������������� ������������ ���������� �� ���������, ������ ��� ���������� "
+"���� ����� ��������� �����.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5592,36 +5666,42 @@ msgstr ""
 "��� ��������� ���������� ���� �������, ������� �������\n"
 "���������� � ��������� ������ ����������.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
-msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
-msgstr "������������� ������������ ���������� �� ���������, ������ ��� �� ������� ��������� ���������� ������ ����� ���.\n"
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"������������� ������������ ���������� �� ���������, ������ ��� �� ������� "
+"��������� ���������� ������ ����� ���.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"���� ���������� �� %.1f ������ �����, %d ������ �������� �� ����������� ���������� %f ������ � ����.\n"
+"���� ���������� �� %.1f ������ �����, %d ������ �������� �� ����������� "
+"���������� %f ������ � ����.\n"
 "����������� ���������� ������������� �� %f ������ � ����\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "����� ����� ��������� ������������� ���������� %d ������\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "���������� �������� %d ������ � ��������� ���� �� %.6f ������ �����\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "���� adjtime �� �����������, ������ ��� ������� ����� ������������.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5630,73 +5710,89 @@ msgstr ""
 "��������� ����� �������� � %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "��������� ������������� ���������� �� ���������.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr "���������� ���� �� �������� ������� �������, ������� ���������������� �� ����������.\n"
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"���������� ���� �� �������� ������� �������, ������� ���������������� �� "
+"����������.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "����������� ������������� ���������� ������ �������, ������� ���� �� �������������.\n"
+msgstr ""
+"����������� ������������� ���������� ������ �������, ������� ���� �� "
+"�������������.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "������������ %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "�� ������ ��������� ������� ���������.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "���������� ���������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 "�������� ���� ��� ���������� ����� ���� ������ ������ �� Alpha-�������.\n"
 "��� ����� hwclock ���� ������� ��� ������, �������� �� Alpha\n"
-"(�, ����� �������, ������, ��-��������, �� Alpha �� ��������).  �������� ���������.\n"
+"(�, ����� �������, ������, ��-��������, �� Alpha �� ��������).  �������� "
+"���������.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "���������� �������� �������� ���� �� ����.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "���� �������������, ��� �������� ���� %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
-msgstr "����� ���������� �������� ����, �� ������ ������������ ����� 'epoch' ��� �������� ������� ��������.\n"
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"����� ���������� �������� ����, �� ������ ������������ ����� 'epoch' ��� "
+"�������� ������� ��������.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "��� �� ��������������� � %d - ������ ������������.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "���������� ���������� � ���� �������� ����.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s �� %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5734,10 +5830,12 @@ msgstr ""
 "�������:\n"
 "  --help        ����� ���� �������\n"
 "  --show        ������ ���������� ����� � ����� ����������\n"
-"  --set         ��������� ����� ��������� ������� �� �����, ��������� � --date\n"
+"  --set         ��������� ����� ��������� ������� �� �����, ��������� � --"
+"date\n"
 "  --hctosys     ��������� ���������� ������� �� ���������� �����\n"
 "  --systohc     ��������� ���������� ����� �� �������� ���������� �������\n"
-"  --adjust      ����������� ����� ��������� ������� ��� ���������� ����������������\n"
+"  --adjust      ����������� ����� ��������� ������� ��� ���������� "
+"����������������\n"
 "                ���������� ����� ��������� ��������� ��� ����������� �����\n"
 "  --getepoch    ����� �������� ���� ���������� ����� ����\n"
 "  --setepoch    ��������� �������� ���� ���������� ����� ���� � ��������,\n"
@@ -5745,17 +5843,20 @@ msgstr ""
 "  --version     ����� ������ hwclock �� ����������� �����\n"
 "\n"
 "�����: \n"
-"  --utc         ���������� ���� ���������� �� ��������� ������������������ �������\n"
+"  --utc         ���������� ���� ���������� �� ��������� ������������������ "
+"�������\n"
 "  --localtime   ���������� ���� ���������� �� �������� �������\n"
 "  --directisa   ������ ������ � ���� ISA ������ %s\n"
-"  --badyear     ������������ ��� ����� ��������� ������� ��-�� ������������� bios'�\n"
-"  --date        �������� �������, ������� ����� ����������� � ���������� ����\n"
+"  --badyear     ������������ ��� ����� ��������� ������� ��-�� ������������� "
+"bios'�\n"
+"  --date        �������� �������, ������� ����� ����������� � ���������� "
+"����\n"
 "  --epoch=���   �������� ����, � �������� ����������  ��������\n"
 "                ��� ���������� �����\n"
 "  --noadjfile   ��� ������������� /etc/adjtime. ������� �������������\n"
 "                ���� --utc, ���� --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5764,12 +5865,12 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                �������� hwclock'� ��� ����� alpha (��. hwclock(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ��������� �������������� ���������.  ��� ������������� %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5778,50 +5879,69 @@ msgstr ""
 "�� ������� ��������� �������.\n"
 "�� ������ ��������� ������ ���� ������� �� ���.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
-msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
-msgstr "%s: ����� --utc � --localtime �������� ������� ������������. � �� ������� ���.\n"
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: ����� --utc � --localtime �������� ������� ������������. � �� ������� "
+"���.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
-msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
-msgstr "%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� ���.\n"
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� "
+"���.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: � --noadjfile �� ������ ������� ���� --utc, ���� --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "����������� ��������� ��� ��������� �����. ���������� ���������� ����.\n"
+msgstr ""
+"����������� ��������� ��� ��������� �����. ���������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "� ��������� ������ ����������������� ����� �������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "� ��������� ������ ����������������� ����� �������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
-msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
-msgstr "� ��������� ������ ����������������� ����� �������� � ���� ��� ���������� �����.\n"
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"� ��������� ������ ����������������� ����� �������� � ���� ��� ���������� "
+"�����.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr "���������� �������� ������ � ���������� ����� ����� �� �� �� ���� ��������� ��������.\n"
+msgstr ""
+"���������� �������� ������ � ���������� ����� ����� �� �� �� ���� ��������� "
+"��������.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
-msgid "Use the --debug option to see the details of our search for an access method.\n"
-msgstr "����������� ����� --debug, ����� ������� ��������� ���������� � ����� ������ ��� ������ �������.\n"
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"����������� ����� --debug, ����� ������� ��������� ���������� � ����� ������ "
+"��� ������ �������.\n"
 
 #: hwclock/kd.c:55
 #, c-format
@@ -5850,7 +5970,6 @@ msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK ���������� ��������"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "���������� ������� /dev/tty1 ��� /dev/vc/1"
@@ -5902,7 +6021,9 @@ msgstr "ioctl() � %s ��� ���������� ���������� ���������� ���������� ��������"
 #: hwclock/rtc.c:271
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "ioctl() � %s ��� ��������� ���������� ���������� ���������� ���������� ��������"
+msgstr ""
+"ioctl() � %s ��� ��������� ���������� ���������� ���������� ���������� "
+"��������"
 
 #: hwclock/rtc.c:330
 #, c-format
@@ -5921,8 +6042,14 @@ msgstr "�������� %s ����������� ��������"
 
 #: hwclock/rtc.c:383 hwclock/rtc.c:429
 #, c-format
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
-msgstr "��� ��������� �������� ���� � ���� ���������� �������� ������ � �������� ���������� Linux 'rtc' ����������� ������������ ����� ���������� %s. � ������ ������� ���� ���� �����������.\n"
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"��� ��������� �������� ���� � ���� ���������� �������� ������ � �������� "
+"���������� Linux 'rtc' ����������� ������������ ����� ���������� %s. � "
+"������ ������� ���� ���� �����������.\n"
 
 #: hwclock/rtc.c:388 hwclock/rtc.c:434
 #, c-format
@@ -5951,7 +6078,8 @@ msgstr "��� ��������������� � %ld � RTC_EPOCH_SET ioctl � %s.\n"
 
 #: hwclock/rtc.c:444
 #, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "������� ���������� ���� ��� %s �� ����� RTC_EPOCH_SET ioctl.\n"
 
 #: hwclock/rtc.c:447
@@ -5963,7 +6091,6 @@ msgstr "ioctl(RTC_EPOCH_SET) � %s ���������� ��������"
 msgid "calling open_tty\n"
 msgstr "���������� open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "���������� termio_init\n"
@@ -5972,7 +6099,6 @@ msgstr "���������� termio_init\n"
 msgid "writing init string\n"
 msgstr "������������ ������ �������������\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "����� autobaud\n"
@@ -5986,7 +6112,6 @@ msgstr "��������� cr-lf\n"
 msgid "read %c\n"
 msgstr "������ %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "�������� ��� ������������\n"
@@ -6040,7 +6165,6 @@ msgstr "/dev: chdir() ���������� ��������: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ��������� ����������"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6055,12 +6179,10 @@ msgstr "/dev/%s: ���������� ������� ��� ����������� ����: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: �� ������ ��� ������/������"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "����������� ������������\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6093,36 +6215,36 @@ msgstr "%s: ������������ �����"
 #: login-utils/agetty.c:1195
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
-"�������������: %s [-hiLmw] [-l ���������_�����] [-t ����-���] [-I ������_�������������] [-H ����_���_�����] ��������_��������,... ���� [���_���������]\n"
-"���\t[-hiLmw] [-l ���������_�����] [-t ����-���] [-I ������_�������������] [-H ����_���_�����] ���� ��������_��������,... [���_���������]\n"
+"�������������: %s [-hiLmw] [-l ���������_�����] [-t ����-���] [-I "
+"������_�������������] [-H ����_���_�����] ��������_��������,... ���� "
+"[���_���������]\n"
+"���\t[-hiLmw] [-l ���������_�����] [-t ����-���] [-I ������_�������������] [-"
+"H ����_���_�����] ���� ��������_��������,... [���_���������]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: ���� ������, ���� � ������� ����� ����������� ��������\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "���������� ��������� malloc ��� ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "���������� ��������� malloc ��� grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "���� � %s � %s �������� �� ���������.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "���� � %s � %s ��������.\n"
@@ -6140,7 +6262,9 @@ msgstr "%s: ������������ \"%s\" �� ����������.\n"
 #: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
-msgstr "%s: ����� ������ �������� ��������� ��������; ������ ����� ����������� yp%s.\n"
+msgstr ""
+"%s: ����� ������ �������� ��������� ��������; ������ ����� ����������� yp%"
+"s.\n"
 
 #: login-utils/chfn.c:151 login-utils/chsh.c:136
 msgid "Unknown user context"
@@ -6167,8 +6291,8 @@ msgstr "��������� ���������� finger ��� %s.\n"
 msgid "Password error."
 msgstr "������ ������."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "������: "
@@ -6246,8 +6370,12 @@ msgstr "%s: %s �� ����������� ��� ��������� ����� %s\n"
 
 #: login-utils/chsh.c:157
 #, c-format
-msgid "%s: Running UID doesn't match UID of user we're altering, shell change denied\n"
-msgstr "%s: ���������� UID �� ��������� � UID'�� �������������� ������������, ��������� ����� ���������\n"
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: ���������� UID �� ��������� � UID'�� �������������� ������������, "
+"��������� ����� ���������\n"
 
 #: login-utils/chsh.c:163
 #, c-format
@@ -6342,34 +6470,6 @@ msgstr "����������� %s -l ��� ��������� ������.\n"
 msgid "No known shells.\n"
 msgstr "��� ��������� ������.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "���������� ������� /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "���������� ��������� ��������� ������ �� /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "���������� ������� %s ��� ������"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "���������� ���������� ��������� (%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s �� ����� ������ filemode'��"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "���������� ��������� ������ �� %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6377,13 +6477,15 @@ msgstr "���������� ��������� %s, ���������� ������."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "�������������: last [-#] [-f ����] [-t tty] [-h ���_�����] [������������ ...]\n"
+msgstr ""
+"�������������: last [-#] [-f ����] [-t tty] [-h ���_�����] "
+"[������������ ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  ��� ��� � �������"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6392,15 +6494,15 @@ msgstr ""
 "\n"
 "wtmp ������� %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: malloc ���������� ��������.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6409,51 +6511,45 @@ msgstr ""
 "\n"
 "������� %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "�������: ���������� �������� ������� tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "�������: ������ tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h ������ ��� �����������������.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "�������������: login [-fp] [���_������������]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: ���� PAM, ����������: %s\n"
+msgstr "login: ���� PAM, ����������� ����������: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "���������� ���������������� PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "�����: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "���� ����� %d �� %s ��� %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6462,17 +6558,17 @@ msgstr ""
 "�������� �����\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "������� ����� ������� ����� (%d) �� %s ��� %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "���� ������ ����� �� %s ��� %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6481,7 +6577,7 @@ msgstr ""
 "\n"
 "�������� �����\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6490,135 +6586,120 @@ msgstr ""
 "\n"
 "�������� ��������� ������, ����������.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "������ ��� ������������ � %s:%d. ����������."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "�������� ��� ������������ \"%s\" � %s:%d. ����������."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: �������� ������\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "����������� ��� ������������"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s ���� �� ���� �������� ���������.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "���� %s ��������� �� %s �� TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "���� %s ��������� �� TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "�������� �����\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"��� ������� ����� ������������� ����� � �������.\n"
-"���������� ��� ��� �������.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "� ��� ������� ����� ���������� ���������.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP �� %s ����� %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "���� ROOT � %s � %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "���� ROOT � %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "���� � %s ����� %s �� %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "���� � %s ����� %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "��� ����� ������.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "��� ������.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ���� �������� ��������� ��������: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ���������� ��������: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() ���������� ��������"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "��� �������� %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "���� � ������� � �������� ��������� = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ��� ������ ��� ����-�������.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ���������� ��������� ����-������: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ��� �����: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6627,65 +6708,65 @@ msgstr ""
 "\n"
 "%s �����: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "��� ������������ ������� �������.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "��� ������� �������"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "����� ������������� ����� �� ���������� � '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "������� ����� ������ ��������� �����.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "���������� �������� �����"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "���� � ������� �������� ������ �������� � %d ������\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "��������� ���� � �������: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "�� %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "� %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ���� ����� �� %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ���� ����� � %s, %s"
@@ -6705,166 +6786,30 @@ msgstr "- ���\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "�������������: mesg [� | �]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: �� ���?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: ��� ����� ������."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: ������ ��������"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "��� �����"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "������ ������ ��������� �� ������� ���� 6 ��������, ���������� ��� ���.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"������ ������ ��������� ������� ��������� ���� �������:\n"
-"������� �������� � ������� ��������, ����� � �� ����������������\n"
-"�������. ��. passwd(1) ��� ��������� �������������� ����������.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "�� �� ������ �������� ������������ ������ ������.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "����������, �� ����������� � �������� ������ ���-�� ����� ������ ����� ������������!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "����������, �� ����������� � �������� ������ ���-�� ����� ������ ���������� �����!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "�������������: passwd [���_������������ [������]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "������ root ����� ������������ ����� � ����� � ����� �����������.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "�������������: passwd [-foqsvV] [������������ [������]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "���������� ��������� %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "���������� ����� ������������������ ���"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "������ root ����� �������� ����� ������.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "������� ����� ����������.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "���������� ����� ��� ������������. `%s' ������������� ������������?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "� ��������� � ���� �������� ������ ��������� ������. ������ ����� ����������� yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID � ��� ������������ �� ���������, ����������!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "��������� ������ ��� %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "������� ������ ������: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "����������� ������, ����������."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "������� ����� ������: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "������ �� �������."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "��������� ����� ������: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "�� ��������. ������ �� �������."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "������ �������, ������������ %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "������ ROOT'A �������"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "������ ������� root'��, ������������ %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "���������� setpwnam ��� ��������� ������.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "������ *��* �������, ���������� ��� ��� �������.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "������ �������.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6911,7 +6856,6 @@ msgstr "������������ %s'��: %s"
 msgid "halted by %s: %s"
 msgstr "���������� %s'��: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6948,7 +6892,6 @@ msgstr "���������� ��������� \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "������ ����������\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7024,7 +6967,9 @@ msgstr "���������� ��������������������� ����� ����������� ��������\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
-msgstr "�������� ��������� �������� ��������������������� ����� ����������� ��������\n"
+msgstr ""
+"�������� ��������� �������� ��������������������� ����� ����������� "
+"��������\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
@@ -7038,7 +6983,6 @@ msgstr "������ ��������� close-on-exec �� /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "������ ������� finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "������ �������� ��������� �������� finalprog\n"
@@ -7067,7 +7011,7 @@ msgstr "�������� �������� ����������� ��������\n"
 msgid "fork failed\n"
 msgstr "�������� ��������� �������� ����������� ��������\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1622
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "���������� ����������� ��������\n"
 
@@ -7216,12 +7160,6 @@ msgstr "����������� �������� ������: ����������� 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "����������� �������� ����: ����������� 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7232,13 +7170,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "�������������: cal [-13smjyV] [[�����] ���]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "�������������: %s [+������] [���� ����� ���]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "���� ��. ��������"
 
@@ -7284,8 +7221,11 @@ msgstr "logger: ��� ������������ ����������: %s.\n"
 
 #: misc-utils/logger.c:287
 #, c-format
-msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr "�������������: logger [-is] [-f ����] [-p ���������] [-t ���] [-u �����] [ ��������� ... ]\n"
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"�������������: logger [-is] [-f ����] [-p ���������] [-t ���] [-u �����] "
+"[ ��������� ... ]\n"
 
 #: misc-utils/look.c:349
 #, c-format
@@ -7367,7 +7307,7 @@ msgstr "%s: �������������� %s � %s ����������� ��������: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s �� � �����...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7378,22 +7318,22 @@ msgstr ""
 "����������� `%s [�����] %s', ���� �� ������������� ������ ��� ������������.\n"
 "������ �� �������.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "�������������: script [-a] [-f] [-q] [-t] [����]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "������ �������, ���� - %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "������ ������� %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7402,254 +7342,253 @@ msgstr ""
 "\n"
 "������ �������� %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "������ ��������, ���� - %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ���������� ��������\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "�� ������� pty\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: ������ ���������, �������������\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term ���_��������� ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ ������ ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-�����_��������] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-�����_��������] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ���_�����_����� ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq ������� ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "���������� ����������/����� ����� ����������������\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "������ klogctl: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "������ ������ %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "������ ������ ����� ������\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "���������� ��������� %s, � ���������� ������� ���� ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: ���������� $TERM �� ����������.\n"
@@ -7709,51 +7648,57 @@ msgstr "��������� �� %s@%s (��� %s) �� %s � %s ..."
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "��������� �� %s@%s �� %s � %s ..."
 
-#: mount/fstab.c:135
+#: mount/fstab.c:136
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "��������������: ������ ������ %s: %s"
 
-#: mount/fstab.c:163 mount/fstab.c:188
+#: mount/fstab.c:164 mount/fstab.c:189
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "��������������: ���������� ������� %s: %s"
 
-#: mount/fstab.c:168
+#: mount/fstab.c:169
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ���������� ������� %s - ������ ����� ������������ %s\n"
 
-#: mount/fstab.c:472
+#: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� ���������������)"
+msgstr ""
+"���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� "
+"���������������)"
 
-#: mount/fstab.c:487
+#: mount/fstab.c:499
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "���������� ������� ������ �� ���� ���������� %s: %s (����������� ���� -n ��� ���������������)"
+msgstr ""
+"���������� ������� ������ �� ���� ���������� %s: %s (����������� ���� -n ��� "
+"���������������)"
 
-#: mount/fstab.c:499
+#: mount/fstab.c:511
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� ���������������)"
+msgstr ""
+"���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� "
+"���������������)"
 
-#: mount/fstab.c:514
+#: mount/fstab.c:526
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "���������� ������������� ���� ���������� %s: %s\n"
 
-#: mount/fstab.c:526
+#: mount/fstab.c:538
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "���������� ������������� ���� ���������� %s: %s"
 
-#: mount/fstab.c:528
+#: mount/fstab.c:540
 msgid "timed out"
 msgstr "����� �������� �������"
 
-#: mount/fstab.c:535
+#: mount/fstab.c:547
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7762,22 +7707,22 @@ msgstr ""
 "���������� ������� ������ %s\n"
 "��������, ���������� ���������� ���� ����������?\n"
 
-#: mount/fstab.c:584 mount/fstab.c:622
+#: mount/fstab.c:587 mount/fstab.c:625
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "���������� ������� %s (%s) - mtab �� ��������"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:633
 #, c-format
 msgid "error writing %s: %s"
 msgstr "������ ������ %s: %s"
 
-#: mount/fstab.c:640
+#: mount/fstab.c:643
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "������ ����� ������ %s: %s\n"
 
-#: mount/fstab.c:658
+#: mount/fstab.c:661
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
@@ -7847,27 +7792,29 @@ msgstr "%s: ���������� ����� �� ������ ���������� ���������� �������� �����"
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "���������� ������������� � ������, ���������� ������.\n"
 
-#: mount/lomount.c:341
+#: mount/lomount.c:340
 #, c-format
 msgid "set_loop(%s,%s,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ������� ��������\n"
 
-#: mount/lomount.c:352
+#: mount/lomount.c:351
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:362
+#: mount/lomount.c:361
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ������� ��������\n"
 
-#: mount/lomount.c:370
+#: mount/lomount.c:369
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "��� ������ mount ���� ��������������� ��� ��������� loop. ����������, ��������� �������������.\n"
+msgstr ""
+"��� ������ mount ���� ��������������� ��� ��������� loop. ����������, "
+"��������� �������������.\n"
 
-#: mount/lomount.c:407
+#: mount/lomount.c:406
 #, c-format
 msgid ""
 "usage:\n"
@@ -7877,21 +7824,24 @@ msgid ""
 "  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
 msgstr ""
 "�������������:\n"
-"  %s loop_����������                                        # ��������� ����������\n"
+"  %s loop_����������                                        # ��������� "
+"����������\n"
 "  %s -d loop_����������                                     # ��������\n"
-"  %s -f                                                     # ����� ��������������\n"
+"  %s -f                                                     # ����� "
+"��������������\n"
 "  %s [ -e ���������� ] [ -o �������� ] loop_���������� ���� # ���������\n"
 
-#: mount/lomount.c:426 mount/sundries.c:30 mount/sundries.c:41
-#: mount/sundries.c:56 mount/sundries.c:259
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
 #, c-format
 msgid "not enough memory"
 msgstr "�������� ������"
 
-#: mount/lomount.c:541
+#: mount/lomount.c:540
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr "��������� loop ���� ���������� �� ����� ����������. ����������, ��������� �������������.\n"
+msgstr ""
+"��������� loop ���� ���������� �� ����� ����������. ����������, ��������� "
+"�������������.\n"
 
 #: mount/mntent.c:166
 #, c-format
@@ -7907,166 +7857,187 @@ msgstr "[mntent]: ������ %d � %s ������ %s\n"
 msgid "; rest of file ignored"
 msgstr "; ��������� ����� ����� ���������������"
 
-#: mount/mount.c:381
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: ������: ����� %s ����������� � %s � %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: ����� ��������� ������������ %s �������� UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: ����� ��������� ������������ %s �������� �����\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: ���������� ������� %s, ������� �������������� UUID � ����� �� ����� ���� "
+"���������.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: �������� UUID"
+
+#: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
 
-#: mount/mount.c:386
+#: mount/mount.c:387
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: �������� mtab, %s ������������� �� %s"
 
-#: mount/mount.c:406
+#: mount/mount.c:407
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ���������� ������� %s ��� ������: %s"
 
-#: mount/mount.c:423 mount/mount.c:676
+#: mount/mount.c:424 mount/mount.c:677
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: ������ ������ %s: %s"
 
-#: mount/mount.c:431
+#: mount/mount.c:432
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: ������ ����� ������ %s: %s"
 
-#: mount/mount.c:482
+#: mount/mount.c:483
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s �������� ��� ������������ ��� �������� - �� �������������"
 
-#: mount/mount.c:569
+#: mount/mount.c:570
 msgid "mount failed"
 msgstr "mount ���������� ��������"
 
-#: mount/mount.c:571
+#: mount/mount.c:572
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: ������ root ����� ����������� %s �� %s"
 
-#: mount/mount.c:599
+#: mount/mount.c:600
 msgid "mount: loop device specified twice"
 msgstr "mount: ���������� �������� ����� ������� ������"
 
-#: mount/mount.c:604
+#: mount/mount.c:605
 msgid "mount: type specified twice"
 msgstr "mount: ��� ������ ������"
 
-#: mount/mount.c:616
+#: mount/mount.c:617
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ������������ ��������� ���������� �������� �����\n"
 
-#: mount/mount.c:625
+#: mount/mount.c:626
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: ���������� � ������������� ���������� �������� ����� %s\n"
 
-#: mount/mount.c:630
+#: mount/mount.c:631
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: ��������� ���������� �������� ����� ����������� ��������\n"
 
-#: mount/mount.c:634
+#: mount/mount.c:635
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: ��������� ���������� �������� ����� ������� �����������\n"
 
-#: mount/mount.c:671
+#: mount/mount.c:672
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ���������� ������� %s: %s"
 
-#: mount/mount.c:692
+#: mount/mount.c:693
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: �������� ��� -p ��� --pass-fd ������ ���� ������"
 
-#: mount/mount.c:705
+#: mount/mount.c:706
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ���������� ������� %s ��� ��������� ��������"
 
-#: mount/mount.c:708
+#: mount/mount.c:709
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:762 mount/mount.c:1347
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ���������� ������� �������� �������: %s"
 
-#: mount/mount.c:850
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: ��� ������ ���� ��������������� ��� ��������� ���� `nfs'"
-
-#: mount/mount.c:890
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: ���� ������������ nfs ������ 4, ��������� 3..\n"
 
-#: mount/mount.c:901
-msgid "mount: I could not determine the filesystem type, and none was specified"
-msgstr "mount: ���������� ���������� ��� �������� �������, � �� ���� �� ���� �������"
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: ���������� ���������� ��� �������� �������, � �� ���� �� ���� �������"
 
-#: mount/mount.c:904
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: �� ������ ������� ��� �������� �������"
 
-#. should not happen
-#: mount/mount.c:907
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: ������������ ����������� ��������"
 
-#: mount/mount.c:913 mount/mount.c:948
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ����� ������������ %s �� �������� ���������"
 
-#: mount/mount.c:915
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: ������ ��������"
 
-#: mount/mount.c:917
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
-msgstr "mount: ���������� ����� ����� ����������������� ��� ������������� mount"
+msgstr ""
+"mount: ���������� ����� ����� ����������������� ��� ������������� mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:921 mount/mount.c:925
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s �����"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:927
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc ��� �������������"
 
-#: mount/mount.c:929
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ��� ������������� ��� %s �����"
 
-#: mount/mount.c:935
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ����� ������������ %s �� ����������"
 
-#: mount/mount.c:937
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ����� ������������ %s �������� ������������� ������� � ������"
 
-#: mount/mount.c:940
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ����������� ���������� %s �� ����������"
 
-#: mount/mount.c:950
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8075,12 +8046,12 @@ msgstr ""
 "mount: ����������� ���������� %s �� ����������\n"
 "       (������� ���� �� �������� ���������)\n"
 
-#: mount/mount.c:963
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ��� �� ������������� ��� �������� �����"
 
-#: mount/mount.c:965
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8089,7 +8060,7 @@ msgstr ""
 "mount: �������� ��� ��, �������� �����, �������� ���������\n"
 "       �� %s, ����������� ������� �������� ��� ������ ������"
 
-#: mount/mount.c:975
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8098,7 +8069,7 @@ msgstr ""
 "       ����������� ide-scsi, � ������� ����� sr0, sda ���\n"
 "       ���-������ ��������?)"
 
-#: mount/mount.c:981
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8106,7 +8077,7 @@ msgstr ""
 "       (�� ��������� �� �� �������������� ����������� ������\n"
 "       ������ ������ �� ���������� �������� ������ ����?)"
 
-#: mount/mount.c:998
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8115,50 +8086,52 @@ msgstr ""
 "       ������� � syslog - ���������� dmesg | tail ��� ���-��\n"
 "       � ���� ����\n"
 
-#: mount/mount.c:1004
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "������� ������������ ���������"
 
-#: mount/mount.c:1006
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ���������� ��������� ���������"
 
-#: mount/mount.c:1010
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ����������� ����������"
 
-#: mount/mount.c:1015
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ����������� ��� �������� ������� '%s'"
 
-#: mount/mount.c:1027
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: �������� �� ����� � ���� %s"
 
-#: mount/mount.c:1029
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ����� ���� �� ����� � ���� 'iso9660'?"
 
-#: mount/mount.c:1031
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ����� ���� �� ����� � ���� 'vfat'?"
 
-#: mount/mount.c:1034
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr "mount: %s ����� �������� ����� ���������� ��� ��� �� %s �� ��������������"
+msgstr ""
+"mount: %s ����� �������� ����� ���������� ��� ��� �� %s �� ��������������"
 
-#. strange ...
-#: mount/mount.c:1040
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s �� �������� ������� �����������, � ����������� ��������� ����������?"
+msgstr ""
+"mount: %s �� �������� ������� �����������, � ����������� ��������� "
+"����������?"
 
-#: mount/mount.c:1042
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8167,71 +8140,68 @@ msgstr ""
 "mount: ���� �� ���������� %s ��� ������� ����������\n"
 "       (����� ���� `insmod driver'?)"
 
-#: mount/mount.c:1045
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s �� �������� ������� ����������� (����� ����������� `-o loop'?)"
+msgstr ""
+"mount: %s �� �������� ������� ����������� (����� ����������� `-o loop'?)"
 
-#: mount/mount.c:1048
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s �� �������� ������� �����������"
 
-#: mount/mount.c:1051
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s �� �������� ������ ������� �����������"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1054
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "������� ���������� "
 
-#: mount/mount.c:1056
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ���������� �������������� %s%s ������ ��� ������"
 
-#: mount/mount.c:1060
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ������� �� ������, �� ���� ������ ���� `-w'"
 
-#: mount/mount.c:1077
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ������� �� ������, ����������� ������ ��� ������"
 
-#: mount/mount.c:1176
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: �� ��� ������ ��� - ����� ��������������� nfs ��-�� ���������\n"
 
-#: mount/mount.c:1182
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
-msgstr "mount: �� ��� ������ ��� - ����� ��������������� smbfs ��-�� �������� //\n"
+msgstr ""
+"mount: �� ��� ������ ��� - ����� ��������������� smbfs ��-�� �������� //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1199
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ������� ��������� \"%s\"\n"
 
-#: mount/mount.c:1210
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ������ \"%s\"\n"
 
-#: mount/mount.c:1292
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ��� ������������� �� %s\n"
 
-#: mount/mount.c:1425
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8264,8 +8234,10 @@ msgstr ""
 "������� `mount [-t ���_��] ���-�� ����-��'.\n"
 "������, ��������� � /etc/fstab, ����� ���� ���������.\n"
 "       mount -a [-t|-O] ...     : ������������ ����� ����������� /etc/fstab\n"
-"       mount ����������         : ������������ ���������� �� ��������� �����\n"
-"       mount �������            : ������������ ���������� ���������� �� ����\n"
+"       mount ����������         : ������������ ���������� �� ��������� "
+"�����\n"
+"       mount �������            : ������������ ���������� ���������� �� "
+"����\n"
 "       mount -t ��� ���� ���    : ������� ������� ������������\n"
 "�������, ��� mount �� ����� ���� ��������� �� ����������, � ��������\n"
 "������� (���������� ����), ��������� �� ���� ����������.\n"
@@ -8278,47 +8250,38 @@ msgstr ""
 "������ �����: [-nfFrsvw] [-o �����] [-p passwdfd].\n"
 "��� ��������� ����� ���������� �������� ��������  man 8 mount .\n"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: ������ root ����� ������� ���"
 
-#: mount/mount.c:1619
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s �� ������ - ���������...\n"
 
-#: mount/mount.c:1631
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ����� ������ �� ������"
 
-#: mount/mount.c:1633
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: ����������� %s\n"
 
-#: mount/mount.c:1642
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "������ �� ���� ��������������"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: ���������� ����� %s � %s"
 
-#: mount/mount.c:1672
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ���������� ����� %s � %s ��� %s"
 
-#: mount/mount_by_label.c:190
-#, c-format
-msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: ���������� ������� %s, ������� �������������� UUID � ����� �� ����� ���� ���������.\n"
-
-#: mount/mount_by_label.c:313
-msgid "mount: bad UUID"
-msgstr "mount: �������� UUID"
-
 #: mount/mount_guess_fstype.c:489
 #, c-format
 msgid "mount: error while guessing filesystem type\n"
@@ -8349,120 +8312,120 @@ msgstr "       � �������� ��� %s\n"
 msgid "Trying %s\n"
 msgstr "����������� ������� %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: ����������� ������� �������� host:dir\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: ��������������: ������������ ����� ������ �� ��������������\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: ������� ��� ������������ �� � ������� host:dir\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: ���������� �������� ����� ��� %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ������� �������� hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: ����������� ������� �������� �����\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "��������������: �������������� ����� proto= .\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Warning: ����� namlen �� ��������������.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "����������� �������� ������������ nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "��������������: ����� nolock �� ��������������.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "����������� ����� ������������ nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ������� �������� hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS ����� TCP �� ��������������.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "����� nfs"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "������ nfs �������, ��� ������ ����������"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "��� ���������� ����� NFS ������������ portmapper\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "��� ������ nfs ������������ ���� %d\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs �����������"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "����������� ������������ �������� ��������� nfs: %d"
 
-#: mount/sundries.c:66
+#: mount/sundries.c:26
 msgid "bug in xstrndup call"
 msgstr "������ � ������ xstrndup"
 
-#: mount/swapon.c:54
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p priority] special ...\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
 "       %s [-s]\n"
 msgstr ""
 "�������������: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
-"       %s [-v] [-p ���������] ����������� ...\n"
+"       %s [-v] [-p ���������] �����������|LABEL=���_���� ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8473,133 +8436,139 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] ����������� ...\n"
 
-#: mount/swapon.c:170 mount/swapon.c:234
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s �� %s\n"
 
-#: mount/swapon.c:174
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: ���������� ����� ���������� ��� %s\n"
+
+#: mount/swapon.c:184
 #, c-format
-msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: ���������� ���������� ��������� %s: %s\n"
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: ���������� ���������� ��������� %s: %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:195
 #, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: ��������������: %s ����� ������������ ���������� %04o, ������������� %04o\n"
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr ""
+"%s: ��������������: %s ����� ������������ ���������� %04o, ������������� %"
+"04o\n"
 
-#: mount/swapon.c:197
+#: mount/swapon.c:207
 #, c-format
-msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: ������������ ���� %s - ������� �� ����� ����.\n"
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: ������������ ���� %s - ������ � � ������� ����.\n"
 
-#: mount/swapon.c:240
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "�� �����������������.\n"
 
-#: mount/swapon.c:304 mount/swapon.c:400
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: ���������� ������� %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: �������������� ��� ��������� -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ���������� ������� �������� �������: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "����: %s, �������: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: ���������� �������� ����� ��� %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: ������� �������� hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: �������� ������� ����������"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: �� �������������"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ���������� �������� ���������"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: ���������� ������"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: �� ������"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: ���������� ����� ����� ����������������� ��� ���������������"
+msgstr ""
+"umount: %s: ���������� ����� ����� ����������������� ��� ���������������"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ������� ���������� �� fs ���������"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "��� umount2, ����������� ������� umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "���������� �������������� %s - ������ ����� ����������� ������� %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ����� - �������������� ������ ��� ������\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ���������� ��������������� %s ������ ��� ������\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s �������������\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ���������� ����� ������ �������� ������ ��� ���������������"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8610,47 +8579,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t ����_��] [-O �����]\n"
 "       umount [-f] [-r] [-n] [-v] ����������� | ����...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "���������� �������������� \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "����������� ������� �������������� %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "���������� ����� %s � mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �� ������������� (�������� mtab)"
 
-#: mount/umount.c:576
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: ������, ��� %s ������������� ��������� ���"
 
-#: mount/umount.c:589
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s �� � fstab (� �� �� root)"
 
-#: mount/umount.c:593
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: ������������ %s ������������ fstab'�"
 
-#: mount/umount.c:634
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: ������ %s ����� �������������� %s �� %s"
 
-#: mount/umount.c:715
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: ������ root ����� ������� ���"
 
@@ -8676,10 +8644,12 @@ msgstr ""
 #: sys-utils/cytune.c:126
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"���� %s, ��� ���������� �������� %lu � �������� ����-���� %lu, �������� �������� � fifo ���� %d,\n"
+"���� %s, ��� ���������� �������� %lu � �������� ����-���� %lu, �������� "
+"�������� � fifo ���� %d,\n"
 "� ������������ �������� �������� � ��������/������� ���� %f\n"
 
 #: sys-utils/cytune.c:190
@@ -8709,8 +8679,12 @@ msgstr "�������� �������� ������� �� ���������: %s\n"
 
 #: sys-utils/cytune.c:239
 #, c-format
-msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
-msgstr "�������������: %s [-q [-i ��������]] ([-s ��������]|[-S ��������]) ([-t ��������]|[-T ��������]) [-g|-G] ���� [����...]\n"
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"�������������: %s [-q [-i ��������]] ([-s ��������]|[-S ��������]) ([-t "
+"��������]|[-T ��������]) [-g|-G] ���� [����...]\n"
 
 #: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
 #: sys-utils/cytune.c:340
@@ -8763,8 +8737,11 @@ msgstr "���������� ������ CYGETMON �� %s: %s\n"
 
 #: sys-utils/cytune.c:419
 #, c-format
-msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ������, %lu/%lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu ������\n"
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ������, %lu/%lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu "
+"������\n"
 
 #: sys-utils/cytune.c:425
 #, c-format
@@ -8773,8 +8750,11 @@ msgstr "   %f ������/���; %f ���, %f ���������� (����/���)\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
-msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr "%s: %lu ������, %lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu ������\n"
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ������, %lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu "
+"������\n"
 
 #: sys-utils/cytune.c:436
 #, c-format
@@ -8786,6 +8766,19 @@ msgstr "   %f ������/���; %f ��� (����/���)\n"
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "�������������: %s [-c] [-n �������] [-s ����_������]\n"
 
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: ����������� �����, ����������� ����������.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"������������� flock [--shared | --timeout=�������] ���_����� ������� {��� "
+"���...}\n"
+
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
@@ -8889,8 +8882,11 @@ msgstr "\t%s -h ��� �������.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid "%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s ������������� ���������� � ��������� ipc, � ������� �� ������ ������ �� ������.\n"
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s ������������� ���������� � ��������� ipc, � ������� �� ������ ������ �� "
+"������.\n"
 
 #: sys-utils/ipcs.c:131
 #, c-format
@@ -8949,8 +8945,6 @@ msgstr "���� �� ��������� ��� ������������� ��������� ������������ ������\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ������� ����. ���. ������ --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9040,7 +9034,8 @@ msgstr "gid"
 #: sys-utils/ipcs.c:305
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr "------ ����� �����������/����������/��������� ����. ���. ������ --------\n"
+msgstr ""
+"------ ����� �����������/����������/��������� ����. ���. ������ --------\n"
 
 #: sys-utils/ipcs.c:306
 #, c-format
@@ -9274,7 +9269,8 @@ msgstr "msqid"
 #: sys-utils/ipcs.c:524
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr "------ ���������� �����������/������/��������� ������� ��������� --------\n"
+msgstr ""
+"------ ���������� �����������/������/��������� ������� ��������� --------\n"
 
 #: sys-utils/ipcs.c:525
 #, c-format
@@ -9448,11 +9444,15 @@ msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "�������������: rdev [ -rv ] [ -o �������� ] [ ����� [ �������� [ �������� ] ] ]"
+msgstr ""
+"�������������: rdev [ -rv ] [ -o �������� ] [ ����� [ �������� "
+"[ �������� ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (��� rdev /linux � �.�.) ���������� ������� ���������� ROOT"
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (��� rdev /linux � �.�.) ���������� ������� ���������� ROOT"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9460,7 +9460,9 @@ msgstr "  rdev /dev/fd0 /dev/hda2         ������������� ROOT � /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              ��������� ROOTFLAGS (������ ������ ��� ������)"
+msgstr ""
+"  rdev -R /dev/fd0 1              ��������� ROOTFLAGS (������ ������ ��� "
+"������)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9487,12 +9489,17 @@ msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     �� ��, ��� � rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr "����������: �����������: -3=��������, -2=�����������, -1=������� Vga, 1=����1, 2=����2,..."
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"����������: �����������: -3=��������, -2=�����������, -1=������� Vga, "
+"1=����1, 2=����2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      ����������� -R 1 ��� ������������ ��������� �������� ������ ��� ������, -R 0 ��� ������/������."
+msgstr ""
+"      ����������� -R 1 ��� ������������ ��������� �������� ������ ��� "
+"������, -R 0 ��� ������/������."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
@@ -9565,8 +9572,11 @@ msgstr "�����"
 
 #: sys-utils/renice.c:68
 #, c-format
-msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "�������������: renice ��������� [ [ -p ] pid'� ] [ [ -g ] pgrp'� ] [ [ -u ] ������������ ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"�������������: renice ��������� [ [ -p ] pid'� ] [ [ -g ] pgrp'� ] [ [ -u ] "
+"������������ ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9603,7 +9613,8 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"�������������: %s <����������> [ -i <����������> | -t <�����> | -c <�������> | -w <��������> | \n"
+"�������������: %s <����������> [ -i <����������> | -t <�����> | -c <�������> "
+"| -w <��������> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9719,20 +9730,24 @@ msgstr "hexdump: �������� �������� ��������.\n"
 
 #: text-utils/hexsyntax.c:131
 #, c-format
-msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr "hexdump: [-bcCdovx] [-e ������_�������] [-f ����_�������] [-n �����] [-s �������] [���� ...]\n"
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e ������_�������] [-f ����_�������] [-n �����] [-s "
+"�������] [���� ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "�������������: %s [-dflpcsu] [+�����_������ | +/������] ���1 ���2 ...\n"
+msgstr ""
+"�������������: %s [-dflpcsu] [+�����_������ | +/������] ���1 ���2 ...\n"
 
-#: text-utils/more.c:485
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ����������� ����� \"-%c\"\n"
 
-#: text-utils/more.c:517
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9743,8 +9758,7 @@ msgstr ""
 "*** %s: ������� ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:560
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9755,45 +9769,45 @@ msgstr ""
 "******** %s: �� ��������� ���� ********\n"
 "\n"
 
-#: text-utils/more.c:663
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[����������� q ��� or Q ��� ������]"
 
-#: text-utils/more.c:755
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--�����--"
 
-#: text-utils/more.c:757
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(��������� ����: %s)"
 
-#: text-utils/more.c:762
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[������� ������ ��� �����������, 'q' ��� ������.]"
 
-#: text-utils/more.c:1161
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...����� �� %d �������"
 
-#: text-utils/more.c:1163
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...����� �� 1 ��������"
 
-#: text-utils/more.c:1206
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...������������ ���� ������"
 
-#: text-utils/more.c:1208
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...������������ %d �����"
 
-#: text-utils/more.c:1245
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9803,17 +9817,20 @@ msgstr ""
 "***�����***\n"
 "\n"
 
-#: text-utils/more.c:1283
+#: text-utils/more.c:1237
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"����������� ������ ����������� ������������ �������� �������� k. �������� �� ��������� � ��������.\n"
-"��������� (*) ��������, ��� �������� ���������� ����� ��������� �� ���������.\n"
+"����������� ������ ����������� ������������ �������� �������� k. �������� �� "
+"��������� � ��������.\n"
+"��������� (*) ��������, ��� �������� ���������� ����� ��������� �� "
+"���������.\n"
 
-#: text-utils/more.c:1290
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9835,15 +9852,19 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<������>                ����� ��������� k ����� ������ [������� ������ ������]\n"
-"z                       ����� ��������� k ����� ������ [������� ������ ������]*\n"
+"<������>                ����� ��������� k ����� ������ [������� ������ "
+"������]\n"
+"z                       ����� ��������� k ����� ������ [������� ������ "
+"������]*\n"
 "<return>                ����� ��������� k ����� ������ [1]*\n"
-"d ��� ctrl-D            ��������� k ����� [������� �������� ���������, ���������� 11]*\n"
+"d ��� ctrl-D            ��������� k ����� [������� �������� ���������, "
+"���������� 11]*\n"
 "q ��� Q ��� <������.>   ����� �� more\n"
 "s                       ������� ������ k ����� ������ [1]\n"
 "f                       ������� ������ k ������ ������� ������ [1]\n"
 "b ��� ctrl-B            ������� ����� k ������ ������� ������ [1]\n"
-"'                       ������� � �����, � �������� ��� ����� ���������� �����\n"
+"'                       ������� � �����, � �������� ��� ����� ���������� "
+"�����\n"
 "=                       ����������� ������ ������� ������\n"
 "/<���������� ���������> ����� k-�� ��������� ����������� ��������� [1]\n"
 "n                       ����� k-�� ��������� ���������� �.�. [1]\n"
@@ -9855,34 +9876,34 @@ msgstr ""
 ":f                      ����������� ����� �������� ����� � ������ ������\n"
 ".                       ���������� ���������� �������\n"
 
-#: text-utils/more.c:1359 text-utils/more.c:1364
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[������� 'h' ��� ��������� ����������.]"
 
-#: text-utils/more.c:1398
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" ������ %d"
 
-#: text-utils/more.c:1400
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[�� ����] ������ %d"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  ������������\n"
 
-#: text-utils/more.c:1531
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...������������\n"
 
-#: text-utils/more.c:1560
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "������������ ���������� ���������"
 
-#: text-utils/more.c:1572
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9890,15 +9911,15 @@ msgstr ""
 "\n"
 "������ �� ������\n"
 
-#: text-utils/more.c:1575 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "������ �� ������"
 
-#: text-utils/more.c:1636
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "���������� ������� �������� �������\n"
 
-#: text-utils/more.c:1675
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -9906,19 +9927,19 @@ msgstr ""
 "\n"
 "...������������ "
 
-#: text-utils/more.c:1679
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...������������ �� ����� "
 
-#: text-utils/more.c:1681
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...������������ ������� �� ����� "
 
-#: text-utils/more.c:1959
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "������ ������� �������"
 
-#: text-utils/more.c:2002
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "��� ���������� ������� ��� ������"
 
@@ -9971,89 +9992,89 @@ msgstr "hexdump: �������� ������ {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: �������� ������ �������������� %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
-msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr "%s: �������������: %s [-�����] [-p ������] [-cefnrs] [+������] [+/������/] [�����]\n"
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: �������������: %s [-�����] [-p ������] [-cefnrs] [+������] [+/������/] "
+"[�����]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: ��� ����� ��������� �������� -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: �������� ����� -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...������������ ������\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...������������ �����\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "��� ���������� �����"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "��� ����������� �����"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: ������ ������ �� ����� %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: ����������� ����� ����� � ����� %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: ����������� ������ � ����� %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ���������� ������� ��������� ����\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "������ RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(����� �����)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "��� ����������� ����� ������"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "���������� ������� "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "��������"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !������� �� ��������� � ������ rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() ���������� ��������, ���������� ��� ��� �������\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(��������� ����: "
 
@@ -10067,6 +10088,16 @@ msgstr "���������� �������� �������� ������������\n"
 msgid "usage: rev [file ...]\n"
 msgstr "�������������: rev [���� ...]\n"
 
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "���������� ������� \"%s\" ��� ������\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "������������: tailf log-����\n"
+
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
@@ -10096,3 +10127,158 @@ msgstr "������ ������� ������ ������� �������.\n"
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr "�� ������� ������ ��� ���������� ������.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "�������� �����: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "������ ����������: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "��� ������ ������ ����������: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev ���\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev ��� ������ ������� ������� ������� ���������� ������� "
+#~ "���� 1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dev\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dev\n"
+
+#~ msgid "version"
+#~ msgstr "������"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "���������� ������� /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "���������� ��������� ��������� ������ �� /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "���������� ������� %s ��� ������"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "���������� ���������� ��������� (%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s �� ����� ������ filemode'��"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "���������� ��������� ������ �� %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "��� ������� ����� ������������� ����� � �������.\n"
+#~ "���������� ��� ��� �������.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "� ��� ������� ����� ���������� ���������.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "������ ������ ��������� �� ������� ���� 6 ��������, ���������� ��� ���.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "������ ������ ��������� ������� ��������� ���� �������:\n"
+#~ "������� �������� � ������� ��������, ����� � �� ����������������\n"
+#~ "�������. ��. passwd(1) ��� ��������� �������������� ����������.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "�� �� ������ �������� ������������ ������ ������.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr ""
+#~ "����������, �� ����������� � �������� ������ ���-�� ����� ������ ����� "
+#~ "������������!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr ""
+#~ "����������, �� ����������� � �������� ������ ���-�� ����� ������ "
+#~ "���������� �����!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "�������������: passwd [���_������������ [������]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "������ root ����� ������������ ����� � ����� � ����� �����������.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "�������������: passwd [-foqsvV] [������������ [������]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "���������� ��������� %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "���������� ����� ������������������ ���"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "������ root ����� �������� ����� ������.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "������� ����� ����������.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "���������� ����� ��� ������������. `%s' ������������� ������������?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "� ��������� � ���� �������� ������ ��������� ������. ������ ����� "
+#~ "����������� yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID � ��� ������������ �� ���������, ����������!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "��������� ������ ��� %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "������� ������ ������: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "����������� ������, ����������."
+
+#~ msgid "Enter new password: "
+#~ msgstr "������� ����� ������: "
+
+#~ msgid "Password not changed."
+#~ msgstr "������ �� �������."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "��������� ����� ������: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "�� ��������. ������ �� �������."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "������ �������, ������������ %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "������ ROOT'A �������"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "������ ������� root'��, ������������ %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "���������� setpwnam ��� ��������� ������.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "������ *��* �������, ���������� ��� ��� �������.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "������ �������.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: ��� ������ ���� ��������������� ��� ��������� ���� `nfs'"
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 000000000..5c5391ca0
--- /dev/null
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 56e751944..04bcca941 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2003-01-28 16:30+0100\n"
 "Last-Translator: Primo� Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -118,7 +118,7 @@ msgstr "%s: napaka ioctl na %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "uporaba:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "uporaba: %s [ -n ] naprava\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s iz %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Dvo"
 msgid "Single"
 msgstr "Eno"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -203,97 +202,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: napaka %d pri dekomprimiranju! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: napaka v velikosti pri simbolni povezavi ,%s`\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, fuzzy, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Zapisanih samo %lu od skupno %lu bajtov"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: neveljavno dol�ina pripone"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: prevedeno brez podpore -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: opozorilo - velikosti datote�nega sistema ni mo� ugotoviti \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s ni blo�na enota, niti datoteka\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: neveljavno dol�ina pripone"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: neveljavno �tevilo"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, fuzzy, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: neveljavno �tevilo"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -750,7 +749,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Naprava %s\n"
@@ -819,18 +818,18 @@ msgstr ""
 msgid "error closing %s"
 msgstr ""
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uporaba: mkfs [-V] [-t tip] [izbire] naprava [velikost]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Zmanjkalo pomnilnika!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs, izdaja %s (%s)\n"
@@ -873,7 +872,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -926,10 +924,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1002,7 +996,6 @@ msgstr ""
 msgid "write failed in write_block"
 msgstr ""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1036,7 +1029,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1078,106 +1071,106 @@ msgstr ""
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Slaba podana velikost strani %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Uporabljamo podano velikost strani %d namesto privzete vrednosti %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Privzemamo strani velikosti %d (ne %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "oznaka"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Uporaba: %s [-c] [-v0|-v1] [-pVEL_STRANI] /dev/name [bloki]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "preve� slabih strani"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "ena slaba stran\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d slabih strani\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: napaka: velikost %ld je ve�ja od velikosti naprave %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: napaka: neznana izdaja %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: napaka: velikost izmenjalnega prostora mora biti vsaj %ld KB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: opozorilo: meja izmenjalnega prostora postavljena na %ld KB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Izmenjalnega prostora ne bomo posku�ali napraviti na ,%s`"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "usodna napaka: prva stran neberljiva"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1193,120 +1186,84 @@ msgstr ""
 "varnostno\n"
 "preverjanje.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Izmenjalnega prostora ni mogo�e pripraviti: branje ni mogo�e"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Pripravljamo izmenjalni prostor izdaje %d, velikost = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "izmenjalne naprave ni mogo�e previti"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "strani s podpisom ni mogo�e zapisati"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync() ni uspel"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Neveljavno �tevilo: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Skladenjska napaka: ,%s`\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Neuporabljen prostor"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk je bil zamenjan.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Ponovno za�enite sistem, da bo razdelitvena tabela pravilno a�urirana.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1315,810 +1272,788 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "USODNA NAPAKA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Pritisnike katerokoli tipko za izhod iz cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Diskovnega pogona ni mo� prebrati"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Na diskovni pogon ni mo� pisati"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Preve� razdelkov"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Razdelek se za�ne pred stezo 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Razdelek se kon�a pred stezo 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Razdelek se za�ne onkraj konca diska"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Razdelek se kon�a onkraj konca diska"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logi�ni razdelki niso v diskovnem vrstnem redu"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logi�ni razdelki se prekrivajo"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "raz�irjeni logi�ni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!! Interna napaka: ustvarjanje logi�nega pogona brez raz�irjenega "
 "razdelka !!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Pritisnite katerokoli tipko za nadaljevanje"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Primaren"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Ustvari nov primaren razdelek"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logi�en"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Ustvari nov logi�en razdelek"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Ne ustvari razdelka"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Interna napaka !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Za�etek"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Dodaj razdelek na za�etek prostega obmo�ja"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Dodaj razdelek na konec prostega obmo�ja"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ni prostora za ustvarjanje raz�irjenega razdelka"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Izpi�i tabelo razdelkov na zaslon ali shrani v datoteko"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Velikosti diska ni mogo�e ugotoviti"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Slab primarni razdelek"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Slab logi�ni razdelek"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Opozorilo! To lahko uni�i podatke na disku!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Ste prepri�ani, da �elite zapisati tabelo razdelkov na disk? (da ali ne): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Tabela razdelkov ni bila zapisana"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "da"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Prosim, odgovorite ,da` ali ,ne`"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Tabelo razdelkov zapisujemo na disk..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Tabela razdelkov zapisana na disku"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabela razdelkov zapisana, a�uriranje tabele neuspe�no. Ponovno za�enite "
 "sistem."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Noben primarni razdelek ni ozna�en kot zagonski. DOS MBR se ne more zagnati."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ve� kot en primarni razdelek je ozna�en kot zagonski. DOS MBR se ne more "
 "zagnati."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Vnesite ime datoteke ali pritisnite ENTER za prikaz na zaslonu: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ni mo� odpreti datoteke ,%s`"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Brez   "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Primaren"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logi�en"
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Neznano"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Zagonski (%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 #, fuzzy
 msgid "None"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "parametri\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 #, fuzzy
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Za�etni---      ----Kon�ni----  Za�etni  �tevilo\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 #, fuzzy
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 #, fuzzy
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Direktno"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Izpis tabele v surovi obliki"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Izpis tabele, urejene po sektorjih"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Brez izpisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Osnovna navodila za cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Cfdisk je tekstovni program za urejanje diskovnih razdelkov,"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "s katerim lahko ustvarjate, bri�ete ali spreminjate razdelke"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "na va�em disku."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "  Ukaz        Pomen"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             ,ne`"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznano (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Ime"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Oznake"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Tip Razd."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Dat. sistem"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Oznaka]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 #, fuzzy
 msgid "  Cylinders"
 msgstr "steza"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Vel. (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Vel. (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Zagonski"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Ozna�i, ali je razdelek zagonski"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Izbri�i"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Izbri�i ta razdelek"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometr."
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Nastavi geometrijo diska (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Pomo�"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Izpi�i stran z navodili"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Razpni"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Raz�iri trenutni razdelek �ez celotno prosto obmo�je (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Ustvari nov razdelek na prostem obmo�ju diska"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Natisni"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Izpi�i tabelo razdelkov na zaslon ali shrani v datoteko"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Izhod"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Izhod iz programa brez zapisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Tip"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enote"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Pi�i"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2161,9 +2096,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "  Ukaz  dejanje"
 
@@ -2183,10 +2118,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   izpi�i ta menu"
 
@@ -2198,14 +2132,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   kon�aj, ne da bi shranil spremembe"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2248,13 +2182,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2299,8 +2233,6 @@ msgstr ""
 msgid " badsect"
 msgstr ""
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2399,8 +2331,8 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr ""
 
@@ -2457,7 +2389,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2479,7 +2411,7 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2491,7 +2423,7 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2501,209 +2433,195 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ni mogo�e odpreti %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ni mogo�e prebrati %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ni mogo�e pisati na %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Pomnilnika ni ve� mogo�e rezervirati\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Usodna napaka\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   preklopi samo za branje"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   zbri�i razdelek"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   izpi�i znane vrste razdelkov"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   dodaj nov razdelek"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ustvari novo prazno tabelo razdelkov MS-DOS"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   izpi�i tabelo razdelkov"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ustvari novo prazno Sunovo oznako diska"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   spremeni sistemski ID razdelka"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   preveri tabelo razdelkov"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   zapi�i tabelo razdelkov in kon�aj"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   posebne mo�nosti (samo za poznavalce)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   dolo�i razdelek kot zagonski"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr ""
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " in "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2715,29 +2633,29 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2746,131 +2664,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Interna napaka\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Izbrani razdelek %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noben razdelek �e ni dolo�en!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Vsi primarni razdelki so �e dolo�eni!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "steza"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Enote prikaza/vnosa spremenjene na %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "OPOZORILO: Razdelek %d je raz�irjeni razdelek\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Nastavljena je zdru�ljivost z DOS.\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Zdru�ljivost z DOS ni nastavljena.\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Razdelek %d �e ne obstaja!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2883,7 +2801,7 @@ msgstr ""
 "razdelkov tipa 0. Razdelek lahko zbri�ete z\n"
 "ukazom ,d`.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -2892,7 +2810,7 @@ msgstr ""
 "Razdelka ne morete pretvoriti v raz�irjenega ali obratno.\n"
 "Najprej ga morate zbrisati.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2903,7 +2821,7 @@ msgstr ""
 "Tak je dogovor v SunOS/Solaris, Linux pa ga spo�tuje.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2914,52 +2832,52 @@ msgstr ""
 "razdelek 11 pa kot celotni del (6), kot pri�akuje IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Tip razdelka %d spremenjen v %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Fizi�ni za�etek razdelka %d ni enak logi�nemu (ne-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "  fizi�ni=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logi�ni=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Fizi�ni konec razdelka %d ni enak logi�nemu:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Razdelek %i se ne za�ne na meji stez:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mora biti (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Razdelek %i se ne kon�a na meji stez.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mora biti (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -2968,7 +2886,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld bajtov\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -2977,17 +2895,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, fuzzy, c-format
 msgid ", total %llu sectors"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2996,14 +2914,14 @@ msgstr ""
 "Enote = %s od %d x %d = %d bajtov\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3011,23 +2929,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Naprava"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3035,82 +2953,82 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3119,22 +3037,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "logi�ni razdelki niso v diskovnem vrstnem redu"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Slab primarni razdelek"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3142,32 +3060,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3176,7 +3094,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3185,107 +3103,106 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3349,15 +3266,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3418,7 +3335,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3462,7 +3378,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3537,7 +3453,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr ""
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3552,11 +3467,10 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "DA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3621,44 +3535,43 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Prazno"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr ""
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3667,12 +3580,12 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3681,86 +3594,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3768,14 +3681,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3784,7 +3697,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3796,7 +3709,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3805,16 +3718,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3838,32 +3751,26 @@ msgstr ""
 msgid "Extended"
 msgstr "Raz�irjen"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr ""
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr ""
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr ""
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr ""
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr ""
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr ""
@@ -3872,7 +3779,6 @@ msgstr ""
 msgid "W95 FAT32 (LBA)"
 msgstr ""
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr ""
@@ -3965,12 +3871,10 @@ msgstr ""
 msgid "OnTrack DM6 Aux1"
 msgstr ""
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr ""
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr ""
@@ -3991,8 +3895,6 @@ msgstr ""
 msgid "Priam Edisk"
 msgstr ""
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4002,7 +3904,6 @@ msgstr ""
 msgid "GNU HURD or SysV"
 msgstr ""
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr ""
@@ -4023,12 +3924,10 @@ msgstr ""
 msgid "Old Minix"
 msgstr ""
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr ""
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr ""
@@ -4058,12 +3957,10 @@ msgstr ""
 msgid "Amoeba BBT"
 msgstr ""
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr ""
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr ""
@@ -4072,7 +3969,6 @@ msgstr ""
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr ""
@@ -4137,30 +4033,22 @@ msgstr ""
 msgid "CP/M / CTOS / ..."
 msgstr ""
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr ""
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr ""
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr ""
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr ""
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr ""
@@ -4169,116 +4057,109 @@ msgstr ""
 msgid "EFI GPT"
 msgstr ""
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr ""
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr ""
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr ""
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "pomankanje pomnilnika?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "napaka pri branju %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4286,56 +4167,56 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4344,109 +4225,109 @@ msgstr ""
 "Ime id\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4454,480 +4335,475 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 #, fuzzy
 msgid "start"
 msgstr "stanje"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 #, fuzzy
 msgid "end"
 msgstr "po�lji"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "razli�ica"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Velikosti diska ni mogo�e ugotoviti"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -4935,42 +4811,42 @@ msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4978,73 +4854,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "V REDU\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5138,130 +5014,130 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "zagnano iz MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ura Ruffian BCD\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "vrata ure naravnana na 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomski %s neuspe�en v 1000 iteracijah!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Neuspelo odpiranje vrat /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Dovoljenja nismo dobili, ker nismo posku�ali.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ne more dobiti dostopa do V/I vrat: klic iopl(3) neuspe�en.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Verjetno potrebujete pravice skrbnika sistema.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Privzemamo, da strojna ura te�e v %s �asu.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "univerzalnem (UTC)"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "krajevnem"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Opozorilo: neprepoznana tretja vrstica v datoteki adjtime\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Pri�akovano: ,UTC`, ,LOCAL` ali pa ni�).\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Zadnji popravek drsenja opravljen %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Zadnja kalibracija opravljena %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Strojna ura te�e v %s �asu\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "neznanem"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "�akamo na tiktak ure...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...dobili tiktak.\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Neveljavne vrednosti v strojni uri: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "�as strojne ure: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "�as, prebran iz strojne ure: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Strojno uro nastavljamo na %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Ure nismo premaknili - zgolj preizkus.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5270,7 +5146,7 @@ msgstr ""
 "�as, ki je pretekel od referen�nega, je  %.6f sekund.\n"
 "Pove�ujemo zaostanek, da bi dosegli naslednjo celo sekundo.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5279,22 +5155,22 @@ msgstr ""
 "Registri strojne ure vsebujejo vrednosti ki so bodisi neveljavne\n"
 "(npr. 50. dan v mesecu), bodisi izven na�ega obsega (npr. leto 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekund\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Izbira --date ni bila podana.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "Argument izbire --date je predolg.\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5303,22 +5179,22 @@ msgstr ""
 "Vrednost, podana pri izbiri --date ni veljaven datum.\n"
 "Med drugim vsebuje narekovaje.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Izvajamo ukaz date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Ne moremo pognati ukaza ,date` v lupini /bin/sh, klic popen() neuspe�en"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "odziv ukaza date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5333,7 +5209,7 @@ msgstr ""
 "Odziv pa:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5344,69 +5220,69 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr ""
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr ""
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5414,60 +5290,60 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5476,34 +5352,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s iz %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5535,72 +5416,72 @@ msgid ""
 "                either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5634,7 +5515,6 @@ msgstr ""
 msgid "ioctl KDSHWCLK failed"
 msgstr ""
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr ""
@@ -5726,9 +5606,6 @@ msgstr ""
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -5754,7 +5631,6 @@ msgstr ""
 msgid "calling open_tty\n"
 msgstr ""
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr ""
@@ -5763,7 +5639,6 @@ msgstr ""
 msgid "writing init string\n"
 msgstr ""
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr ""
@@ -5777,7 +5652,6 @@ msgstr ""
 msgid "read %c\n"
 msgstr ""
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr ""
@@ -5831,7 +5705,6 @@ msgstr ""
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr ""
@@ -5846,12 +5719,10 @@ msgstr ""
 msgid "%s: not open for read/write"
 msgstr ""
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr ""
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -5890,30 +5761,25 @@ msgid ""
 "line baud_rate,... [termtype]\n"
 msgstr ""
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr ""
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr ""
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr ""
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr ""
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr ""
@@ -5959,8 +5825,8 @@ msgstr ""
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Geslo: "
@@ -6132,34 +5998,6 @@ msgstr ""
 msgid "No known shells.\n"
 msgstr ""
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr ""
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr ""
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr ""
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr ""
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6169,77 +6007,71 @@ msgstr ""
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr ""
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr ""
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr ""
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "USODNA NAPAKA: terminalske linije ni mo� znova odpreti: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: izbira -h je na voljo samo za sistemskega skrbnika.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uporaba: login [-fp] [uporabnik]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: napaka v PAM, nadaljevanje ni mogo�e: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ni mo� inicializirati: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "prijava: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "NEUSPE�NA PRIJAVA %d IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6248,17 +6080,17 @@ msgstr ""
 "Prijava ni uspela\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PRE�TEVILNI (%d) POSKUSI PRIJAVE IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6267,142 +6099,127 @@ msgstr ""
 "\n"
 "Prijava ni uspela\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Neveljavno uporabni�ko ime"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Prijava ni uspela\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Prijavljenih je �e preve� uporabnikov.\n"
-"Poskusite pozneje.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Hkrati te�e preve� va�ih procesov.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "TELEFONSKA PRIJAVA Z LINIJE %s, UPORABNIK %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "SKRBNI�KA PRIJAVA Z RA�UNALNIKA %s, UPORABNIK %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "SKRBNI�KA PRIJAVA NA LINIJI %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s Z RA�UNALNIKA %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "�aka vas nova po�ta.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "�aka vas po�ta.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vejitev ni mogo�a: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skripta ukazne lupine ni mo� pognati: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ni ukazne lupine: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6411,65 +6228,65 @@ msgstr ""
 "\n"
 "%s prijava: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Prijavno ime je veliko predolgo.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "IME je predolgo"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Prijavna imena se ne morejo za�eti z znakom ,-`.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "z ra�unalnika %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE�NA PRIJAVA Z RA�UNALNIKA %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE�NA PRIJAVA NA LINIJI %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV Z RA�UNALNIKA %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV NA LINIJI %s, %s"
@@ -6489,166 +6306,30 @@ msgstr "je n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "uporaba: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr ""
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr ""
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr ""
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr ""
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr ""
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr ""
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite �e enkrat.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Geslo mora vsebovati tako �rke (velike ali male), kot �tevke ali druge\n"
-"ne-alfanumeri�ne znake. Iz�rpnej�a navodila so na voljo v passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Starega gesla ne morete znova uporabiti.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Prosim, da za geslo ne uporabljate uporabni�kega imena.\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Prosim, da za geslo ne uporabljate va�ega imena.\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Uporaba: passwd [uporabnik [geslo]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema argumentoma.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Uporaba: passwd [-foqsvV] [uporabnik [geslo]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Ni mo� pognati %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Prijavnega imena ni mo� najti"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Samo sistemski skrbnik lahko spreminja gesla drugih uporabnikov.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Preve� argumentov.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Uporabni�kega imena ni mo� najti. Je ,%s` res uporabnik?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "S tem ukazom lahko spreminjate samo lokalna gesla. Uporabite yppasswd."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID in uporabni�ko ime se ne ujemata"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Spreminjamo geslo za %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Vnesite staro geslo: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Geslo ni veljavno."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Vnesite novo geslo: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Geslo ni bilo spremenjeno."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ponovno vnesite novo geslo: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Gesli se ne ujemata. Geslo ni bilo spremenjeno."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "geslo spremenjeno, uporabnik %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "SKRBNI�KO GESLO SPREMENJENO"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "geslo spremenil skrbnik, uporabnik %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Geslo NI BILO spremenjeno. Poskusite pozneje.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Geslo je bilo spremenjeno.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6695,7 +6376,6 @@ msgstr "ponovno zagnan od uporabnika %s: %s"
 msgid "halted by %s: %s"
 msgstr "ustavljen od uporabnika %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6730,7 +6410,6 @@ msgstr ""
 msgid "Error executing\t%s\n"
 msgstr "Napaka ob izvajanju     %s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -6820,7 +6499,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr ""
@@ -6849,7 +6527,7 @@ msgstr ""
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr ""
 
@@ -6998,12 +6676,6 @@ msgstr ""
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7014,13 +6686,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr ""
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr ""
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr ""
 
@@ -7150,7 +6821,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7158,276 +6829,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Napaka pri branju %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7502,10 +7172,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -7789,232 +7455,217 @@ msgstr ""
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: priklopna to�ka %s ni imenik"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: dostop zavrnjen"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: ukaz mount lahko uporablja samo sistemski skrbnik"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je v rabi"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blo�na enota"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ni mo� priklopiti v bralnem na�inu"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je za��itena pred pisanjem, priklapljamo v bralnem na�inu"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8066,34 +7717,34 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi��ete v priro�niku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: priklapljamo %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8128,98 +7779,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8228,7 +7879,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8237,7 +7888,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8245,138 +7896,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "Ni mo� pognati %s: %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ni mo� odpreti %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8384,48 +8033,47 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ni mogo�e odpreti "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8570,7 +8218,7 @@ msgstr "%s: napaka: neznana izdaja %d\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -8724,8 +8372,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr "omejitve deljenega pomnilnika\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9479,17 +9125,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "uporaba: %s [-dflpcsu] [+vrstica | +/vzorec] datoteka1 datoteka2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: napaka: neznana izdaja %d\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9500,8 +9146,7 @@ msgstr ""
 "*** %s: imenik ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9512,45 +9157,45 @@ msgstr ""
 "******** %s: Ni besedilna datoteka ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Za izhod uporabite q ali Q]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Naprej--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Naslednja datoteka: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pritisnite preslednico za nadaljevanje, Q za izhod.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...nazaj %d strani"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...nazaj eno stran"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...presko�imo eno vrstico"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...presko�imo %d vrstic"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -9560,7 +9205,7 @@ msgstr ""
 "***Nazaj***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9568,7 +9213,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9591,34 +9236,34 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pritisnite ,h` za navodila.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" vrstica %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ni datoteka] vrstica %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Prekora�itev\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...preskakujemo\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9626,33 +9271,33 @@ msgstr ""
 "\n"
 "Vzorca ni mo� najti\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Vzorca ni mo� najti"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "vejitev ni mogo�a\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Vrstica je predolga"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9705,90 +9350,87 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: izbira zahteva argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: nedovoljena izbira -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Naslednje datoteke ni"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Prej�nje datoteke ni"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Napaka pri branju iz datoteke %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Nepri�akovan znak za konec datoteke v datoteki %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Ni mogo�e ustvariti za�asne datoteke\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "napaka RE: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Ni mogo�e odpreti "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "shranjeno"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
@@ -9842,6 +9484,114 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Neveljavno �tevilo: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Skladenjska napaka: ,%s`\n"
+
+#~ msgid "version"
+#~ msgstr "razli�ica"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Prijavljenih je �e preve� uporabnikov.\n"
+#~ "Poskusite pozneje.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Hkrati te�e preve� va�ih procesov.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite �e enkrat.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Geslo mora vsebovati tako �rke (velike ali male), kot �tevke ali druge\n"
+#~ "ne-alfanumeri�ne znake. Iz�rpnej�a navodila so na voljo v passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Starega gesla ne morete znova uporabiti.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Prosim, da za geslo ne uporabljate uporabni�kega imena.\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Prosim, da za geslo ne uporabljate va�ega imena.\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Uporaba: passwd [uporabnik [geslo]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema "
+#~ "argumentoma.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Uporaba: passwd [-foqsvV] [uporabnik [geslo]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Ni mo� pognati %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Prijavnega imena ni mo� najti"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Samo sistemski skrbnik lahko spreminja gesla drugih uporabnikov.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Preve� argumentov.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Uporabni�kega imena ni mo� najti. Je ,%s` res uporabnik?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "S tem ukazom lahko spreminjate samo lokalna gesla. Uporabite yppasswd."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID in uporabni�ko ime se ne ujemata"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Spreminjamo geslo za %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Vnesite staro geslo: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Geslo ni veljavno."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Vnesite novo geslo: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Geslo ni bilo spremenjeno."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Ponovno vnesite novo geslo: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Gesli se ne ujemata. Geslo ni bilo spremenjeno."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "geslo spremenjeno, uporabnik %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "SKRBNI�KO GESLO SPREMENJENO"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "geslo spremenil skrbnik, uporabnik %s"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Geslo NI BILO spremenjeno. Poskusite pozneje.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Geslo je bilo spremenjeno.\n"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Tabelo razdelkov zapisujemo na disk..."
diff --git a/po/stamp-cat-id b/po/stamp-po
index 9788f7023..9788f7023 100644
--- a/po/stamp-cat-id
+++ b/po/stamp-po
diff --git a/po/sv.gmo b/po/sv.gmo
new file mode 100644
index 000000000..4ce037044
--- /dev/null
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 2280502f4..db0336d5e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-12-26 20:42+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -117,7 +117,7 @@ msgstr "%s: ioctl-fel p� %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   Startsektor  Storlek Enhet\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "anv�ndning:\n"
@@ -161,13 +161,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "anv�ndning: %s [ -n ] enhet\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s fr�n %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -192,7 +191,7 @@ msgstr "Dubbel"
 msgid "Single"
 msgstr "Enkel"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -207,97 +206,97 @@ msgstr ""
 " -v         var mer utf�rlig\n"
 " fil        fil att testa\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: fel %d vid uppackning! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: storleksfel i symboliska l�nken \"%s\"\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  packar upp block vid %ld till %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: felaktiga r�ttigheter p� \"%s\" (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  h�l vid %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Icke-blockbyte (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Icke-storleksbyte (%ld gentemot %ld)\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: ogiltigt cramfs--felaktig s�kv�gsl�ngd\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: kompilerad utan st�d f�r -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: varning--kan inte avg�ra filsystemsstorlek \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s �r ingen blockenhet eller fil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: ogiltigt cramfs--fill�ngden �r f�r kort\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: ogiltigt cramfs--felaktig magisk siffra\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: varning--fill�ngden �r f�r l�ng, utfylld avbild?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: ogiltigt cramfs--crc-fel\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: varning--gammal cramfs-avbild, ingen CRC\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: ogiltigt cramfs--felaktigt superblock\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr "%s: ogiltigt cramfs--katalogdataslut (%ld) != fildatab�rjan (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ogiltigt cramfs--ogiltigt fildataavst�nd\n"
@@ -774,7 +773,7 @@ msgstr "f�r m�nga inoder - max �r 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "inte tillr�ckligt med utrymme, beh�ver minst %lu block"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -843,20 +842,20 @@ msgstr "fel vid skrivning av \"..\"-post"
 msgid "error closing %s"
 msgstr "fel vid st�ngning av %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Anv�ndning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Slut p� minne!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
@@ -920,7 +919,6 @@ msgstr ""
 # � (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" �260.
 #
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -977,10 +975,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM-avbildsskrivning misslyckades (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1057,7 +1051,6 @@ msgstr "kan inte skriva inoder"
 msgid "write failed in write_block"
 msgstr "skrivning misslyckades i \"write_block\""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1093,7 +1086,7 @@ msgstr "s�kning misslyckades under test av block"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Konstiga v�rden i \"do_check\": troligtvis programfel\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "s�kning misslyckades i \"check_blocks\""
 
@@ -1135,107 +1128,107 @@ msgstr "kan inte ta status p� %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "kommer inte att f�rs�ka skapa filsystem p� \"%s\""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Anv�ndardefinierade sidstorleken %d �r felaktig\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Anv�nder anv�ndardefinierade sidstorleken %d ist�llet f�r systemv�rdena %d/%"
 "d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Antar sidstorleken %d (inte %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etikett"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Anv�ndning: %s [-c] [-v0|-v1] [-pSIDSTORLEK] /dev/namn [block]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "f�r m�nga felaktiga sidor"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Slut p� minne"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "en felaktig sida\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu felaktiga sidor\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fel: Ingenstans att skapa v�xlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fel: storleken %lu �r st�rre �n enhetsstorleken %lu\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fel: version %d �r ok�nd\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fel: v�xlingsutrymmet m�ste vara minst %ld kB\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varning: avkortar v�xlingsutrymmet till %ld kB\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: fel: Ingenstans att skapa v�xlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Kommer inte att f�rs�ka skapa v�xlingsenhet p� \"%s\""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "�desdigert: f�rsta sidan �r ol�sbar"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1250,122 +1243,84 @@ msgstr ""
 "v�xlingsutrymme p� den enheten kan du anv�nda flaggan -f f�r att tvinga\n"
 "fram det.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kan inte st�lla in v�xlingsutrymme: ol�sbart"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "St�ller in v�xlingsutrymme version %d, storlek = %llu kB\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "kan inte spola tillbaka v�xlingsenheten"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "kan inte skriva signatursida"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync misslyckades"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Ogiltigt tal: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfel: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Ingen s�dan parameter �r inst�lld: \"%s\"\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] enhet namn\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] enhet storlek sektorer huvuden sp�r utstr�ckning mellanrum "
-"hastighet spec1 formatavst�nd\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] enhet\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] enhet\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Oanv�ndbar"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Ledigt utrymme"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken har �ndrats.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Starta om systemet f�r att f�rs�kra dig om att partitionstabellen har\n"
 "uppdaterats korrekt.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1378,329 +1333,310 @@ msgstr ""
 "partitioner b�r du titta i manualen f�r cfdisk\n"
 "f�r ytterligare information.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "�DESDIGERT FEL"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Tryck valfri tangent f�r att avsluta cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Kan inte s�ka p� diskenhet"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Kan inte inte l�sa diskenhet"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Kan inte skriva diskenhet"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "F�r m�nga partitioner"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Partitionen b�rjar f�re sektor 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Partitionen slutar f�re sektor 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Partitonen b�rjar efter slutet p� disken"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Partitionen slutar efter slutet p� disken"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutar i den slutliga partiella cylindern"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "logiska partitioner �r inte i diskordning"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "logiska partitioner �verlappar varandra"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "f�rstorade logiska partitioner �verlappar varandra"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Internt fel vid skapande av logisk enhet utan ut�kad partition !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan inte skapa logisk enhet h�r -- det skulle skapa tv� ut�kade partitioner"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menyposten �r f�r l�ng. Menyn kan se konstig ut."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Meny utan riktning. Anv�nder standardv�rdet v�gr�t."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Ogiltig tangent"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Tryck en tangent f�r att forts�tta"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Prim�r"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Skapa en ny prim�r partition"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Skapa en ny logisk partition"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Skapa inte n�gon partition"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Internt fel !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Storlek (i MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "B�rjan"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "L�gg till partition i b�rjan av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Slutet"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "L�gg till partition i slutet av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ingen plats att skapa den ut�kade partitionen"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabell.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabell. Startar med tom tabell."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Felaktig signatur p� partitionstabell"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Ok�nd typ av partitionstabell"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vill du b�rja med en tom tabell [j/N]?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav fler cylindrar �n som ryms p� disken"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Kan inte �ppna diskenhet"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "�ppnade disken skrivskyddat - du har ingen r�ttighet att skriva"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Kan inte h�mta diskstorlek"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Felaktig prim�r partition"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Felaktig logisk partition"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varning!! Detta kan f�rst�ra data p� din disk!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "�r du s�ker p� att du vill skriva partitionstabellen till disk? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Skrev inte partitionstabellen till disk"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Ange \"ja\" eller \"nej\""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabell till disk..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabell till disk"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabellen, men oml�sning av tabellen misslyckades. Starta om "
 "f�r att uppdatera tabellen."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Inga prim�ra partitioner �r markerade som startbara. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Mer �n en prim�r partition �r markerad som startbar. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Ange filnamnet eller tryck RETUR f�r att visa p� sk�rmen: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan inte �ppna filen \"%s\""
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskenhet: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Ingen  "
 
 # Prim�r/Logisk antar jag
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Prim�r "
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Logisk "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Ok�nd"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabell f�r %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "               F�rsta      Sista\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1708,7 +1644,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Avst�nd   L�ngd    Filsystemstyp (ID)   "
 "Flagga\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1728,472 +1664,469 @@ msgstr ""
 # source you realize that "Start" belongs to "Sector" in another message
 # (the one from the line below in the source).
 #
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Start-----      -----Slut-----   Start-    Antal\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flggr  Hvd Sekt Cyl   ID  Hvd  Sekt Cyl     sektor    sektorer\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "R�tt"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Visa tabellen i r�tt dataformat"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Visa tabellen sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tabell"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Visa bara partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Visa inte tabellen"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Hj�lpsk�rm f�r cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Det h�r �r cfdisk, ett curses-baserat diskpartitioneringsprogram som"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "l�ter dig skapa, ta bort och �ndra partitioner p� din"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "h�rddisk."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright � 1994-1999 Kevin E. Martin och aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Kommando     Betydelse"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Sl� p�/av startbarhetsflaggan p� aktuell partition"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          �ndra parametrarna f�r cylindrar, huvuden, sektorer-per-sp�r"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VARNING: Denna flagga b�r endast anv�ndas av personer som"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             vet vad de g�r."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Visa denna hj�lpsk�rm"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximera diskanv�ndandet p� aktuell partition"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Obs: Detta kan komma att g�ra partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Skapa en ny partition fr�n ledigt utrymme"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Visa partitionstabellen p� sk�rmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Det finns flera olika format p� partitionen"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             som du kan v�lja mellan:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - R� data (exakt det som skulle skrivas till disken)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabell sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Tabell i r�tt format"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Byt filsystemstypen"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Byt enheter p� visningen av partitionsstorlek"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Byter mellan MB, sektorer och cylindrar"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Skriv partitionstabellen till disk (m�ste vara ett stort W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Eftersom detta kan f�rst�ra data p� disken m�ste du"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             antingen bekr�fta eller avvisa detta genom att ange \"ja\""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             eller \"nej\""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Uppil        Flytta mark�ren till f�reg�ende partition"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nerpil       Flytta mark�ren till n�sta partition"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL+L       Rita om sk�rmen"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Visa denna sk�rm"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Obs: Alla kommandon kan anges antingen med sm� eller stora bokst�ver"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "(utom f�r skrivningar med W)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "�ndra cylindergeometri"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Huvuden"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "�ndra huvudgeometri"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "�ndra sektorgeometri"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Klar"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "F�rdig med geometri�ndring"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Ange antalet cylindrar: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Ogiltigt antal cylindrar"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Ange antalet huvuden: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Ogiltigt antal huvuden"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Ange antalet sektorer per sp�r: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Ogiltigt antal sektorer"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Ange typen av filsystem: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Kan inte �ndra filsystemstypen till ett tomt v�rde"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Kan inte �ndra filsystemstypen till ut�kad"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ok�nd(%02X)"
 
 # Vad �r detta?
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ok�nd (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskenhet: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Storlek: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Storlek: %lld byte, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Huvuden: %d   Sektorer per sp�r: %d   Cylindrar: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Namn"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flaggor"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Part.-typ"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "FS-typ"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etikett]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Cylindrar"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Storlek (MB)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Storlek (GB)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Startbar"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Sl� p�/av startbarhetsflaggan p� aktuell partition"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Ta bort"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "�ndra diskgeometri (endast experter)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Hj�lp"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Visa hj�lpsk�rm"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Maximera"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximera diskanv�ndningen f�r aktuell partition (endast experter)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Skapa ny partition fr�n ledigt utrymme"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Visa"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Visa partitionstabellen p� sk�rmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Avsluta"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "�ndra filsystemstypen (DOS, Linux, OS/2 och s� vidare)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Enheter"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Byt enheter p� visningen av partitionsstorleken (MB, sektorer, cylindrar)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen till disk (detta kan f�rst�ra data)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Kan inte g�ra denna partition startbar"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Kan inte ta bort en tom partition"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Kan inte maximera denna partition"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Denna partition �r oanv�ndbar"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Denna partition anv�nds redan"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan inte �ndra typen p� en tom partition"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Inge fler partitioner"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Ogiltigt kommando"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright � 1994-2002 Kevin E. Martin och aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2265,9 +2198,9 @@ msgstr ""
 "\n"
 "BSD-etikett f�r enhet: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Kommando�tg�rd"
 
@@ -2287,10 +2220,9 @@ msgstr "   i   installera f�rstartare (bootstrap)"
 msgid "   l   list known filesystem types"
 msgstr "   l   visa k�nda filsystemstyper"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   visa denna meny"
 
@@ -2302,14 +2234,14 @@ msgstr "   n   l�gg till en ny BSD-partition"
 msgid "   p   print BSD partition table"
 msgstr "   p   skriv ut BSD-partitionstabell"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   avsluta utan att spara �ndringar"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   �terg� till huvudmenyn"
 
@@ -2352,13 +2284,13 @@ msgstr "Det finns ingen *BSD-partition p� %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-disketikettskommando (m f�r hj�lp): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "F�rsta %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
@@ -2403,8 +2335,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " felsekt"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2505,8 +2435,8 @@ msgstr "sektorer/sp�r"
 msgid "tracks/cylinder"
 msgstr "sp�r/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "cylindrar"
 
@@ -2566,7 +2496,7 @@ msgstr "F�rstartare (bootstrap) installerad p� %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maximala antalet partitioner har skapats\n"
@@ -2590,7 +2520,7 @@ msgstr ""
 "\n"
 "Synkroniserar h�rddiskar.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2610,7 +2540,7 @@ msgstr ""
 "-u: visa b�rjan och slut i sektorer (ist�llet f�r cylindrar)\n"
 "-b 2048: (f�r vissa MO-enheter) anv�nd 2048-bytessektorer\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2627,198 +2557,184 @@ msgstr ""
 "enheter)\n"
 "     ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan inte �ppna %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan inte l�sa %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan inte s�ka p� %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan inte skriva %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl:en misslyckades p� %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan inte allokera mer minne\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "�desdigert fel\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   sl� p�/av en flagga f�r skrivskydd"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   redigera bsd-disketikett"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   sl� p�/av monterbarhetsflaggan"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   ta bort en partition"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   lista k�nda partitionstyper"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   l�gg till en ny partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   skapa en ny tom DOS-partitionstabell"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   visa partitionstabellen"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   skapa en ny tom Sun-disketikett"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   �ndra en partitions system-id"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   �ndra visnings-/postenheter"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   verifiera partitionstabellen"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   skriv tabellen till disk och avsluta"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra funktionalitet (endast experter)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   v�lj startbar partition"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigera startfilspost"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   v�lj sgi-v�xlingspartition"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   sl� p�/av en startbarhetsflagga"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   sl� p�/av dos-kompatibilitetsflaggan"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   �ndra antalet alternativa cylindrar"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   �ndra antalet cylindrar"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   skriv ut den r�a datan i partitionstabellen"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   �ndra antalet extra sektorer per cylinder"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   �ndra antalet huvuden"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   �ndra mellanrumsfaktor"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   �ndra rotationshastighet (varv per minut)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   �ndra antalet sektorer/sp�r"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   �ndra antalet fysiska cylindrar"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   flytta b�rjan p� data i en partition"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   lista ut�kade partitioner"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   skapa en IRIX-partitionstabell (SGI)"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   fixa partitionsordningen"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Du m�ste st�lla in"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2827,11 +2743,11 @@ msgstr ""
 "%s%s.\n"
 "Du kan g�ra detta fr�n menyn extra funktionalitet.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " och "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2851,12 +2767,12 @@ msgstr ""
 "2) start- och partitioneringsprogramvara fr�n andra operativsystem\n"
 "   (exemeplvis DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Felaktigt avst�nd i prim�r ut�kad partition\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2865,17 +2781,17 @@ msgstr ""
 "Varning: utel�mnar partitioner efter nr %d.\n"
 "De kommer att tas bort om du sparar denna partitionstabell.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varning: extra l�nkpekare i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varning: ignorerar extra data i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2888,17 +2804,17 @@ msgstr ""
 "inte det tidigare inneh�llet att kunna �terst�llas.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Observera: sektorstorleken �r %d (inte %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du kommer inte att kunna skriva partitionstabellen.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2907,7 +2823,7 @@ msgstr ""
 "Denna disk har b�de magiska DOS- och BSD-siffror.\n"
 "Ge kommandot \"b\" f�r att g� till BSD-l�ge.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2916,17 +2832,17 @@ msgstr ""
 "Enheten inneh�ller varken en giltig DOS-partitionstabell eller en Sun-, SGI- "
 "eller OSF-disketikett\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Internt fel\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerar extra ut�kad partition %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2935,7 +2851,7 @@ msgstr ""
 "Varning: ogiltiga flaggan 0x%04x i partitionstabell %d kommer ett korrigeras "
 "vid skrivning med w\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2944,83 +2860,83 @@ msgstr ""
 "\n"
 "mottog EOF tre g�nger - avslutar...\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Hexadecimal kod (tryck L f�r att se koder): "
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standardv�rde %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Anv�nder standardv�rdet %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "V�rdet �r utanf�r intervallet.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varning: partition %d har tom typ\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valde partition %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partition �r definierad �n!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alla prim�ra partitioner har redan definierats!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "�ndrar visnings-/inmatningsenheter till %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VARNING: Partition %d �r en ut�kad partition\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatibilitetsflagga �r satt\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatibilitetsflagga �r inte satt\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d finns inte �n!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3034,7 +2950,7 @@ msgstr ""
 "oklokt. Du kan ta bort en partition\n"
 "genom att anv�nda kommandot \"d\".\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3043,7 +2959,7 @@ msgstr ""
 "Du kan inte �ndra en partition till en ut�kad partition eller tv�rtom\n"
 "Ta bort den f�rst.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3055,7 +2971,7 @@ msgstr ""
 "gillar det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3067,52 +2983,52 @@ msgstr ""
 "f�rv�ntar sig det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "�ndrade systemtypen f�r partition %d till %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d har olika fysiska/logiska b�rjan (icke-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har olika fysiska/logiska slut:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i b�rjar inte p� cylindergr�ns:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "borde vara (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutar inte p� cylindergr�ns.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "borde vara (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3121,7 +3037,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3130,12 +3046,12 @@ msgstr ""
 "\n"
 "Disk %s: %ld,%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d huvuden, %d sektorer/sp�r, %d cylindrar"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totalt %llu sektorer"
@@ -3143,7 +3059,7 @@ msgstr ", totalt %llu sektorer"
 # � (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" �260.
 #
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3152,7 +3068,7 @@ msgstr ""
 "Enheter = %s av %d � %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3161,7 +3077,7 @@ msgstr ""
 "Ingenting att g�ra. Ordningen �r redan korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3172,16 +3088,16 @@ msgstr ""
 "Du valde nog fel enhet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Start     B�rjan        Slut     Block    Id  System\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Enhet"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3190,7 +3106,7 @@ msgstr ""
 "\n"
 "Posterna i partitionstabellen �r inte i diskordning\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3201,85 +3117,85 @@ msgstr ""
 "Disk %s: %d huvuden, %d sektorer, %d cylindrar\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sek  Cyl  Hd Sek  Cyl     B�rjan     Strl ID\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varning: partition %d inneh�ller sektor 0\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: huvud %d �r st�rre �n maximala %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: sektor %d �r st�rre �n maximala %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitioner %d: cylinder %d �r st�rre �n maximala %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: tidigare sektorer %d st�mmer inte �verens med totala %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varning: felaktig datab�rjan p� partition %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varning: partition %d �verlappar med partition %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varning: partition %d �r tom\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logisk partition %d �r inte helt inuti partition %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totala antalet allokerade sektorer %d st�rre �n maximala %lld\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partition %d �r redan definierad. Ta bort den innan du l�gger till den "
 "igen.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d �r redan allokerad\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Inga lediga sektorer �r tillg�ngliga\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3293,23 +3209,23 @@ msgstr ""
 "\tVARNING: Detta kommer att f�rst�ra det nuvarande inneh�llet\n"
 "\tp� disken.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Du m�ste ta bort en partition och l�gga till en ut�kad partition f�rst\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alla logiska partitioner anv�nds\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "L�gger till en prim�r partition\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3320,20 +3236,20 @@ msgstr ""
 "   %s\n"
 "   p   prim�r partition (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   logisk (5 eller h�gre)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ut�kad"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ogiltigt partitionsnummer f�r typen \"%c\"\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3342,12 +3258,12 @@ msgstr ""
 "Partitionstabellen har �ndrats!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Anropar ioctl() f�r att l�sa om partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3360,7 +3276,7 @@ msgstr ""
 "K�rnan anv�nder fortfarande den gamla tabellen.\n"
 "Den nya tabellen kommer att anv�ndas vid n�sta omstart.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3372,7 +3288,7 @@ msgstr ""
 "VARNING: Om du har skapat eller �ndrat n�gon DOS 6.x-partition\n"
 "b�r du l�sa fdisk-manualsidan f�r ytterligare information.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3381,67 +3297,67 @@ msgstr ""
 "\n"
 "Fel vid st�ngning av fil\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar h�rddiskar.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataomr�de\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Ny b�rjan utav data"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m f�r hj�lp): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varning: st�ller in sektoravst�nd f�r DOS-kompatibilitet\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s inneh�ller inte en giltig partitionstabell\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte �ppna %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte �ppna %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ok�nt kommando\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denna k�rna hittar sj�lv sektorstorleken - flaggan -b ignoreras\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3450,17 +3366,16 @@ msgstr ""
 "Varning: flaggan -b (st�ll in sektorstorlek) m�ste anv�ndas med en angiven "
 "enhet\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Uppt�ckte en OSF/1-disketikett p� %s, g�r in i disketikettsl�ge.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Kommando (m f�r hj�lp): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3469,16 +3384,16 @@ msgstr ""
 "\n"
 "Aktuell startfil �r: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet p� den nya startfilen: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startfilen of�r�ndrad\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3546,15 +3461,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux v�xling"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux egen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3639,7 +3554,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u storlek%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3697,7 +3611,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Det finns fler �n en diskpost.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Inga partitioner �r angivna\n"
@@ -3782,7 +3696,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valt ett ovanligt namn p� startfilen.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3803,11 +3716,10 @@ msgstr ""
 "f�r lov att bryta mot detta. Skriv in JA om du �r s�ker p� att\n"
 "du vill ge denna partition en annan tagg.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "JA\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3883,44 +3795,43 @@ msgstr "F�rs�ker att beh�lla parametrarna f�r partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tB�RJAN=%d\tL�NGD=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Tom"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS rot"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS v�xling"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Hela disken"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekterad"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3934,12 +3845,12 @@ msgstr ""
 "och partitioner, eller tvinga en ny etikett\n"
 "(kommandot s i huvudmenyn)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatiska konfigurationen hittade en %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3952,7 +3863,7 @@ msgstr ""
 "kommer naturligtvis det tidigare inneh�llet inte att vara\n"
 "�terst�llningsbart.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3962,72 +3873,72 @@ msgstr ""
 "   ?   konfigurera automatiskt\n"
 "   0   anpassad (med h�rdvarudetekterade standardalternativ)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "V�lj typ (? f�r automatisk konfiguration, 0 f�r anpassad): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Automatisk konfiguration misslyckades.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektorer/sp�r"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Alternativa cylindrar"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fysiska cylindrar"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Du kan �ndra alla diskaparametrar fr�n x-menyn"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5-tumsdiskett"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux anpassad"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d slutar inte p� j�mn cylindergr�ns\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d �verlappar med andra p� sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Oanv�nt mellanrum - sektorerna 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Oanv�nt mellanrum - sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4036,7 +3947,7 @@ msgstr ""
 "Andra partitioner t�cker redan hela h�rddisken.\n"
 "Ta bort/krymp dem innan du f�rs�ker igen.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4046,7 +3957,7 @@ msgstr ""
 "Du har inte t�ckt hela h�rddisken med den tredje partitionen, men ditt\n"
 "v�rde %d %s t�cker en annan partition. Din inmatning har �ndrats till %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4055,7 +3966,7 @@ msgstr ""
 "Om du vill beh�lla kompatibilitet med SunOS/Solaris b�r du l�mna denna\n"
 "partition som Hela disken (5), med b�rjan p� 0, och med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4073,7 +3984,7 @@ msgstr ""
 # � (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" �260.
 #
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4096,7 +4007,7 @@ msgstr ""
 # � (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" �260.
 #
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4109,16 +4020,16 @@ msgstr ""
 "Enheter = %s av %d � 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  B�rjan      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -4142,32 +4053,26 @@ msgstr "FAT16 < 32 MB"
 msgid "Extended"
 msgstr "Ut�kad"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX startbar"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4176,7 +4081,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4269,12 +4173,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "Ontrack DM6 Aux3"
@@ -4295,8 +4197,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4306,7 +4206,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD / SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4327,12 +4226,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Gammal Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / gammal Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux v�xling / Solaris"
@@ -4361,12 +4258,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad-vilol�ge"
@@ -4375,7 +4270,6 @@ msgstr "IBM Thinkpad-vilol�ge"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4440,30 +4334,22 @@ msgstr "Icke-filsystemsdata"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell-verktyg"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS-�tkomst"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4472,116 +4358,109 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC start"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS sekund�r"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "s�kfel p� %s - kan inte spola till %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "s�kfel: ville ha 0x%08x%08x, fick 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "slut p� minne - ger upp\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "l�sfel p� %s - kan inte l�sa sektor %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEL: sektor %lu har ingen msdos-signatur\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivfel p� %s - kan inte skriva sektor %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan inte �ppna partitionssektorsparfil (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivfel p� %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan inte ta status p� partitions�terst�llningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitions�terst�llningsfilen har fel storlek - �terst�ller inte\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "slut p� minne?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan inte �ppna partitions�terst�llningsfilen (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "fel vid l�sning av %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan inte �ppna enhet %s f�r skrivning\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fel vid skrivning av sektor %lu p� %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan inte f� tag i geometri\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan inte f� tag i storlek\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4592,22 +4471,22 @@ msgstr ""
 "hela disken. Att anv�nda fdisk p� det �r troligtvis meningsl�st.\n"
 "[Anv�nd flaggan --force om du verkligen vill detta]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varning: HDIO_GETGEO s�ger att det finns %lu huvuden\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varning: HDIO_GETGEO s�ger att det finns %lu sektorer\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varning: BLKGETSIZE/HDIO_GETGEO s�ger att det finns %lu cylindrar\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4617,7 +4496,7 @@ msgstr ""
 "Detta kommer att ge problem med all programvara som anv�nder C/H/S-"
 "adressering.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4626,7 +4505,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindrar, %lu huvuden, %lu sektorer/sp�r\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4634,7 +4513,7 @@ msgstr ""
 "%s p� partition %s har om�jligt v�rde p� huvud: %lu (m�ste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4643,7 +4522,7 @@ msgstr ""
 "%s p� partition %s har om�jligt v�rde p� sektor: %lu (m�ste vara mellan 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4652,7 +4531,7 @@ msgstr ""
 "%s p� partition %s har om�jligt v�rde p� cylinder: %lu (m�ste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4661,12 +4540,12 @@ msgstr ""
 "Id  Namn\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "L�ser om partitionstabellen...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4674,31 +4553,31 @@ msgstr ""
 "Kommandot f�r att l�sa om partitionstabellen misslyckades\n"
 "Starta om ditt system nu, innan du anv�nder mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fel vid st�ngning av %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: det finns ingen s�dan partition\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "ok�nt format - anv�nder sektorer\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabell f�r %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "oimplementerat format - anv�nder %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4707,12 +4586,12 @@ msgstr ""
 "Enheter = cylindrar med %lu byte, block med 1024 byte, r�knat fr�n %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhet Start B�rjan   Slut     Cyl.     Block   Id  System\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4721,12 +4600,12 @@ msgstr ""
 "Enheter = sektorer med 512 byte, r�knat fr�n %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhet Start   B�rjan      Slut   Sektorer  Id  System\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4735,12 +4614,12 @@ msgstr ""
 "Enheter = block med 1024 byte, r�knat fr�n %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhet Start  B�rjan      Slut      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4749,31 +4628,31 @@ msgstr ""
 "Enheter = mebibyte med 1048576 byte, block med 1024 byte, r�knat fr�n %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhet Start B�rjan Slut    MiB      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tb�rjan: (c,h,s) (%ld,%ld,%ld) f�rv�ntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) (%ld,%ld,%ld) f�rv�ntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutar p� cylinder %ld, utanf�r slutet p� h�rddisken\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Inga partitioner hittades\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4784,51 +4663,51 @@ msgstr ""
 "  f�r C/H/S=*/%ld/%ld (ist�llet f�r %ld/%ld/%ld).\n"
 "I denna visning kommer jag att antaga den geometrin.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "ingen partitionstabell finns tillg�nglig.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "konstigt, endast %d partitioner �r angivna.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varning: partition %s har storlek 0 men �r inte markerad tom\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varning: partition %s har storlek 0 och �r startbar\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varning: partition %s har storlek 0 och en b�rjan som inte �r 0\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varning: partition %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "�r inte innesluten i partition %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varning: partitionerna %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "och %s �verlappar varandra\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4837,17 +4716,17 @@ msgstr ""
 "Varning: partition %s inneh�ller en del av partitionstabellen (sektor %lu),\n"
 "och kommer att f�rst�ra den d� den fylls\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varning: partition %s b�rjar p� sektor 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varning: partition %s forts�tter utanf�r h�rddisken\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4855,17 +4734,17 @@ msgstr ""
 "Endast en av de prim�ra partitionerna kan vara ut�kad\n"
 " (�ven om detta inte �r ett problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varning: partition %s b�rjar inte p� en j�mn cylindergr�ns\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varning: partition %s slutar inte p� en j�mn cylindergr�ns\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4874,7 +4753,7 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4882,7 +4761,7 @@ msgstr ""
 "Varning: normalt kan man endast starta fr�n prim�ra partitioner\n"
 "LILO ignorerar startbarhetsflaggan.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4891,11 +4770,11 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "b�rjan"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4903,23 +4782,23 @@ msgstr ""
 "partition %s: b�rjan: (c,h,s) (%ld,%ld,%ld) f�rv�ntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: slut: (c,h,s) (%ld,%ld,%ld) f�rv�ntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutar p� cylinder %ld, utanf�r slutet p� h�rddisken\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4928,7 +4807,7 @@ msgstr ""
 "Varning: �ndrade b�rjan p� extd-partitionen fr�n %ld till %ld\n"
 "(Endast f�r listnings�ndam�l. �ndra inte dess inneh�ll).\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4936,133 +4815,132 @@ msgstr ""
 "Varning: ut�kad partition b�rjar inte p� j�mn cylindergr�ns.\n"
 "DOS och Linux kommer att tolka inneh�llet annorlunda.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "f�r m�nga partitioner - ignorerar de efter nummer (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "tr�d med partitioner?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "uppt�ckte Disk Manager - kan inte hantera det\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-signatur hittades - ger upp\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "konstigt, en ut�kad partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "konstigt, en BSD-partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ok�nd typ av partitionstabell\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Flaggan -n angavs: Inget �ndrades\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen p� %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "l�ng eller ofullst�ndig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" f�rv�ntas efter %s-f�lt\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "indatafel: ov�ntat tecken %c efter %s-f�lt\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ok�nd indata: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "talet �r f�r stort\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "eftersl�pande skr�p efter tal\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats f�r partitionshandtag\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande ut�kad partition\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "f�r m�nga indatafield\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Inte plats f�r mer\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varning: angiven storlek (%lu) �verskrider st�rsta till�tna storleken (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig b�rjan p� partition (f�rsta %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ok�nd startbarhetsflagga - v�lj - eller *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullst�ndig?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Ut�kad partition finns inte d�r den f�rv�ntades\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "f�r m�nga partitioner\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5072,46 +4950,42 @@ msgstr ""
 "<b�rjan> <storlek> <typ [E,S,L,X,hex]> <startbar [-,*]> <c,h,s> <c,h,s>\n"
 "Vanlligtvis beh�ver du bara ange <b�rjan> och <storlek> (och kanske <typ>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "version"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Anv�ndning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhet: n�gonting liknande /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "anv�ndbara flaggor:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: visa storlek p� en partition"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:     visa eller �ndra partitionsid"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:   visa partitioner p� varje enhet"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:   samma, men i format l�mpligt f�r senare inmatning"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [eller --increment]: numrera cylindrar osv fr�n 1 ist�llet f�r fr�n 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5119,62 +4993,62 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  acceptera/rapportera i enheter om sektorer/block/"
 "cylindrar/MB"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:visa de k�nda partitionstyperna"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:    f�r DOS-kompatibilitet: sl�sa lite utrymme"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [eller --re-read]: g�r s� att k�rnan l�ser om partitionstabellen"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N<nummer>:          �ndra endast partitionen med numret <nummer>"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 skriv inte till h�rddisken"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fil :             spara sektorerna som kommer att skrivas �ver till "
 "fil"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :             �terst�ll dessa sektorer igen"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]: visa versionsinformation"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "farliga flaggor:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: visa k�rnans bild av geometrin"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [eller --show-geometry]: visa k�rnans bild av geometrin"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5182,117 +5056,117 @@ msgstr ""
 "    -x [eller --show-extended]: visa �ven ut�kade partitioner i utdata\n"
 "                                eller f�rv�nta handtag f�r dem som indata"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [eller --Linux]:   klaga inte p� saker som �r irrelevanta f�r Linux"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:   undertryck varningsmeddelanden"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan �sidos�tta den detekterade geometrin genom att anv�nda:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C<tal> [eller --cylinders <tal>]:st�ll in antalet cylindrar att anv�nda"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H<tal> [eller --heads <tal>]:st�ll in antalet huvuden att anv�nda"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S<tal> [eller --sectors <tal>]:st�ll in antalet sektorer att anv�nda"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan st�nga av all konsekvenskontroll med:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:   g�r vad jag s�ger �ven om det �r dumt"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhet\t\t visa aktiva partitioner p� enhet\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhet n1 n2 ... aktivera partitioner n1 ..., deaktivera resten\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhet\t aktivera partition n, deaktivera de andra\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totalt: %llu block\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "anv�ndning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "anv�ndning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "anv�ndning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan endast ange en enhet (utom med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte �ppna %s f�r l�sning och skrivning\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte �ppna %s f�r l�sning\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrar, %ld huvuden, %ld sektorer/sp�r\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan inte h�mta storleken p� %s\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "felaktig aktiv byte: 0x%x ist�llet f�r 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5300,7 +5174,7 @@ msgstr ""
 "F�rdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5310,35 +5184,35 @@ msgstr ""
 "DOS huvudstartpost (MBR) kan endast starta en h�rddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x och �r inte dold\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Denna h�rddisk anv�nds f�r tillf�llet.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "�desdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s �r ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Kontrollerar att ingen anv�nder h�rddisken just nu...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5351,30 +5225,30 @@ msgstr ""
 "p� denna disk �r utv�xlade. Anv�nd flaggan --no-reread f�r att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Anv�nd flaggan --force f�r att undertrycka alla kontroller.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d finns inte, kan inte �ndra den\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5382,21 +5256,21 @@ msgstr ""
 "Jag gillar inte dessa partitioner - ingenting �ndrades.\n"
 "(Om du verkligen vill g�ra detta b�r du anv�nda flaggan --force).\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jag gillar inte detta - du b�r nog svara nej\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�r du n�jd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5405,16 +5279,16 @@ msgstr ""
 "\n"
 "sfdisk: f�r tidigt slut p� indata\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting �ndrades\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5423,7 +5297,7 @@ msgstr ""
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5523,130 +5397,130 @@ msgstr "getopt (ut�kad) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "internt fel, kontakta f�rfattaren."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "startade fr�n MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD-klocka\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "klockporten justerades till 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "h�ftig LEKSAK!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomisk %s misslyckades f�r 1000 iterationer!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Kan inte �ppna /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Jag misslyckades med att f� till�telse eftersom jag inte f�rs�kte.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s kan inte f� I/O-porttillg�ng: iopl(3)-anropet misslyckades.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Du beh�ver troligtvis root-privilegier.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Antar att h�rdvaruklockan h�ller %s-tid.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "lokal"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varning: ok�nd tredje rad i adjtime-fil\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(F�rv�ntade: \"UTC\" eller \"LOCAL\" eller ingenting.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Senaste dragningsjustering gjordes %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Senaste kalibrering gjordes %ld sekunder efter 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "H�rdvaruklockan h�ller %s-tid\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "ok�nd"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "V�ntar p� klocktick...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...fick klocktick\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ogiltiga v�rden i h�rdvaruklockan: %4d-%.2d-%.2d %.2d.%.2d.%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "Hv-klocktid: %4d-%.2d-%.2d %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Tid som l�sts fr�n h�rdvaruklockan: %4d-%.2d-%.2d %02d.%02d.%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "St�ller h�rdvaruklockan till %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Klockan �r inte �ndrad - testar bara.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5655,7 +5529,7 @@ msgstr ""
 "Tid som har g�tt sedan referenstiden �r %.6f sekunder.\n"
 "F�rdr�jer ytterligare f�r att n� n�sta hela sekund.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5665,22 +5539,22 @@ msgstr ""
 "50:e dagen i m�naden) eller utanf�r det intervall som vi kan hantera (t.ex. "
 "�r 2095).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekunder\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date-argumentet �r f�r l�ngt\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5689,22 +5563,22 @@ msgstr ""
 "V�rdet i --date-flaggan �r ogiltigt.\n"
 "I synnerhet som det inneh�ller citationstecken.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Anropar date-kommandot: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Kan inte k�ra \"date\"-programmet i skalet /bin/sh. popen() misslyckades"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "svar fr�n date-kommandot = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5719,7 +5593,7 @@ msgstr ""
 "Svaret var:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5736,12 +5610,12 @@ msgstr ""
 "Svaret var:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "datumstr�ngen %s �r lika med %ld sekunder sedan 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5750,36 +5624,36 @@ msgstr ""
 "H�rdvaruklockan inneh�ller inte en giltig tid, s� vi kan inte st�lla "
 "systemtiden med den.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Anropar settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "St�ller inte systemklockan eftersom vi k�r i testl�ge.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "M�ste vara superanv�ndaren f�r att kunna st�lla systemklockan.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() misslyckades"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5788,7 +5662,7 @@ msgstr ""
 "Justerar inte dragningsfaktorn eftersom h�rdvaruklockan tidigare inneh�ll "
 "skr�p.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5798,7 +5672,7 @@ msgstr ""
 "�r noll, s� historiken �r trasig och en omstart av kalibreringen\n"
 "�r n�dv�ndig.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5807,7 +5681,7 @@ msgstr ""
 "Justerar inte dragningsfaktorn eftersom det har g�tt mindre �n en dag sedan "
 "den senaste kalibreringen.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5818,24 +5692,24 @@ msgstr ""
 "dragningsfaktor p� %f sekunder/dag.\n"
 "Justerar dragningsfaktorn med %f sekunder/dag\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Tid sedan senaste justeringen �r %d sekunder\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Beh�ver infoga %d sekunder och referera tillbaka i tiden %.6f sekunder "
 "sedan\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Uppdaterar inte adjtime-filen eftersom vi �r i testl�ge.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5844,40 +5718,40 @@ msgstr ""
 "Skulle skrivit f�ljande till %s:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Dragningsjusteringsparametrarna uppdaterades inte.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "H�rdvaruklockan inneh�ller inte giltig tid, s� vi kan inte justera den.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Den justering som beh�vs �r mindre �n en sekund, s� st�ller inte klockan.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Anv�nder %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Inget anv�ndbart klockgr�nssnitt hittades.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Kunde inte st�lla systemklockan.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5889,17 +5763,17 @@ msgstr ""
 "Denna kopia av hwclock byggdes f�r en annan maskin �n Alpha\n"
 "(och k�rs d�rf�r troligen inte p� en Alpha just nu). Ingen �tg�rd utf�rdes.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Kunde inte f� tag i epokv�rdet fr�n k�rnan.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "K�rnan antar att epokv�rdet �r %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5908,17 +5782,22 @@ msgstr ""
 "F�r att st�lla epokv�rdet m�ste du anv�nda flaggan \"epoch\" f�r att ange "
 "vilket v�rde det ska st�llas till.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "St�ller inte epoken till %d - testar bara.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kan inte st�lla in epokv�rdet i k�rnan.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s fr�n %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5976,7 +5855,7 @@ msgstr ""
 "  --noadjfile   f�rs�k inte komma �t /etc/adjtime. Kr�ver att antingen\n"
 "                --utc eller --localtime anv�nds\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5986,12 +5865,12 @@ msgstr ""
 "                tala om f�r hwclock vilken typ av alpha du har (se hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s tar inga argument som inte �r flaggor. Du angav %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6000,7 +5879,7 @@ msgstr ""
 "Du har angivit flera funktioner\n"
 "Du kan bara utf�ra en funktion �t g�ngen.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6009,7 +5888,7 @@ msgstr ""
 "%s: Flaggorna --utc och --localtime �r �msesidigt uteslutande. Du angav "
 "b�da.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6018,27 +5897,27 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile �r �msesidigt uteslutande. Du angav "
 "b�da.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Med --noadjfile m�ste du ange antingen --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ingen anv�ndbar tid att st�lla. Kan inte st�lla klockan.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Tyv�rr, endast superanv�ndaren kan �ndra h�rdvaruklockan.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Tyv�rr, endast superanv�ndaren kan �ndra systemklockan.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6046,12 +5925,12 @@ msgid ""
 msgstr ""
 "Tyv�rr, endast superanv�ndaren kan �ndra h�rdvaruklockans epok i k�rnan.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan inte komma �t h�rdvaruklockan via n�gon k�nd metod.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6087,7 +5966,6 @@ msgstr "ioctl() misslyckades med att l�sa tid fr�n %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "KDSHWCLK-ioctl misslyckades"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "Kan inte �ppna /dev/tty1 eller /dev/vc/1"
@@ -6181,9 +6059,6 @@ msgstr "ioctl(RTC_EPOCH_READ) p� %s misslyckades"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har l�st epoken %ld fr�n %s med RTC_EPOCH_READ-ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6209,7 +6084,6 @@ msgstr "ioctl(RTC_EPOCH_SET) p� %s misslyckades"
 msgid "calling open_tty\n"
 msgstr "anropar open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "anropar termio_init\n"
@@ -6218,7 +6092,6 @@ msgstr "anropar termio_init\n"
 msgid "writing init string\n"
 msgstr "skriver initieringsstr�ng\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "f�re autobaud\n"
@@ -6232,7 +6105,6 @@ msgstr "v�ntar p� cr-lf\n"
 msgid "read %c\n"
 msgstr "l�ste %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "l�ser anv�ndarnamn\n"
@@ -6286,7 +6158,6 @@ msgstr "/dev: chdir() misslyckades: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ingen teckenenhet"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6301,12 +6172,10 @@ msgstr "/dev/%s: kan inte �ppna som standard in: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: inte �ppen f�r l�sning/skrivning"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "duplicerar\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6350,30 +6219,25 @@ msgstr ""
 "eller\t[-hiLmw] [-l inloggningsprogram] [-t time-out] [-I initieringsstr�ng] "
 "[-H inloggningsv�rd] linje baudhastighet,... [terminaltyp]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: lite minne, inloggning kan misslyckas\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "kan inte minnesallokera f�r ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "kan inte minnesallokera f�r grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inloggning p� %s fr�n %s nekas som standard.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggning p� %s fr�n %s nekas.\n"
@@ -6418,8 +6282,8 @@ msgstr "�ndrar fingerinformation f�r %s.\n"
 msgid "Password error."
 msgstr "L�senordsfel."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "L�senord: "
@@ -6597,34 +6461,6 @@ msgstr "Anv�nd %s -l f�r att se listan.\n"
 msgid "No known shells.\n"
 msgstr "Inga k�nda skal.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "kunde inte �ppna /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "kunde inte l�sa slumpdata fr�n /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "kan inte �ppna %s f�r l�sning"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "kan inte ta status p� %s"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s har inte r�tt filr�ttigheter"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "kan inte l�sa data fr�n %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6635,11 +6471,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "anv�ndning: last [-#] [-f fil] [-t tty] [-h v�rdnamn] [anv�ndare ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  fortfarande inloggad"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6648,15 +6484,15 @@ msgstr ""
 "\n"
 "wtmp b�rjar %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: minnesallokeringsfel.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6665,51 +6501,45 @@ msgstr ""
 "\n"
 "avbruten %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "�DESDIGERT: kan inte �ter�ppna tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "�DESDIGERT: felaktig tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h endast f�r superanv�ndaren.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "anv�ndning: login [-fp] [anv�ndarnamn]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fel, avbryter: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunde inte initiera PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "anv�ndarnamn: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNING %d FR�N %s F�R %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6718,17 +6548,17 @@ msgstr ""
 "Felaktig inloggning\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "F�R M�NGA INLOGGNINGSF�RS�K (%d) FR�N %s F�R %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNINGSSESSION FR�N %s F�R %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6737,7 +6567,7 @@ msgstr ""
 "\n"
 "Felaktig inloggning\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6746,136 +6576,121 @@ msgstr ""
 "\n"
 "Problem med uppr�ttandet av sessionen, avbryter.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Anv�ndarnamnet �r NULL i %s:%d. Avbryter."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ogiltigt anv�ndarnamn \"%s\" i %s:%d. Avbryter."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Slut p� minne\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Ogiltigt anv�ndarnamn"
 
 # %s blir h�r "root" i de flesta fall vad jag f�rst�r
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s-inloggning nekas p� denna terminal.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS FR�N %s P� TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS P� TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Felaktig inloggning\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"F�r m�nga anv�ndare �r redan inloggade.\n"
-"F�rs�k igen senare.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Du har f�r m�nga processer k�rande.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "UPPRINGNING P� %s AV %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-INLOGGNING P� %s FR�N %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-INLOGGNING P� %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "INLOGGNING P� %s AV %s FR�N %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "INLOGGNING P� %s AV %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: grenande misslyckades: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY misslyckades: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Katalogen %s finns inte!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Loggar in med hemkatalog = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: inget minne f�r skalskript.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunde inte k�ra skalskript: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: inget skal: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6884,65 +6699,65 @@ msgstr ""
 "\n"
 "%s anv�ndarnamn: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "anv�ndarnamnet �r alldeles f�r l�ngt.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "NAMNET �r f�r l�ngt"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "anv�ndarnamn f�r inte b�rja med \"-\".\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "f�r m�nga tomma nyrader.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "F�R M�NGA nyrader"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "fr�n %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "p� %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FR�N %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING P� %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FR�N %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR P� %s, %s"
@@ -6962,167 +6777,30 @@ msgstr "�r av (n)\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "anv�ndning: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Vem �r du?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Ingen s�dan grupp."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: �tkomst nekas."
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Inget skal"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "L�senordet m�ste ha minst 6 tecken, f�rs�k igen.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"L�senordet m�ste inneh�lla tecken som tillh�r tv� av f�ljande klasser:\n"
-"sm� och stora bokst�ver, siffror och icke-alfanumeriska tecken. Se\n"
-"passwd(1) f�r mer information.\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Du kan inte �teranv�nda det gamla l�senordet.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Anv�nd inte n�gonting som liknar ditt anv�ndarnamn som l�senord!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Anv�nd inte n�gonting som liknar ditt verkliga namn som l�senord!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Anv�ndning: passwd [anv�ndarnamn [l�senord]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Endast root kan anv�nda formen med en eller tv� argument.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Anv�ndning: passwd [-foqsvV] [anv�ndare [l�senord]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "Kan inte k�ra %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kan inte hitta anv�ndarnamn"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Endast root kan byta l�senordet �t andra.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "F�r m�nga argument.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Kan inte hitta anv�ndarnamnet n�gonstans. �r \"%s\" verkligen en anv�ndare?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Tyv�rr, jag kan bara byta lokala l�senord. Anv�nd yppasswd ist�llet."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID och anv�ndarnamn st�mmer inte �verens, bedragare!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Byter l�senordet f�r %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Ange gamla l�senordet: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Ogiltigt l�senord, bedragare."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Ange nya l�senordet: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "L�senordet �ndrades inte."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Ange nya l�senordet p� nytt: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Du stavade fel till det. L�senordet �ndrades inte."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "l�senordet �ndrades, anv�ndare %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-L�SENORDET �NDRADES"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "l�senordet �ndrades av root, anv�ndare %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "anropar setpwnam f�r att st�lla in l�senord.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "L�senordet �ndrades *INTE*. F�rs�k igen senare.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "L�senordet �ndrades.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7169,7 +6847,6 @@ msgstr "omstartad av %s: %s"
 msgid "halted by %s: %s"
 msgstr "stannad av %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7206,7 +6883,6 @@ msgstr "K�r programmet \"%s\"...\n"
 msgid "Error executing\t%s\n"
 msgstr "Fel vid k�rning av\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7298,7 +6974,6 @@ msgstr "fel vid inst�llning av close-on-exec p� /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "fel vid k�rning av finalprog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "fel vid grening av finalprog\n"
@@ -7327,7 +7002,7 @@ msgstr "�ppnande av katalog misslyckades\n"
 msgid "fork failed\n"
 msgstr "grening misslyckades\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "k�rning misslyckades\n"
 
@@ -7487,12 +7162,6 @@ msgstr "ogiltigt m�nadsv�rde: anv�nd 1-12"
 msgid "illegal year value: use 1-9999"
 msgstr "ogiltigt �rsv�rde: anv�nd 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7503,13 +7172,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "anv�ndning: cal [-13smjyV] [[m�nad] �r]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "anv�ndning: %s [+format] [dag m�nad �r]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
@@ -7641,7 +7309,7 @@ msgstr "%s: namnbyte av %s till %s misslyckades: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "anropa: %s fr�n till filer...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7652,22 +7320,22 @@ msgstr ""
 "Anv�nd \"%s [flaggor] %s\" om du verkligen vill anv�nda den.\n"
 "Skriptet startades inte.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "anv�ndning: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen �r %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7676,254 +7344,253 @@ msgstr ""
 "\n"
 "Skriptet f�rdigt %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet f�rdigt, filen �r %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Slut p� pty:er\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argumentfel, anv�ndning\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminalnamn ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tabb1 tabb2 tabb3 ... ] ]      (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tabb1 tabb2 tabb3 ... ] ]   (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnamn ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvensnummer ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan inte st�lla in/�terst�lla str�msparl�get\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-fel: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fel vid l�sning av %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Fel vid skrivning av sk�rmdump\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunde inte l�sa %s, och kan inte dumpa ioctl\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM �r inte angiven.\n"
@@ -7998,10 +7665,6 @@ msgstr "varning: kan inte �ppna %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunde inte �ppna %s - anv�nder %s ist�llet\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8299,82 +7962,73 @@ msgstr "mount: kan inte �ppna %s f�r inst�llning av hastighet"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte st�lla in hastighet: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: denna version kompilerades utan st�d f�r typen \"nfs\""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: misslyckades med montering av nfs version 4, f�rs�ker med 3...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jag kunde inte avg�ra filsystemstypen, och ingen angavs"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du m�ste ange filsystemstypen"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: montering misslyckades"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkten %s �r inte en katalog"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: �tkomst nekas"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: m�ste vara superanv�ndaren f�r att anv�nda mount"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s �r upptagen"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc �r redan monterad"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s �r redan monterad eller %s �r upptagen"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkten %s finns inte"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkten %s �r en symbolisk l�nk till ingenstans"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenheten %s finns inte"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8383,12 +8037,12 @@ msgstr ""
 "mount: specialenheten %s finns inte\n"
 "       (ett s�kv�gsprefix �r inte en katalog)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s �r inte redan monterad, eller felaktig flagga"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8397,7 +8051,7 @@ msgstr ""
 "mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
 "       p� %s, codepage saknas, eller annat fel"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8406,7 +8060,7 @@ msgstr ""
 "       anv�nder ide-scsi s� att sr0 eller sda eller n�got\n"
 "       liknande beh�vs?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8414,7 +8068,7 @@ msgstr ""
 "       (f�rs�ker du kanske montera en ut�kad partition,\n"
 "       ist�llet f�r n�gon logisk partition inuti?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8422,50 +8076,49 @@ msgstr ""
 "       I en del fall kan anv�ndbar information hittas i syslog\n"
 "       - prova dmesg | tail eller n�got liknande\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "monteringstabellen full"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan inte l�sa superblock"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ok�nd enhet"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ok�nd filsystemstyp \"%s\""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du menade troligtvis %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: du menade kanske \"iso9660\"?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: du menade kanske \"vfat\"?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s har fel enhetsnummer eller s� st�ds filsystemstypen %s inte"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s �r inte en blockenhet, och statustagning misslyckas?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8474,73 +8127,68 @@ msgstr ""
 "mount: k�rnan k�nner inte igen %s som en blockenhet\n"
 "       (kanske \"insmod drivrutin\"?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s �r ingen blockenhet (f�rs�k kanske med \"-o loop\"?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s �r ingen blockenhet"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s �r ingen giltig blockenhet"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blockenhet "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan inte montera %s%s som endast l�sbar"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s �r skrivskyddad med en explicit \"-w\"-flagga angavs"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s �r skrivskyddad, monterar som endast l�sbar"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta nfs p� grund av kolonet\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta smbfs p� grund //-prefixet\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: f�rl�gger \"%s\" till bakgrunden\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ger upp \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s �r redan monterad p� %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8588,34 +8236,34 @@ msgstr ""
 "Andra flaggor: [-nfFrsvw] [-o flaggor] [-p l�senordfd].\n"
 "S�g  man 8 mount  f�r m�nga fler detaljer.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan g�ra det"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: ingen s�dan partition hittades"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterar %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan inte hitta %s i %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan inte hitta %s i %s eller %s"
@@ -8650,98 +8298,98 @@ msgstr "       Jag kommer att f�rs�ka med typen %s\n"
 msgid "Trying %s\n"
 msgstr "F�rs�ker med %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: �verdrivet l�ngt v�rd:katalog-argument\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: varning: flera samtidiga v�rdnamn st�ds inte\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: katalog att montera �r inte p� formatet v�rd:katalog\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: kan inte f� tag i adress f�r %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: fick felaktig hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: �verdrivet l�ngt flaggargument\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varning: Ok�nd \"proto=\"-flagga.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varning: Flaggan namlen st�ds inte.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "ok�nd nfs-monteringsparameter: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varning: flaggan nolock st�ds inte.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "ok�nd nfs-monteringsflagga: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: fick felaktig hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS �ver TCP st�ds inte.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs-uttag"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs-bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs-servern rapporterade att tj�nsten var otillg�nglig"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "anv�nde portmapper f�r att hitta NFS-porten\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "anv�nder port %d f�r nfs-demonen\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs-anslut"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "ok�nt nfs-statusreturv�rde: %d"
@@ -8750,7 +8398,7 @@ msgstr "ok�nt nfs-statusreturv�rde: %d"
 msgid "bug in xstrndup call"
 msgstr "programfel i xstrndup-anrop"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8763,7 +8411,7 @@ msgstr ""
 "            %s [-v] [-p prioritet] special ...\n"
 "            %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8774,138 +8422,136 @@ msgstr ""
 "            %s -a [-v]\n"
 "            %s [-v] special ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s p� %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: kan inte hitta \"_stext\" i %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: kan inte ta status p� %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: varning: %s har os�kra r�ttigheter %04o, f�resl�r %04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Hoppar �ver filen %s - den verkar ha h�l.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Inte superanv�ndare.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kan inte �ppna %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: kompilerad utan st�d f�r -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan inte grena: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "v�rd: %s, katalog: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: kan inte f� tag i adress f�r %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: fick felaktig hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ogiltig blockenhet"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: inte monterad"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan inte skriva superblock"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: enheten �r upptagen"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s hittades inte"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: m�ste vara superanv�ndare f�r att avmontera"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blockenheter �r inte till�tna p� filsystem"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, f�rs�ker med umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunde inte avmontera %s - f�rs�ker med %s ist�llet\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s �r upptagen - monterade om som endast l�sbar\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunde inte montera om %s som endast l�sbar\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8916,47 +8562,46 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "Kan inte avmontera \"\"\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "F�rs�ker avmontera %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �r inte monterad (enligt mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det verkar som om %s �r monterad flera g�nger"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s �r inte i fstab (och du �r inte root)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s st�mmer inte �verens med fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: endast %s kan avmontera %s fr�n %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan g�ra det"
 
@@ -9112,7 +8757,7 @@ msgstr "%s: ok�nd flagga \"-%c\"\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9281,8 +8926,6 @@ msgstr "k�rnan �r inte konfigurerad f�r delat minne\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Gr�nser f�r delat minne --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10069,17 +9712,17 @@ msgid ""
 msgstr ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmtfil] [-n l�ngd] [-s �verhopp] [fil ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "anv�ndning: %s [-dflpcsu] [+radnummer | +/m�nster] namn1 namn2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: ok�nd flagga \"-%c\"\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10090,8 +9733,7 @@ msgstr ""
 "*** %s: katalog ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10102,45 +9744,45 @@ msgstr ""
 "******** %s: Inte en textfil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Anv�nd q eller Q f�r att avsluta]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Mer--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(N�sta fil: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Tryck blanksteg f�r att forts�tta, \"q\" f�r att avsluta.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...tillbaka %d sidor"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...tillbaka 1 sida"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...hoppar �ver en rad"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...hoppar �ver %d rader"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10150,7 +9792,7 @@ msgstr ""
 "***Tillbaka***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10163,7 +9805,7 @@ msgstr ""
 "\n"
 "Stj�rna (*) indikerar att argumentet blir nytt standardalternativ.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10208,34 +9850,34 @@ msgstr ""
 ":f                      Visa aktuellt filnamn och radnummer\n"
 ".                       Upprepa f�reg�ende kommando\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryck \"h\" f�r instruktioner.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rad %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Inte en fil] rad %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Spill\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...hoppar �ver\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Regulj�rt uttrycksmischmasch"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10243,15 +9885,15 @@ msgstr ""
 "\n"
 "M�nstret hittades inte\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "M�nstret hittades inte"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "kan inte grena\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10259,19 +9901,19 @@ msgstr ""
 "\n"
 "...Hoppar �ver "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Hoppar �ver till filen "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Hoppar tillbaka till filen "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Raden �r f�r l�ng"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Inget tidigare kommando att ers�tta"
 
@@ -10324,7 +9966,7 @@ msgstr "hexdump: felaktigt format {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: felaktigt konverteringstecken %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10332,84 +9974,81 @@ msgstr ""
 "%s: Anv�ndning: %s [-number] [-p str�ng] [-cefnrs] [+rad] [+/m�nster/] "
 "[filer]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: flaggan kr�ver ett argument -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: otill�ten flagga -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...hoppar fram�t\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...hoppar bak�t\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Ingen n�sta fil"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Inga tidigare fil"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: L�sfel fr�n %s-fil\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Ov�ntat filslut i %s-fil\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ok�nt fel i %s-fil\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan inte skapa tempor�r fil\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE-fel: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Filslut)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Ingen ih�gkommen s�kstr�ng"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Kan inte �ppna "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "sparad"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando inte till�tet i rflag-l�ge.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "fork() misslyckades, f�rs�k igen senare\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(N�sta fil: "
 
@@ -10463,6 +10102,157 @@ msgstr "Indataraden �r f�r l�ng.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Slut p� minne vid v�xande av buffert.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Ogiltigt tal: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Syntaxfel: \"%s\"\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Ingen s�dan parameter �r inst�lld: \"%s\"\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] enhet namn\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] enhet storlek sektorer huvuden sp�r utstr�ckning mellanrum "
+#~ "hastighet spec1 formatavst�nd\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] enhet\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] enhet\n"
+
+#~ msgid "version"
+#~ msgstr "version"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "kunde inte �ppna /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "kunde inte l�sa slumpdata fr�n /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "kan inte �ppna %s f�r l�sning"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "kan inte ta status p� %s"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s har inte r�tt filr�ttigheter"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "kan inte l�sa data fr�n %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "F�r m�nga anv�ndare �r redan inloggade.\n"
+#~ "F�rs�k igen senare.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Du har f�r m�nga processer k�rande.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "L�senordet m�ste ha minst 6 tecken, f�rs�k igen.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "L�senordet m�ste inneh�lla tecken som tillh�r tv� av f�ljande klasser:\n"
+#~ "sm� och stora bokst�ver, siffror och icke-alfanumeriska tecken. Se\n"
+#~ "passwd(1) f�r mer information.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Du kan inte �teranv�nda det gamla l�senordet.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Anv�nd inte n�gonting som liknar ditt anv�ndarnamn som l�senord!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Anv�nd inte n�gonting som liknar ditt verkliga namn som l�senord!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Anv�ndning: passwd [anv�ndarnamn [l�senord]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Endast root kan anv�nda formen med en eller tv� argument.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Anv�ndning: passwd [-foqsvV] [anv�ndare [l�senord]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Kan inte k�ra %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kan inte hitta anv�ndarnamn"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Endast root kan byta l�senordet �t andra.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "F�r m�nga argument.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kan inte hitta anv�ndarnamnet n�gonstans. �r \"%s\" verkligen en "
+#~ "anv�ndare?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Tyv�rr, jag kan bara byta lokala l�senord. Anv�nd yppasswd ist�llet."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID och anv�ndarnamn st�mmer inte �verens, bedragare!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Byter l�senordet f�r %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Ange gamla l�senordet: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Ogiltigt l�senord, bedragare."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Ange nya l�senordet: "
+
+#~ msgid "Password not changed."
+#~ msgstr "L�senordet �ndrades inte."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Ange nya l�senordet p� nytt: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Du stavade fel till det. L�senordet �ndrades inte."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "l�senordet �ndrades, anv�ndare %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT-L�SENORDET �NDRADES"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "l�senordet �ndrades av root, anv�ndare %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "anropar setpwnam f�r att st�lla in l�senord.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "L�senordet �ndrades *INTE*. F�rs�k igen senare.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "L�senordet �ndrades.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: denna version kompilerades utan st�d f�r typen \"nfs\""
+
 #~ msgid "Error closing file\n"
 #~ msgstr "Fel vid st�ngning av fil\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
new file mode 100644
index 000000000..a2911efbb
--- /dev/null
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index c7c3995a0..0b149e6c5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,14 +5,14 @@
 # this file and modified versions, provided that this
 # header is not removed and modified versions are marked
 # as such. No warranty.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, ..., 2004.
+# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, ..., 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
-"PO-Revision-Date: 2004-12-29 03:18+0300\n"
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-01-30 20:12+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -118,7 +118,7 @@ msgstr "%s: %s üzerinde G/Ç hatası\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA  Sboyu  Bboyu BaşlSkt      Boyut   Aygıt\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "kullanımı:\n"
@@ -162,13 +162,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "kullanımı: %s [ -n ] AYGIT\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s (%s den)\n"
 
 #: disk-utils/fdformat.c:130
@@ -193,7 +192,7 @@ msgstr "Çift"
 msgid "Single"
 msgstr "Tek"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -208,99 +207,99 @@ msgstr ""
 " -v         ayrıntılı çıktı verir\n"
 " dosya      denenen dosya\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: sıkıştırma açılırken hata %d! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: sembolik bağ `%s' üzerinde boyut hatası\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  %ld den %ld ye kadar blok sıkıştırılmamış (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: sahte kip `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  %ld de delik (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: bloksuz (%ld) bayt\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: boyutsuz (%ld vs %ld) bayt\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: geçersiz cramfs -- dosya yolu uzunluğu hatalı\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: -x desteği olmaksızın derlenmiş\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: uyarı -- dosya sistemi boyu saptanamıyor \n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s bir blok aygıtı ya da dosyası değil\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: geçersiz cramfs -- dosya uzunluğu çok küçük\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: geçersiz cramfs -- hatalı dosya kimliği\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: uyarı -- dosya uzunluğu çok büyük, adımlı eşlem?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: geçersiz cramfs--crc hatası\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: uyarı -- eski cramfs eşlemi, CRC'siz\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: geçersiz cramfs -- hatalı süperblok\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: geçersiz cramfs -- dizin verisi sonu (%ld) != dosya verisi başlangıcı (%"
 "ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: geçersiz cramfs -- geçersiz dosya verisi başlangıcı\n"
@@ -776,7 +775,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "yer yetersiz, en az %lu blok gerekiyor"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -845,19 +844,19 @@ msgstr " .. girdisi yazılırken hata"
 msgid "error closing %s"
 msgstr "%s kapatılırken hata"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Kullanımı: mkfs [-V] [-t dsySistTürü] [dsySist-seçenekleri] aygıt [uzunluk]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Bellek yetersiz!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs sürüm %s (%s)\n"
@@ -920,7 +919,6 @@ msgstr ""
 "MAXENTRIES aşıldı.  mkcramfs.c içinde bu değeri yükseltin ve yeniden "
 "derleyin.   Çıkılıyor.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -976,10 +974,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM bellekeşlemi yazmada hata (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1059,7 +1053,6 @@ msgstr "düğümler yazılamıyor"
 msgid "write failed in write_block"
 msgstr "write_block içine yazma başarısız"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1095,7 +1088,7 @@ msgstr "bloklar denetlenirken erişim başarısız"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check yapılırken tuhaf değerler: yazılım hatası olabilir\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
@@ -1137,108 +1130,109 @@ msgstr "%s durum bilgileri alınamıyor"
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' üzerinde dosya sistemi oluşturmaya çalışılmayacak"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "kullanıcı tarafından belirtilen sayfa uzunluğu %d hatalı\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Kullanıcı tarafından belirtilen sayfa uzunluğu %d kullanılıyor,\n"
 "(sistem değeri %d/%d yerine)\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Sayfa uzunluğu olarak %d kullanılıyor (%d değil)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
-msgstr ""
+msgstr "Takas başlığı uzunluğu hatalı, bir etiket yazılmamış.\n"
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
-msgstr ""
+msgstr "Etiket kısaltıldı.\n"
 
-#: disk-utils/mkswap.c:250
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:249
+#, c-format
 msgid "no label, "
-msgstr "yafta"
+msgstr "bir etiket yok, "
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "UUID yok\n"
 
-#: disk-utils/mkswap.c:382
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:381
+#, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr ""
-"Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] /dev/isim [blokSayısı]\n"
+"Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] [-L etiket]\n"
+"                /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "çok fazla bozuk sayfa var"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "1 bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: hata: %lu aygıtın boyutundan büyük (%lu)\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: hata: takas alanı için en az %ldkB gerekiyor\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: uyarı: takas alanı %ldkB ile sınırlanıyor\n"
 
-#: disk-utils/mkswap.c:645
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "%s: error: label only with v1 swap area\n"
-msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
+msgstr "%s: hata: sadece v1 takas alanlı etiket\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' üzerinde takas aygıtı oluşturulmayacak"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "ölümcül: ilk sayfa okunabilir değil"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1251,122 +1245,84 @@ msgstr ""
 "takas alanı oluşturulmadı. Burada mutlaka bir v0 takas alanı oluşturmak\n"
 "istiyorsanız -f seçeneği ile bunu yapabilirsiniz.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Takas alanı sürüm %d, uzunluk = %llu kB olarak ayarlanıyor\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "takas alanında başa gidilemiyor"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "imza sayfası yazılamıyor"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "fsync hata verdi"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Numara geçersiz: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Sözdizimi hatası: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Böyle bir parametre yok: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] aygıt isim\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] aygıt uzunluk sektor kafa iz gerilme boşluk oran özellik1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] aygıt\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] aygıt\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Kullanışsız"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Boş Alan"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr "Linux JFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk değiştirildi.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Bölümleme tablosunun doğru olarak güncellendiğinden emin olabilmek için\n"
 "sistemi yeniden başlatın.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1379,325 +1335,306 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen cfdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ÖLÜMCÜL HATA"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "cfdisk'ten çıkmak için herhangi bir tuşa basınız"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "Disk sürücüsü okunamıyor"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "Disk sürücüsüne yazılamıyor"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Disk bölümü sayısı çok fazla"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce başlıyor"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce bitiyor"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra başlıyor"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra bitiyor"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Disk bölümü son kısmî silindir içinde bitiyor"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "mantıksal bölümler sıralamaya uygun değil"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "mantıksal bölümler içiçe geçmiş"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "büyütülen mantıksal bölümler içiçe geçiyor"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Ek disk bölümü içermeyen mantıksal bölüm oluşturulurken iç hata !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr "Burada mantıksal bölüm oluşturulamıyor -- iki ek bölüm oluşacaktı"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menü öğesi çok uzun. Menü tuhaf görünebilir."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü yönsüz. Yatay olarak öntanımlanıyor."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Kuraldışı tuş"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Devam etmek için bir tuşa basınız"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Birincil"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Yeni birincil disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Mantıksal"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Yeni mantıksal disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Bir disk bölümü oluşturulmaz"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! İç hata !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Alan (MB):"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Başlangıç"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Disk bölümünü boş alanın başlangıcına ekler"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Son"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Disk bölümnü boş alanın sonuna ekler"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Ek disk bölümünü oluşturacak yer yok"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr "Disk bölümleme tablosu yok.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr "Disk bölümleme tablosu yok. Boş tablo ile başlanacak."
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr "Disk bölümleme tablosundaki imza kötü"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr "Disk bölümleme tablosu türü bilinmiyor"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Temiz bir tablo ile başlamak ister misiniz [e/H] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Diskte bulunan silindir sayısından büyük bir sayı belirttiniz"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "Disk açılamıyor"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Açılan disk salt-okunur - yazma izniniz yok"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Birincil disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Mantıksal disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uyarı!! Bu işlem disk üzerindeki veriyi yokedebilir!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Disk bölümleme tablosu yazılacak, emin misiniz? (evet ya da hayır): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "hayır"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazılmadı"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "evet"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Lütfen ya `evet´ ya da `hayır´ yazınız"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Disk bölümleme tablosu diske yazılıyor..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazıldı"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Bölümleme tablosu yazıldı ama tablo yeniden okunamadı. Sistemi yeniden "
 "başlatın."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş hiç birincil disk bölümü yok. DOS MBR bunu "
 "başlatamayabilir."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş çok sayıda birincil disk bölümü var. DOS MBR bunu "
 "başlatamayabilir."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dosya ismini girin ya da ENTER tuşuna basın: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Sabit Disk: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Sektör 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektör %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Yok    "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Bir/Man"
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "  Birincil "
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr " Mantıksal "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Hiçbiri"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s için Disk Bölümleme Tablosu\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr " Bölüm         İlk          Son              Sektör    Dosya\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1705,7 +1642,7 @@ msgstr ""
 " # Türü       Sektör      Sektör    Başl     Sayısı    Sistemi   Türü    "
 "Flama\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1713,472 +1650,469 @@ msgstr ""
 "-- -------   --------    --------- ------  ---------  ---------  -----  "
 "------\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --Başlangıç---      ----Bitiş-----   Başlangıç  Sektör\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flama Kafa Sekt Sld  Kiml Kafa Sekt Sld    Sektörü   Sayısı\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ----  --------- ---------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Ham"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Tablo temel veri biçemi olarak yazılır"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Sektör"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Tabloyu sektörlere dağılımına göre yazar"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Tablo"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Disk bölümleme tablosunu yazar"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Tablo yazılamıyor"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk Yardım Ekranı"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Sabit diskinizdeki disk bölümlerini oluşturabilmenizi, silebilmenizi ve"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "değiştirebilmenizi sağlayan etkileşimli bir disk bölümleme uygulamasıdır."
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr " "
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Telif Hakkı (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr " Komut       Anlamı"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr " -----       ------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Seçilen disk bölümünün açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Seçilen disk bölümünü siler"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Silindir, kafa, sektör/İz parametrelerini değiştirir"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             UYARI: Bu seçenek sadece ne yaptığını iyi bilen kişilerce"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             kullanılabilir."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Seçilen disk bölümünü kalan boş yere sığdırır"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bilgi: Disk bölümünü DOS, OS/2 ve benzeri sistemlerle"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             uyumsuzluk oluşturabilir."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 "             Disk bölümleme tablosunu farklı biçemlerde elde edebilirsiniz."
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr "             Bu biçemler:"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Temel veri (verinin diske yazılan biçemi)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Disk bölümlerinin sektörlere dağılımını gösterir"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - Geleneksel disk bölümleme tablosu"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Disk bölümleme tablosu diskteki yerine kaydedilmeden çıkılır"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Dosya sistemi türünü değiştirir"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Disk bölümü boyunun birimini değiştirir"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektör, silindir birimleri sırayla yer değiştirir"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Disk bölümleme tablosunu diskteki yerine yazar. (Büyük W)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Diskteki veriyi yanlışlıkla kaybetmemek için "
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             'evet' ya da 'hayır' yazmanız istenerek veriyi diske yazdırıp,"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             yazdırmayacağınıza kesin karar verebilirsiniz"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Yukarı Ok    Kürsörü önceki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Aşağı Ok     Kürsörü sonraki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ekranı tazeler"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bilgi: Kaydet (W) komutu dışında tüm komutları büyük ya da küçük harf"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "olarak kullanabilirsiniz."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Silindir"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Silindir geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Kafa"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Kafa geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Sektör geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Tamam"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Geometri değişikliği yapıldı"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Silindir sayısını verin: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Silindir sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Kafa sayısını verin: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Kafa sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "sektör/iz sayısını verin: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "sektör sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Dosya sistemi türünü verin: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Dosya sistemi türü boş olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Dosya sistemi türü ek olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ne?(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Bir/Man"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Bilinmeyen (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Sabit Disk: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Boyut: %lld bayt, %lld MB"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Boyut: %lld bayt, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Kafa: %d        Sektör/İz: %d       Silindir: %lld  "
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "İsim"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Flama"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Bölüm Türü"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "DS Türü"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Etiket]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Sektör  "
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Silindir"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "  Boy (MB) "
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "  Boy (GB) "
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Seçilen disk bölümünde Açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Sil"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Seçilen disk bölümünü kaldırır"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Disk geometrisini değiştirir (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Yardım"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Sığdır"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Seçilen disk bölümünü kalan yere göre ayarlar (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Yeni"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Yaz"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Çık"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Disk bölümleme tablosunu diske kaydetmeden çıkar"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Türü"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Dosya sistemi türünü değiştirir (DOS, Linux, OS/2,..,vs)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Birim"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Gösterilecek boy birimini değiştirir (MB, sekt, sld)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Kaydet"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Disk bölümleme tablosunu diske kaydeder (bu işlem verilerin kaybına sebep "
 "olur)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "Bu disk bölümüne açılış kaydı yapılamaz"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "Bir boş disk bölümü silinemez"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "Bu disk bölümü sığdırılamıyor"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Bu disk bölümü kullanışsız"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Bu disk bölümü zaten kullanımda"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "Bir boş disk bölümünün türü değiştirilemez"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Başka disk bölümü yok"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Kuraldışı komut"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Telif Hakkı © 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2250,9 +2184,9 @@ msgstr ""
 "\n"
 "Aygıt için BSD disk etiketi: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr " Komut  yaptığı iş "
 
@@ -2272,10 +2206,9 @@ msgstr "   i   önyükleyici kurar"
 msgid "   l   list known filesystem types"
 msgstr "   l   bilinen dosya sistemi türlerini listeler"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   bu menüyü gösterir"
 
@@ -2287,14 +2220,14 @@ msgstr "   n   yeni bir BSD disk bölümü ekler"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   değişiklikleri kaydetmeden çıkar"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   ana menüye döner"
 
@@ -2337,13 +2270,13 @@ msgstr "%s üzerinde *BSD disk bölümü yok.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD disk etiketi komutu (yardım için m): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "İlk %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Son %s, +size, +sizeM veya +sizeK"
@@ -2388,8 +2321,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " bozukSektör"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2490,8 +2421,8 @@ msgstr "sektör/iz"
 msgid "tracks/cylinder"
 msgstr "iz/silindir"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "silindir"
 
@@ -2548,7 +2479,7 @@ msgstr "%s üzerine önyükleyici kuruldu.\n"
 msgid "Partition (a-%c): "
 msgstr "Disk bölümü (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
@@ -2572,7 +2503,7 @@ msgstr ""
 "\n"
 "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2594,7 +2525,7 @@ msgstr ""
 "-u: Başlangıç ve bitiş sektörlerini (silindir değil) verir\n"
 "-b 2048: 2048 baytlık sektörler kullanılır\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2612,198 +2543,184 @@ msgstr ""
 "   fdisk /dev/ida/c0d0  (RAID aygıtları)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s okunamıyor\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s üzerinde erişim olanaksız\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s yazılamıyor\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s üzerinde BLKGETSIZE ioctl hata verdi\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "Daha fazla bellek ayrılamıyor\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Ölümcül Hata\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   salt-okunur flamasını kaldırır/indirir"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd disk etiketini düzenler"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   bağlanabilir flamasını kaldırır/indirir"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   bir disk bölümünü siler"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   bilinen disk bölümü türlerini listeler"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   yeni bir disk bölümü ekler"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   yeni bir DOS disk bölümü oluşturur"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   yeni bir Sun disk etiketi oluşturur"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   disk bölümünün sistem kimliğini değiştirir"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   gösterme/girdi birimini değiştirir"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   disk bölümleme tablosunu doğrular"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabloyu diskteki yerine yazar ve çıkar"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fazladan işlevsellik (uzmanlar için)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   açılış disk bölümünü seçer"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   açılış dosyası girdilerini düzenler"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi takas bölümü seçilir"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   açılış flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos uyumluluk flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   almaşık silindirlerin sayısını değiştirir"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   disk bölümleme tablosunun temel verisini gösterir"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   silindir başına fazladan sektör sayısını değiştirir"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   kafa sayısını değiştirir"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   serpiştirme etkenini değiştirir"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   devir sayısını değiştirir (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   sektör/iz sayısını değiştirir"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   fiziksel silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   disk bölümü içindeki verinin başlanıcına gider"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   ek disk bölümlerini listeler"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) disk bölümleme tablosu oluşturur"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   disk bölümleme sırasını düzeltir"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Belirtilmeli"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2812,11 +2729,11 @@ msgstr ""
 "%s%s.\n"
 "Bunu fazladan işlevler menüsünden yapabilirsiniz.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " ve "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2835,12 +2752,12 @@ msgstr ""
 "2) diğer işletim sistemlerinin önyükleme ve disk bölümleme yazılımları\n"
 "   (örn. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Birincil ek disk bölümünde hizalama hatalı\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -2849,17 +2766,17 @@ msgstr ""
 "Uyarı: %d. bölümden sonrakiler atlanıyor.\n"
 "Bu bölümleme tablosunu kaydederseniz, bunlar silinmiş olacak.\n"
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosunda fazladan bağ imleyici\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosundaki fazladan veri yoksayılıyor\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2871,17 +2788,17 @@ msgstr ""
 "değişiklikler\n"
 "bellekte bekleyecek. Aksi takdirde, önceki içerik kurtarılamayacak.\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bilgi: sektör uzunluğu %d (%d değil)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Disk bölümleme tablosunu diskteki yerine kaydetme yetkiniz yok.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2890,7 +2807,7 @@ msgstr ""
 "Bu disk hem DOS hem de BSD olarak imli.\n"
 "BSD kipine geçmek için 'b' komutunu verin.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2899,17 +2816,17 @@ msgstr ""
 "Aygıt ne geçerli bir DOS disk bölümleme tablosu ne de Sun, SGI ya da OSF "
 "disk etiketleri içeriyor.\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "İç hata\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Fazladan ek disk bölümü %d yoksayılıyor\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2918,7 +2835,7 @@ msgstr ""
 "Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
 "düzeltilmiş olacak\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2927,83 +2844,83 @@ msgstr ""
 "\n"
 "Dosya sonuna rastlandı - çıkılıyor..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Onaltılık kod (kod listesi için L tuşlayın):"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, öntanımlı %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Öntanımlı değer %u kullanılıyor\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Değer kapsamdışı.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Disk bölümü numarası"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Uyarı: %d disk bölümünün türü boş görünüyor\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Seçilen disk bölümü %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Tanımlı bir disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Tüm birincil bölümler zaten tanımlı!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "UYARI: %d disk bölümü bir ek disk bölümü\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS uyumluluk flaması etkin\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS uyumluluk flaması etkin değil\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "%d disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3016,7 +2933,7 @@ msgstr ""
 "muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
 "kullanarak bir disk bölümünü silebilirsiniz.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3025,7 +2942,7 @@ msgstr ""
 "Bir disk bölümünü bir ek bölümün içinde ya da herhangi bir yerde\n"
 "değiştiremezsiniz. Önce silmeniz gerekir.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3035,7 +2952,7 @@ msgstr ""
 "Linux'a uygun olsa da SunOS/Solaris gerektirdiğinden,\n"
 "3. disk bölümünün diskin tamamı (5) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3045,54 +2962,54 @@ msgstr ""
 "IRIX gerektirdiğinden, 11. disk bölümü tüm 'volume' (6) ve\n"
 "9. disk bölümü 'volume' başlığı (6) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "%d disk bölümünün sistem türü %x (%s) olarak değiştirildi\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "%d disk bölümü farklı fiziksel/mantıksal başlangıçlara sahip (Linux "
 "değil?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fiziksel=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "mantıksal=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "%d disk bölümü farklı fiziksel/mantıksal bitişlere sahip:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "%i disk bölümünün başlangıcı silindir sınırları dışında:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) olmalıydı\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "%i. disk bölümü silindir sınırında bitmiyor.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) olmalıydı\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3101,7 +3018,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB %lld bayt\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3110,17 +3027,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bayt\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d kafa, %d sektör/iz, %d silindir"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", toplam %llu sektör"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3129,7 +3046,7 @@ msgstr ""
 "Birimler = %s / %d * %d = %d bayt\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3138,7 +3055,7 @@ msgstr ""
 "Hiçbir şey yapılmadı. Sıralama zaten doğru.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3149,16 +3066,16 @@ msgstr ""
 "Galiba yanlış aygıt seçtiniz.\n"
 "\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Açılış    Başlangıç     Bitiş  BlokSayısı Kml Sistem\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Aygıt"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3167,7 +3084,7 @@ msgstr ""
 "\n"
 "Disk bölümleme tablosu girdileri diskteki sırasında değil\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3178,87 +3095,87 @@ msgstr ""
 "Disk %s: %d kafa, %d sektör, %d silindir\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "No AF  Hd Skt  Sln  Hd Skt  Sld    Başlangıç   Boy  Kml\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Uyarı: %d disk bölümü 0. sektörü içeriyor\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: kafa sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: sektör sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: silindir sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "%d disk bölümü: önceki sektör sayısı %d toplam %d ile çelişiyor\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Uyarı: %d disk bölümünün veri-başlangıcı hatalı\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Uyarı: %d ile %d disk bölümleri birbirine girmiş.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uyarı: %d disk bölümü boş\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Mantıksal disk bölümü %d tamamen %d disk bölümünün içinde değil\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Tahsis edilen sektör sayısı %d en fazla olması gereken %lld değerinden "
 "büyük\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%lld sektör kullanılmamış\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "%d disk bölümü zaten atanmış. Yeniden eklemeden önce silmelisiniz.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Boşta sektör yok\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3271,23 +3188,23 @@ msgstr ""
 "\tbir DOS disk bölümleme tablosu oluşturun. (o ile)\n"
 "\tUYARI: Bu işlem ile diskteki tüm bilgile kaybalacaktır.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Önce bazı disk bölümlerini silip ondan sonra ek disk bölümünü eklemelisiniz\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Tüm mantıksal bölümler kullanımda\n"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Bir birincil disk bölümü ekleniyor\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3298,20 +3215,20 @@ msgstr ""
 "   %s\n"
 "   p   birincil disk bölümü (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   mantıksal (5 veya üzeri)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   ek"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Tür '%c' için disk bölümü numarası geçersiz\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3320,12 +3237,12 @@ msgstr ""
 "Disk bölümleme tablosu zaten değişmişti!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Disk bölümleme tablosunu yeniden okumak için ioctl() çağrılıyor.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3338,7 +3255,7 @@ msgstr ""
 "Çekirdek hala eski tabloyu kullanıyor.\n"
 "Yeni tablo makinayı yeniden başlattığınızda geçerli olacak.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3351,7 +3268,7 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -3360,68 +3277,68 @@ msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "%d disk bölümü veri alanına sahip değil\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Bu çekirdek sektör uzunluğunu kendisi bulur. - -b seçeneği yoksayıldı\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3430,18 +3347,17 @@ msgstr ""
 "Uyarı: -b (sektör uzunluğu ayarı) seçeneği tek aygıt ile kullanılmış "
 "olmalıydı\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s üzerinde OSF/1 disk etiketi saptandı, disk etiketi kipine giriliyor.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3450,16 +3366,16 @@ msgstr ""
 "\n"
 "Şu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası değiştirilmedi\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3526,15 +3442,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux takas"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux doğal"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3612,7 +3528,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektör%5u boy%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3670,7 +3585,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Birden fazla tüm disk girdisi var.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Atanmış disk bölümü yok\n"
@@ -3755,7 +3670,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tKullanışsız bir önyükleme dosyası seçtiniz.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3775,11 +3689,10 @@ msgstr ""
 "\"SGI volume\" onunla çelişebilir. Bu disk bölümünü farklı\n"
 "oluşturmak istiyorsanız EVET yazın.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "EVET\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3859,44 +3772,43 @@ msgstr "%d disk bölümünün parametreleri okunmaya çalışılıyor.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "Kimlik=%02x\tBaşlangıç=%d\tBoy=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Boş"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS takas"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Tüm disk"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid otosaptama"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3909,12 +3821,12 @@ msgstr ""
 "belirlemeniz ya da baştan bir temiz etiket (ana menüden s komutu ile)\n"
 "oluşturmanız gerekebilecek.\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Otomatik yapılandırma tarafından bir %s%s%s bulundu\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3927,7 +3839,7 @@ msgstr ""
 "diskte bulunan tüm bilgiyi bir daha geri alamamak üzere\n"
 "kaybedeceksiniz.\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3937,72 +3849,72 @@ msgstr ""
 "   ?   oto yapılandırma\n"
 "   0   özel (saptanan öntanımlara sahip donanımla)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Aygıt Türü (?: oto, 0: özel): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Otoyapılandırma hata verdi.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Sektör/iz"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Almaşık silindirler"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Fiziksel silindirler"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Serpiştirme etkeni"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Tüm disk parametrelerini x menüsünden değiştirebilirsiniz"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" floppy"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux özel"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "%d disk bölümü silindir sınırında bitmiyor\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "%d disk bölümü diğerleriyle %d-%d sektörlerinde üstüste biniyor\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kullanılmamış boşluk - 0-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kullanılmamış boşluk - %d-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4012,7 +3924,7 @@ msgstr ""
 "Tekrar denemeden önce bazılarını silmeniz ya da\n"
 "küçültmeniz gerek.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4023,7 +3935,7 @@ msgstr ""
 "diğer disk bölümlerine de geçiyor. Girdiğiniz değer %d %s olarak\n"
 "değiştirildi.\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4032,7 +3944,7 @@ msgstr ""
 "SunOS/Solaris uyumluluğu sağlamak isterseniz, bu disk bölümünü 0 dan\n"
 "başlayan %u sektörlük tüm disk (5) olarak bırakmayı gözönüne alabilirsiniz\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4046,7 +3958,7 @@ msgstr ""
 "82 etiketli (Linux takas) olmasını istediğinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4065,7 +3977,7 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4078,16 +3990,16 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama Başlangıç    Bitiş   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -4111,32 +4023,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Ek"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX önyüklenebilir"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Önyükleme Yöneticisi"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4145,7 +4051,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4238,12 +4143,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4264,8 +4167,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4275,7 +4176,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD veya SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4296,12 +4196,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Eski Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / eski Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr "Linux takas / Solaris"
@@ -4330,12 +4228,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4344,7 +4240,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4409,30 +4304,22 @@ msgstr "DS-olmayan veri"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Uygulaması"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS erişimi"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4441,118 +4328,111 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC önyüklemesi"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS ikincil"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s üzerinde erişim hatası - %lu ya erişilemiyor\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erişim hatası: 0x%08x%08x istendi, 0x%08x%08x alındı\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "bellek yetersiz - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s üzerinde okuma hatası - %lu sektörü okunamıyor\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "HATA: %lu sektörü msdos imzası taşımıyor\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s üzerinde yazma hatası - %lu sektörüne yazılamıyor\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "disk bölümü sektör kayıt dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s üzerinde yazma hatası\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) durum bilgileri alınamıyor\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "disk bölümü tekrar oluşturma dosyasının uzunluğu hatalı - tekrar "
 "oluşturulamıyor\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "bellek yetersiz?\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "%s aygıtı yazılmak üzere açılamıyor\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%lu sektörünü %s üzerine yazmada hata\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometri alınamıyor\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: boyu alınamıyor\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4563,22 +4443,22 @@ msgstr ""
 "gibi görünüyor. fdisk kullanmak anlamlı olmayacak.\n"
 "[Bunu mutlaka yapmak istiyorsanız --force seçeneğini kullanabilirsiniz]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Uyarı: HDIO_GETGEO %lu kafa bildiriyor\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Uyarı: HDIO_GETGEO %lu sektör bildiriyor\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Uyarı: BLKGETSIZE/HDIO_GETGEO %lu silindir bildiriyor\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4588,7 +4468,7 @@ msgstr ""
 "sayısına benzemiyor. Bu chs adresleme kullanılan yazılımlarla sorun "
 "çıkarır.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4597,7 +4477,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu silindir, %lu kafa, %lu sektör/iz\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4605,7 +4485,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış kafa sayısı içeriyor: %lu (0-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4614,7 +4494,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış sektör sayısı içeriyor: %lu (1-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4623,7 +4503,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış silindir sayısı içeriyor: %lu (0-%lu "
 "arasında olmalıydı)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4632,12 +4512,12 @@ msgstr ""
 "Kiml İsim\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Disk bölümleme tablosu yeniden okunuyor ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4645,31 +4525,31 @@ msgstr ""
 "Disk bölümleme tablosunun yeniden okunması başarılamadı\n"
 "mkfs kullanabilmek için sistemi yeniden başlatmalısınız.\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s kapatılırken hata\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: böyle bir disk bölümü yok\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "biçem bilinmiyor - sektör sayısı kullanılıyor\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s disk bölümleme tablosu\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "desteklenmeyen biçem - %s kullanılıyor\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4678,14 +4558,14 @@ msgstr ""
 "birimler = %lu baytlık silindir, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "                              silindir   blok\n"
 "   Aygıt Önykl Balangıç Bitiş sayısı   sayısı\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4694,14 +4574,14 @@ msgstr ""
 "birimler = 512 baytlık sektör, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 "    Aygıt Önyükl Başlangıç   Bitiş   sektör  Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4710,14 +4590,14 @@ msgstr ""
 "birim = 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyükl Başlangıç   Bitiş    blok    Kiml Sistem\n"
 "                                    sayısı\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4726,36 +4606,36 @@ msgstr ""
 "birimler = 1048576 baytlık mebibayt, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyük Başl   Bitiş    MiB     blok    Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbaşlangıç: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) "
 "bulundu\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbitiş: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "disk bölümü disk sonundan sonra, %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Disk bölümü bulunamadı\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4766,51 +4646,51 @@ msgstr ""
 "(%ld/%ld/%ld yerine) yapılmış görünüyor.\n"
 "Bu listeleme bu geometriyle kabul ediliyor.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "disk bölümleme tablosu yok.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "tuhaf, sadece %d disk bölümü atanmış.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ama boş olarak imli değil\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve önyüklenebilir\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve başlangıcı 0 da değil\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "%s disk bölümünde değil\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ve %s birbirine girmiş\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4819,17 +4699,17 @@ msgstr ""
 "Uyarı: %s disk bölümleme tablosunun bir kısmını içerdiğinden (sektör %lu)\n"
 "dolduğunda onu bozacak\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Uyarı: %s disk bölümü 0. sektörde başlıyor\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Uyarı: %s disk bölümü disk sonunu aşıyor\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4837,17 +4717,17 @@ msgstr ""
 "Birincil disk bölümlerinden en çok biri ek disk bölümünde bulunabilir.\n"
 " (Şüphesiz Linux altında bu bir sorun değildir)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırından başlamıyor\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırında bitmiyor\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4855,7 +4735,7 @@ msgstr ""
 "Uyarı: birden fazla disk bölümü önyükleme flaması içeriyor.\n"
 "Bu LILO için sorun yaratmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4863,7 +4743,7 @@ msgstr ""
 "Uyarı: birincil disk bölümlerinden sadece bir tanesi önyüklenebilir,\n"
 "LILO `bootable' flamasına aldırmaz.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4871,11 +4751,11 @@ msgstr ""
 "Uyarı hiçbir disk bölümü önyükleme bayrağı içermiyor\n"
 "Bu LILO için sorun oluşturmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "başlangıç"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4883,23 +4763,23 @@ msgstr ""
 "%s: başlangıç: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "bitiş"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "%s: bitiş: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "%s diskin sonunu aşarak %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4908,7 +4788,7 @@ msgstr ""
 "Uyarı: ek disk bölümünün başlangıcı %ld den %ld ye kaydırıldı\n"
 "(Sadece liste uyumluluğu için. İçeriği değişmiyor.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4916,132 +4796,131 @@ msgstr ""
 "Uyarı: ek disk bölümü bir silindir sınırında başlamıyor.\n"
 "DOS ve Linux içerikleri farklı yorumlayacaktır.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "disk bölümü sayısı çok fazla - Bu sonuncusu (%d) disk bölümü\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "ağacında yok sayılsın mı?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk yöneticisi saptadı - bulunan DM6 imzası\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "ile çalışılamıyor - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir ek disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir BSD disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flaması verilmiş: Hiçbir şey değişmedi\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Eski sektörlere yazmada başarısızlık - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "girdi hatası: %c karakteri gereksiz (%s alanından sonra)\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuşatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uyarı: belirtilen (%lu) uzunluk, izin verilen (%lu) uzunluktan fazla\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uyarı: disk bölümü başlangıcı hatalı (en erken %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde değil\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5054,46 +4933,42 @@ msgstr ""
 "Genellikle <başlangıç> ve <uzunluk> değerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "sürüm"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "aygıt: /dev/hda veya /dev/sda gibi"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "kullanışlı seçenekler:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s  --show-size     disk bölümü uzunlukları listelenir"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c  --id            disk bölümü kimliği değiştirilir ya da gösterilir"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l  --list          aygıtların disk bölümlerini listeler"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d  --dump          dökümler, ama sonraki girdiler için uygun biçemde"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i  --increment     silindir sayısı v.s. 0 yerine 1 den itibaren"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5101,60 +4976,61 @@ msgstr ""
 "    -uS, -uB, -uC, -uM  sektör/blok/silindir/MB birimleriyle değer alır/"
 "gösterir"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T  --list-types    bilinen disk bölümü türlerini listeler"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D  --DOS           DOS-uyumluluğu için: bir disk bölümünü çoraklaştırır"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R  --re-read       çekirdek yeniden okuma tablosu yapar"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N#                 sadece # numaralı disk alanı değiştirilir"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n                  gerçekte diske yazılmaz"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O dosya            üstüne yazarak sektörleri dosyaya kaydeder"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I dosya            sektörleri bu dosyadan tekrar oluşturur"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v  --version       sürüm bilgilerini gösterir"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "tehlikeli seçenekler:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
 
-#: fdisk/sfdisk.c:2330
-#, fuzzy
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
-msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
+msgstr ""
+"    -G [veya --show-pt-geometry]: bölümleme tablosundan alınan geometriyi "
+"basar"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5162,119 +5038,119 @@ msgstr ""
 "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
 "                        betimleyicileri için girdi bekler"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  --Linux         Linux ile alakasız şeyler hakkında hata üretmez"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  --quiet         uyarıları engeller"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "Saptanan geometriyi aşmak için seçenekler:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C#  --cylinders #  kullanılacak silindir sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H#  --heads #      kulanılacak kafa sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S#  --sectors #    kullanılacak sektör sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Kararlılık denetimlerini etkisizleştirme seçenekleri:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  --force         yapılacak işlem hatalı da olsa yapılır"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s aygıt\t\t aygıt üstündeki etkin disk bölümlerini gösterir\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s aygıt n1 n2 ... n1, n2 ile belirtilen disk bölümleri etkinleştirilir,\n"
 "                   diğerleri etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An aygıt\t n. disk bölümünü etkinleştirilir, diğerlerini "
 "etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "toplam: %llu blok\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Kullanımı: sfdisk --print-id aygıt disk-bölümü-numarası\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "kullanımı: sfdisk --change-id aygıt disk-bölümü-numarası kimlik\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "kullanımı: sfdisk --id aygıt disk-bölümü-numarası [kimlik]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "sadece bir aygıt belirtilebilir (-l ya da -s ile gerekir)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld silindir, %ld kafa, %ld sektör/iz\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s gibi bir boyut alınamıyor\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5282,7 +5158,7 @@ msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5291,35 +5167,35 @@ msgstr ""
 "%d etkin birincil disk bölümü var. Bu LILO için sorun olmamakla beraber\n"
 "DOS MBR sadece 1 etkin disk bölümü önyüklemesi yapabilir.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "%s disk bölümünün kimliği %x ve gizli değil\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5332,30 +5208,30 @@ msgstr ""
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma işlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "%d. disk bölümü olmadığından geçilemiyor\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5363,21 +5239,21 @@ msgstr ""
 "Bu disk bölümlerinde hiç bir değişiklik yapılmadı.\n"
 "(Bunu gerçekten istiyorsanız --force seçeneğini kullanın.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Uygulanamıyor - siz de Hayır derdiniz, büyük ihtimalle\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5386,16 +5262,16 @@ msgstr ""
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - Değişiklik yok\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Lütfen e, h, s harflerinden biri ile yanıtlayın\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5404,7 +5280,7 @@ msgstr ""
 "Yeni disk bölümleme tablosu başarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5507,132 +5383,132 @@ msgstr "getopt (gelişmiş) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "iç hata, yazara bildirin."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "MILO'dan açıldı\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD clock\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "saatportu 0x%x'e ayarlandı\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "funky TimeOfYear!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: 1000 yineleme için atomik %s başarısız!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port açılamıyor: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "Denenmediğinden erişim izinleri alınamadı.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s G/Ç portu erişimi alamıyor: iopl(3) çağrısı başarısız.\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Size root yetkileri gerekli.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Donanım saatinin %s de tutulduğu varsayılıyor.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "yerel"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Uyarı: adjtime dosyasındaki üçüncü satır anlaşılamadı\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Gereken: `UTC', `LOCAL' ya da hiçbiri.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Son sapma ayarı 1969 dan sonraki %ld. saniyede yapıldı\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Son düzeltme 1969 dan sonraki %ld. saniyede yapıldı\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Donanım saati %s den beri açık\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "saat tiki için bekleniyor...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "... saat tiki alındı\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Donanım saatinde geçersiz değerler: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Donanım zamanı: %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 yılından beri %ld "
 "saniye\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Donanım saatinden okunan: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Donanım Saati %.2d:%.2d:%.2d = 1969 dan beri %ld saniye olarak ayarlanıyor\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Saat değişmeyecek - sadece test ediliyor.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5641,7 +5517,7 @@ msgstr ""
 "Başlangıç zamanından beri geçen zaman %.6f saniye oldu.\n"
 "Gecikme sonraki tam saniyeye kadar olandan daha fazla.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5650,22 +5526,22 @@ msgstr ""
 "Donanım saati yazmaçları hem geçersiz (ayın 50. günü gibi) hem de elde "
 "edilebilir olmayan bir aralıkta (2500 yılı gibi) değerler içeriyor.\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f saniye\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "--date ile verilen argüman çok uzun\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5674,22 +5550,22 @@ msgstr ""
 "--date seçeneğinin değeri geçersiz.\n"
 "Ayrıca tırnak işaretleri de içeriyor.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Verilen date komutu: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "'date' uygulaması /bin/sh kabuğunda çalıştırılamıyor. popen() başarısız"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date komutunun sonucu = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5704,7 +5580,7 @@ msgstr ""
 "Sonuç:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5721,12 +5597,12 @@ msgstr ""
 "Sonuç:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "tarih dizgesi %s 1969 dan beri %ld saniyeye eşittir.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5735,36 +5611,36 @@ msgstr ""
 "Donanım Saati geçerli bir zaman değeri içermediğinden Sistem Zamanı o değere "
 "ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday çağrısı:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Test kipinde çalışıldığından sistem saati değişmiyor.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr "Sistem saatinin ayarlanması root yetkisindedir.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "settimeofday() başarısız"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5773,7 +5649,7 @@ msgstr ""
 "Donanım saatinin önceki değerleri bozuk olduğundan sapma faktörü "
 "ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5782,7 +5658,7 @@ msgstr ""
 "Son düzeltme zamanı sıfır olduğndan sapma faktörü ayarsız,\n"
 "yani geçmiş hatalı ve bir düzeltme başlangıcı gerekiyor.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5791,7 +5667,7 @@ msgstr ""
 "Son düzeltmeden beri 1 günden az zaman geçtiğinden sapma faktörü "
 "ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5802,22 +5678,22 @@ msgstr ""
 "saniye saptı.\n"
 "Sapma faktörü %4$f saniye/gün olarak ayarlanıyor\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Son ayarlamadan beri %d saniye geçti\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "%d saniye girmek gerekli ve zaman %.6f saniye öncesine ait\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "adjtime dosyası test kipinde olunduğundan güncellenmiyor.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5826,38 +5702,38 @@ msgstr ""
 "Aşağıdaki %s e yazılmalı:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Sapma ayar parametreleri güncellenmedi.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "Donanım saati geçerli bir zaman içermediğinden ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Gereken ayar bir saniyenin altında olduğundan saat ayarlanmıyor.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s kullanarak.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Kullanılabilir bir saat arayüzü yok.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "Sistem saati ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5869,17 +5745,17 @@ msgstr ""
 "değeri saklar.\n"
 "hwclock'un bu kopyası bir Alpha için derlenmemiş. Bir şey yapılmadı.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Çekirdekten dönemsellik değeri alınamıyor.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Çekirdek dönemsellik değerini %lu varsayıyor\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5888,17 +5764,22 @@ msgstr ""
 "Dönemsellik değerinin ayarlanabilmesi için, ayarlanacak değeri 'epoch' "
 "seçeneği ile vermelisiniz.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Dönemsellik %d olarak ayarlanmayacak - sadece test ediliyor.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Çekirdekte dönemsellik değeri ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s (%s den)\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5957,7 +5838,7 @@ msgstr ""
 "  --noadjfile   /etc/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n"
 "                gerekir.\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5967,12 +5848,12 @@ msgstr ""
 "                Alpha'nızın hwclock türü belirtilir\n"
 "               (hwclock(8) man sayfasına bakınız)\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s seçeneği argüman almaz.  %d verildi.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5981,7 +5862,7 @@ msgstr ""
 "Çok sayıda işlev belirttiniz.\n"
 "Bir defada sadece bir işlev uygulanabilir.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5990,7 +5871,7 @@ msgstr ""
 "%s: --utc ve --localtime seçenekleri birbiriyle çelişiyor.  İkisi de "
 "belirtilmiş.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5999,27 +5880,27 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmişsiniz.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: --noadjfile ile ya --utc ya da --localtime belirtilmelidir\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Zaman ayarlama kullanımdışı.  Saat ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Donanım saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sistem saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6028,12 +5909,12 @@ msgstr ""
 "Çekirdekteki Donanım Saati dönemsellik değeri sadece root tarafından "
 "değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Bilinen her hangi bir yöntemle Donanım Saatine erişilemiyor.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6069,7 +5950,6 @@ msgstr "ioctl() %s den zamanı okuyamadı"
 msgid "ioctl KDSHWCLK failed"
 msgstr "ioctl KDSHWCLK başarısız"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "/dev/tty1 veya /dev/vc/1 açılamıyor"
@@ -6164,9 +6044,6 @@ msgstr "ioctl(RTC_EPOCH_READ) %s için başarısız"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6193,7 +6070,6 @@ msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
 msgid "calling open_tty\n"
 msgstr "open_tty çağrılıyor\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "termio_init çağrılıyor\n"
@@ -6202,7 +6078,6 @@ msgstr "termio_init çağrılıyor\n"
 msgid "writing init string\n"
 msgstr "başlatma dizgesi yazılıyor\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "bağlantı hızı saptama öncesi\n"
@@ -6216,7 +6091,6 @@ msgstr "cr-lf için bekleniyor\n"
 msgid "read %c\n"
 msgstr "%c okundu\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "kullanıcı ismi okunuyor\n"
@@ -6270,7 +6144,6 @@ msgstr "/dev: chdir() başarısız: %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: bir karakter aygıtı değil"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6285,12 +6158,10 @@ msgstr "/dev/%s: standart girdi olarak açılamıyor: %m"
 msgid "%s: not open for read/write"
 msgstr "%s: oku/yaz için açık değil"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "çoğaltıyor\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6335,30 +6206,25 @@ msgstr ""
 "              [-I başlatmaDizgesi] [-H giriş_makinası] satır\n"
 "              bağlantı_hızı,... [terminalTürü]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "giriş: bellek az, giriş yapılamayabilir\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "ttyclass için bellek ayrılamadı"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "grplist için bellek ayrılamadı"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "%s üzerinden %s makinasına girişe öntanımlı olarak izin verilmedi.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "%s üzerinden %s makinasına girişe izin verilmedi.\n"
@@ -6404,8 +6270,8 @@ msgstr "%s için kullanıcı bilgileri değiştiriliyor.\n"
 msgid "Password error."
 msgstr "Parola hatası."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Parola: "
@@ -6583,34 +6449,6 @@ msgstr "Listeyi görmek için %s -l kullanın.\n"
 msgid "No known shells.\n"
 msgstr "Kullanılabilecek kabuklar belirlenmemiş.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom açılamadı"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "/dev/urandom'dan rasgele veri okunamadı"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "%s okumak için açılamıyor"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "stat %s yapılamadı"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s doğru dosya kiplerine sahip değil"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "%s dosyasından veri okunamıyor"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6621,11 +6459,11 @@ msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 "Kullanımı: last [-#] [-f dosya] [-t tty] [-h makinaAdı] [kullanıcı ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  şu an sistemde"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6634,15 +6472,15 @@ msgstr ""
 "\n"
 "wtmp kayıtlarının başlangıcı: %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: bellek ayrılamadı.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6651,51 +6489,45 @@ msgstr ""
 "\n"
 "durduruldu: %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖLÜMCÜL: tty tekrar açılamıyor: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ÖLÜMCÜL: tty hatalı"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sadece root tarafından kullanılabilir.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kullanımı: login [-fp] [kullanıcı]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM başlatılamadı: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Kullanıcı ismi: "
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN %1$d DEFA GİREMEDİ, %4$s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6704,17 +6536,17 @@ msgstr ""
 "Giriş başarısız\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN ÇOK FAZLA GİRİŞ DENEDİ (%1$d), %4$s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "%s MAKİNASINA %s İÇİN GİRİŞ OTURUMU KAPANDI, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6723,7 +6555,7 @@ msgstr ""
 "\n"
 "Giriş başarısız\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6732,136 +6564,121 @@ msgstr ""
 "\n"
 "Oturum ayarları sorunu, çıkılıyor.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "%s işlevinin %d. satırında kullanıcı ismi yok (NULL)."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 "%2$s işlevinin %3$d. satırında kullanıcı ismi \"%1$s\" geçersiz. Çıkılıyor."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Bellek yetersiz\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Kullanıcı ismi kuraldışı"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s için bu terminalden giriş reddedildi.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s İÇİN %s MAKİNASINDAN %s TERMİNALİNE GİRİŞ REDDEDİLDİ"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s İÇİN %s TERMİNALİNE GİRİŞ REDDEDİLDİ"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Giriş başarısız\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Kullanıcı sayısı sınırı aşıldı.\n"
-"Daha sonra tekrar deneyin.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Çalıştırabileceğiniz uygulama sayısını aştınız.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s ÜZERİNDEN %s İSMİYLE DIALUP"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ÜZERİNDEN %s MAKİNASINA ROOT GİRİŞİ"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ÜZERİNDE ROOT GİRİŞİ"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ÜZERİNDEN %s, %s MAKİNASINA GİRDİ"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ÜZERİNDEN %s SİSTEME GİRDİ"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Yeni e-postanız var.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "E-postanız var.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ast süreç oluşturma başarısız: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY başarısız: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "%s dizini yok!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ev dizini \"/\" ile giriş.\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kabuk betiği için bellek yetersiz.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kabuk betiği çalıştırılamadı: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: kabuk yok: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6870,65 +6687,65 @@ msgstr ""
 "\n"
 "%s kullanıcı ismi: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kullanıcı adınız çok uzun.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "İSİM çok uzun"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "kullanıcı isimleri bir '-' ile başlayamaz.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "çok fazla boş geçildi.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "HADDİNDEN FAZLA boş giriş"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Giriş %d saniye sonra zaman aşımına uğradı\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriş: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERİNDEN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%3$s %2$s MAKİNASINDAN %1$d KERE GİREMEDİ"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN %1$d KERE GİREMEDİ"
@@ -6948,169 +6765,30 @@ msgstr "Başkaları uçbirime yazamaz.\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Kullanımı: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Siz kim siniz?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: Böyle bir grup yok."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Erişim engellendi"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Kabuk yok"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Parola en az 6 karakter uzunlukta olmalıdır, tekrar deneyin.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Bir parola bu karakter gruplarının en az ikisindeki karakterleri\n"
-"içermelidir: büyük ve küçük harfler, rakamlar, işaretler.\n"
-"Daha fazla bilgi için: 'man 1 passwd'\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Eski parolanızı yeniden kullanamazsınız.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Lütfen parola olarak kullanıcı adınız gibi şeyleri kullanmayınız!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Lütfen parola olarak ad-soyadı gibi şeyleri kullanmayınız!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Kullanımı: passwd [kullanıcıİsmi [parola]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr "Argümanlı kullanım sadece root için mümkündür.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Kullanımı: passwd [-foqsvV] [kullanıcı [parola]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "%s çalıştırılamıyor: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "Kullanıcı ismi bulunamıyor"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Diğerlerinin parolasını sadece root değiştirebilir.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Çok fazla argüman belirtildi.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Kullanıcı ismi hiçbir yerde bulunamıyor. `%s' gerçekten bir kullanıcı ismi "
-"mi?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Sadece yerel parolalar değiştirilebilir. Bunun yerine yppasswd kullanın."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "Kullanıcı kimliği ile kullanıcı ismi uyuşmuyor, sahtekar!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "%s için parola değiştiriliyor\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Eski parolanızı yazınız: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Kuraldışı parola."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Yeni parolanızı yazınız: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Parola değiştirildi."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Yeni parolanızı tekrar yazınız: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Yanlış yazdınız. Parola değiştirilmedi."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "%s için parola değiştirildi"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT PAROLASI DEĞİŞTİRİLDİ"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "%s için parola root tarafından değiştirildi"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "parolayı kaydetmek için setpwnam çağrılıyor.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Parola değiştirilmedi! Daha sonra tekrar deneyin.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Parola değiştirildi.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7157,7 +6835,6 @@ msgstr "%s tarafından yaeniden başlatıldı: %s"
 msgid "halted by %s: %s"
 msgstr "%s tarafından kapatıldı: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7194,7 +6871,6 @@ msgstr "\"%s\" uygulaması çalıştırılıyor ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Çalıştırma sırasında hata\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7284,7 +6960,6 @@ msgstr "/dev/initctl üstünde close-on-exec ayarlanırken hata"
 msgid "error running finalprog\n"
 msgstr "uç uygulama çalıştırılırken hata\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "uç uygulama ast sürece alınırken hata\n"
@@ -7313,7 +6988,7 @@ msgstr "dizine geçilemedi\n"
 msgid "fork failed\n"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "çalıştırma başarısız\n"
 
@@ -7463,12 +7138,6 @@ msgstr "ay numarası kuraldışı: 1..12 arasında olmalı"
 msgid "illegal year value: use 1-9999"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7479,13 +7148,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "kullanımı: cal [-13smjyV] [[ay] yıl]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "kullanımı: %s [+biçem] [gün ay yıl]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "St. Tib Günü"
 
@@ -7617,7 +7285,7 @@ msgstr "%s: %s  %s olarak değiştirilemedi: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "çağrı: %s hangi dosyalarla çalışacak?\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7628,22 +7296,22 @@ msgstr ""
 "Gerçekten kullanmak istiyorsanız `%s [seçenekler] %s' ile kullanın.\n"
 "Betik başlatılmadı.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "kullanımı: script [-a] [-f] [-q] [-t] [dosya]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7652,254 +7320,253 @@ msgstr ""
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "pty sayısı yetersiz\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argüman hatası, kullanımı\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_ismi ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dökümDosyası ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekans_nr ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "ekonomi kipi denetim dışı\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl hatası: %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Ekran dökümü yazılırken hata\n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s okunamadı ve ioctl dökümlenemiyor\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM atanmamış.\n"
@@ -7974,10 +7641,6 @@ msgstr "uyarı: %s açılamıyor: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s açılamadı - yerine %s kullanılıyor\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8165,29 +7828,29 @@ msgid "; rest of file ignored"
 msgstr "; dosyanın kalanı yoksayıldı"
 
 #: mount/mount_blkid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error: the label %s occurs on both %s and %s\n"
-msgstr "mount: etiket %s hem %s hem de %s için görünüyor\n"
+msgstr "%s: error: etiket %s hem %s hem de %s için kullanılmış\n"
 
 #: mount/mount_blkid.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by UUID\n"
-msgstr "mount: %s %s tarafından bağlanıyor\n"
+msgstr "mount: %s UUID'sine göre bağlanıyor\n"
 
 #: mount/mount_blkid.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "mount: going to mount %s by label\n"
-msgstr "mount: %s %s tarafından bağlanıyor\n"
+msgstr "mount: %s etiketine göre bağlanıyor\n"
 
 #: mount/mount_by_label.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr "mount: %s açılamadı, UUID ve ETİKET dönüşümü yapılmış olmayabilir.\n"
+msgstr "%s: %s açılamadı, UUID ve LABEL dönüşümü yapılmış olmayabilir.\n"
 
 #: mount/mount_by_label.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad UUID"
-msgstr "mount: UUID hatalı"
+msgstr "%s: UUID hatalı"
 
 #: mount/mount.c:382
 #, c-format
@@ -8275,81 +7938,72 @@ msgstr "mount: hızı ayarlamak için %s açılamıyor"
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluşturulamıyor: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount sürüm 4 ile başarısız, 3 deneniyor...\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Dosya sistemi türü saptanamadı ve belirtilmemiş"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: bağlanamadı"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: bağlama noktası %s bir dizin değil"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: erişim engellendi"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: root tarafından kullanılmalı"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s meşgul"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc zaten bağlı"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: ya %s zaten bağlı ya da %s meşgul"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: bağlama noktası %s yok"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: bağlama noktası %s hiçbir yere sembolik bağ sağlamıyor"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: özel aygıt %s yok"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8358,12 +8012,12 @@ msgstr ""
 "mount: özel aygıt %s yok\n"
 "       (dosya yolu öneki bir dizin değil)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s zaten bağlı değil, ya da seçenek yanlış"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8372,7 +8026,7 @@ msgstr ""
 "mount: dosya sistemi türü yanlış, seçenek yanlış, %s üzerinde superblok\n"
 "       hatalı, karakter kümesi eksik, ya da başka bir hata olabilir"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -8380,7 +8034,7 @@ msgstr ""
 "       (fiilen ide-scsi kullanıldığına göre bu bir IDE aygıt\n"
 "        olabilir mi? Burada sr0, sda gibi birşeyler olmalı, değil mi?)"
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -8388,7 +8042,7 @@ msgstr ""
 "       (içindeki bir mantıksal disk bölümü yerine\n"
 "        bir ek disk bölümünü bağlamaya çalışmıyor musunuz?)"
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -8396,54 +8050,53 @@ msgstr ""
 "       Bazı durumlarda syslog'da bulunan bilgiler yararlıdır.\n"
 "       dmesg | tail  gibi birşeyler deneyin\n"
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "bağ tablosu dolu"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok okunamıyor"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: aygıt bilinmiyor"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: dosya sistemi türü '%s' bilinmiyor"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: herhalde %s kastettiniz"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: 'iso9660' kastetmiş olabilir misiniz?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: 'vfat' kastetmiş olabilir misiniz?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s yanlış aygıt numarasına sahip ya da dosya sistemi türü %s "
 "desteklenmiyor"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s bir blok aygıtı olmayabilir mi ve durum bilgileri alınamayabilir "
 "mi?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8452,73 +8105,68 @@ msgstr ""
 "mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
 "       (`insmod sürücü' denenebilir?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s bir blok aygıtı değil ( `-o loop' denenebilir mi?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bir blok aygıtı değil"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s geçerli bir blok aygıtı değil"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "blok aygıtı "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s yazma korumalı olduğu halde alenen `-w' seçeneği belirtilmiş"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: tür belirtilmemiş - '//' öneki içerdiğinden smbfs varsayılıyor\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: \"%s\" artalana alınıyor\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: \"%s\" bırakılıyor\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8570,34 +8218,34 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
 "Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluşturuluyor...\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: böyle bir disk bölümü yok"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s bağlanıyor\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "hiçbir şey bağlanmadı"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s  %s içinde bulunamıyor"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
@@ -8632,98 +8280,98 @@ msgstr "       %s türü denenecek\n"
 msgid "Trying %s\n"
 msgstr "%s deneniyor\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: makina:dizin argümanı gereğinden uzun\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: uyarı: çoklu makina isimleri desteklenmiyor\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: bağlanılacak dizin makina:dizin biçeminde değil\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: %s için adres alınamıyor\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: yanlış hp->h_length alındı\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: seçenek argümanı gereğinden uzun\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Uyarı: proto= seçeneği bilinmiyor.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Uyarı: namlen seçeneği desteklenmiyor.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "bilinmeyen nfs bağ parametresi: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Uyarı: nolock seçeneği desteklenmiyor.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "bilinmeyen nfs bağ seçeneği: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: yanlış hp->h_length alındı?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "TCP üzerinden NFS desteklenmiyor.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs soketi"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs sunucu servisi kullanımdışı olarak raporladı"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS portunu bulmak için portmapper kullanıldı\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "nfs artalan süreci için %d portu kullanılıyor\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs bağlantısı"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "bilinmeyen nfs durum sonuç değeri: %d"
@@ -8732,8 +8380,8 @@ msgstr "bilinmeyen nfs durum sonuç değeri: %d"
 msgid "bug in xstrndup call"
 msgstr "xstrndup çağrısında yazılım hatası"
 
-#: mount/swapon.c:57
-#, fuzzy, c-format
+#: mount/swapon.c:56
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8742,16 +8390,10 @@ msgid ""
 msgstr ""
 "kullanımı: %s [-hV]\n"
 "           %s -a [-e] [-v]\n"
-"           %s [-v] [-p öncelik] özel ...\n"
+"           %s [-v] [-p öncelik] özel|LABEL=oylum_ismi ...\n"
 "           %s [-s]\n"
-"  -h          bu yardım iletisini gösterir.\n"
-"  -V          sürüm bilgilerini gösterir.\n"
-"  -s          bağlı takas aygıtlarını listeler.\n"
-"  -a          /etc/fstab dosyasındaki takas aygıtlarını bağlar.\n"
-"  -p öncelik  öncelik 0 ile 32767 arasında bir değerdir.\n"
-"Takas öncelikleri için: 'man 2 swapon'\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8762,138 +8404,136 @@ msgstr ""
 "           %s -a [-v]\n"
 "           %s [-v] özel ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
-#, fuzzy, c-format
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
 msgid "%s: cannot find the device for %s\n"
-msgstr "%s: \"_stext\" %s içinde bulunamıyor\n"
+msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: mount/swapon.c:185
-#, fuzzy, c-format
+#: mount/swapon.c:184
+#, c-format
 msgid "%s: cannot stat %s: %s\n"
-msgstr "swapon: %s durum bilgileri alınamıyor: %s\n"
+msgstr "%s: %s durum bilgileri alınamıyor: %s\n"
 
-#: mount/swapon.c:196
-#, fuzzy, c-format
+#: mount/swapon.c:195
+#, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr "swapon: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
+msgstr "%s: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:208
-#, fuzzy, c-format
+#: mount/swapon.c:207
+#, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon: %s atlanıyor - delikler içeriyor gibi görünüyor.\n"
+msgstr "%s: %s atlanıyor - bazı delikler içeriyor gibi görünüyor.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "root değil.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: -f için destek içermeksizin derlenmiş\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ast süreç oluşturulamıyor: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "makina: %s, dizin: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: %s için adres alınamıyor\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: yanlış hostp->h_length alındı\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: blok aygıtı geçersiz"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: bağlanmadı"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superblok yazılamıyor"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: yok"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bağı kaldırmak için root gerekli"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "umount %s gerçekleştirilemedi- yerine %s deneniyor\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s salt okunur olarak yeniden bağlanamıyor\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8919,47 +8559,46 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" ayrılamaz\n"
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s bağlı değil (mtab içinde yok)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s fstab içinde yok (ve siz root değilsiniz)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sadece %1$s %3$s aygıtını %2$s dizininden ayırabilir"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -9109,15 +8748,16 @@ msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Kullanımı: %s [-c] [-n seviye] [-s tamponBoyu]\n"
 
 #: sys-utils/flock.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "flock: unknown option, aborting.\n"
-msgstr "%s: \"-%c\" diye bir seçenek bilinmiyor\n"
+msgstr "flock: bilinmeyen seçenek, çıkılıyor\n"
 
 #: sys-utils/flock.c:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
+"Kullanımı: flock [--shared | --timeout=saniye] dosyaismi komut {arg arg...}\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
@@ -9286,8 +8926,6 @@ msgstr "çekirdek paylaşımlı bellek için yapılandırılmamış\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Paylaşımlı Bellek Sınırları ----\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -10073,17 +9711,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e biçem] [-f biçemDosyası] [-n uzunluk] [-s atlanan] "
 "[dosya ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "kullanımı: %s [-dflpcsu] [+satırnum | +/kalıp] isim1 isim2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: \"-%c\" diye bir seçenek bilinmiyor\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10094,8 +9732,7 @@ msgstr ""
 "*** %s: dizin ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10106,45 +9743,45 @@ msgstr ""
 "******** %s: Bir metin dosyası değil ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Çıkmak için q ya da Q kullanın]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Başka--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Sonraki dosya: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Devam etmek için boşluk çubuğuna, çıkmak için 'q' tuşuna basınız.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...kalan %d sayfa"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...kalan 1 sayfa"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...bir satır atlanıyor"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...%d satır atlanıyor"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10154,7 +9791,7 @@ msgstr ""
 "***Kalan***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10166,7 +9803,7 @@ msgstr ""
 "parantezlerle belirtilenler öntanımlıdır. Yıldız (*) işareti yeni öntanımlı\n"
 "değer olacağını belirtir.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10212,34 +9849,34 @@ msgstr ""
 ":f             Dosya ismini ve satır numarasını gösterir\n"
 ".              Önceki komut tekrarlanır\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Yardım başlıkları için 'h' tuşuna basınız]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" satır %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Dosya değil] satır %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Taşma\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...atlanıyor\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Düzenli ifade acemice"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10247,15 +9884,15 @@ msgstr ""
 "\n"
 "Kalıp bulunamadı\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Kalıp bulunamadı"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10263,19 +9900,19 @@ msgstr ""
 "\n"
 "...Atlanıyor "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Dosyaya atlanıyor: "
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Önceki dosyaya atlanıyor: "
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Satır çok uzun"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Yerini alacak öncesinde bir komut yok"
 
@@ -10328,7 +9965,7 @@ msgstr "hexdump: biçem hatalı {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: dönüşüm karakteri %%%s hatalı.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10336,84 +9973,81 @@ msgstr ""
 "%s: Kullanımı: %s [-number] [-p dizge] [-cefnrs] [+satır] [+/kalıp/] "
 "[dosyalar]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: seçenek bir argümanla kullanılır -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: kuraldışı seçenek -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...ileri atlanıyor\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...geri atlanıyor\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Sonrasında dosya yok"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Öncesinde dosya yok"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s dosyasından okuma hatası\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s doyasında bilinmeyen hata\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: geçici dosya oluşturulamıyor.\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "RE hatası:"
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(DosyaSonu)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Arama dizgesi yok"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "Açılamıyor"
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "kaydedildi"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": rflag kipinde ! komutu kullanılmaz.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "Alt süreç oluşturulamadı, daha sonra tekrar deneyin\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Sonraki dosya: "
 
@@ -10428,14 +10062,14 @@ msgid "usage: rev [file ...]\n"
 msgstr "kullanımı: rev [dosya ...]\n"
 
 #: text-utils/tailf.c:53 text-utils/tailf.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open \"%s\" for read\n"
-msgstr "%s okumak için açılamıyor\n"
+msgstr "\"%s\" okumak için açılamıyor\n"
 
 #: text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: tailf logfile\n"
-msgstr "Kullanımı: %s [dosya]\n"
+msgstr "Kullanımı: tailf günlük_dosyası\n"
 
 #: text-utils/ul.c:141
 #, c-format
@@ -10467,6 +10101,157 @@ msgstr "Girdi satırı çok uzun.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Numara geçersiz: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Sözdizimi hatası: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Böyle bir parametre yok: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] aygıt isim\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] aygıt uzunluk sektor kafa iz gerilme boşluk oran özellik1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] aygıt\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] aygıt\n"
+
+#~ msgid "version"
+#~ msgstr "sürüm"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "/dev/urandom açılamadı"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "/dev/urandom'dan rasgele veri okunamadı"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "%s okumak için açılamıyor"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "stat %s yapılamadı"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s doğru dosya kiplerine sahip değil"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "%s dosyasından veri okunamıyor"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Kullanıcı sayısı sınırı aşıldı.\n"
+#~ "Daha sonra tekrar deneyin.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Çalıştırabileceğiniz uygulama sayısını aştınız.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Parola en az 6 karakter uzunlukta olmalıdır, tekrar deneyin.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Bir parola bu karakter gruplarının en az ikisindeki karakterleri\n"
+#~ "içermelidir: büyük ve küçük harfler, rakamlar, işaretler.\n"
+#~ "Daha fazla bilgi için: 'man 1 passwd'\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Eski parolanızı yeniden kullanamazsınız.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Lütfen parola olarak kullanıcı adınız gibi şeyleri kullanmayınız!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Lütfen parola olarak ad-soyadı gibi şeyleri kullanmayınız!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Kullanımı: passwd [kullanıcıİsmi [parola]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Argümanlı kullanım sadece root için mümkündür.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Kullanımı: passwd [-foqsvV] [kullanıcı [parola]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "%s çalıştırılamıyor: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Kullanıcı ismi bulunamıyor"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Diğerlerinin parolasını sadece root değiştirebilir.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Çok fazla argüman belirtildi.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "Kullanıcı ismi hiçbir yerde bulunamıyor. `%s' gerçekten bir kullanıcı "
+#~ "ismi mi?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Sadece yerel parolalar değiştirilebilir. Bunun yerine yppasswd kullanın."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "Kullanıcı kimliği ile kullanıcı ismi uyuşmuyor, sahtekar!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "%s için parola değiştiriliyor\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Eski parolanızı yazınız: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Kuraldışı parola."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Yeni parolanızı yazınız: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Parola değiştirildi."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Yeni parolanızı tekrar yazınız: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Yanlış yazdınız. Parola değiştirilmedi."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "%s için parola değiştirildi"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ROOT PAROLASI DEĞİŞTİRİLDİ"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "%s için parola root tarafından değiştirildi"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "parolayı kaydetmek için setpwnam çağrılıyor.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Parola değiştirilmedi! Daha sonra tekrar deneyin.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Parola değiştirildi.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
+
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Uyarı: %d bölümünden sonrakiler atlanıyor\n"
 
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 000000000..154e95226
--- /dev/null
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index b42b4a318..528a94636 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
 "PO-Revision-Date: 2004-02-24 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -114,7 +114,7 @@ msgstr "%s: помилка ioctl для %s\n"
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "Чт  ПоЧт  РзмС РзмБл    ПочСект    Розмір  Пристрій\n"
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr "Використання:\n"
@@ -158,13 +158,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr "використання: %s [ -n ] пристрій\n"
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
-#, c-format
-msgid "%s from %s\n"
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
 msgstr "%s з %s\n"
 
 #: disk-utils/fdformat.c:130
@@ -189,7 +188,7 @@ msgstr "Дві"
 msgid "Single"
 msgstr "Одна"
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -204,99 +203,99 @@ msgstr ""
 " -v         більше подробиць\n"
 " файл       файл для перевірки\n"
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr "%s: помилка %d при декомпресії! %p(%d)\n"
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr "%s: помилковий розмір у символічному посиланні `%s'\n"
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  розтискається блок з %ld до %ld (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr "%s: фіктивні права на `%s' (%o)\n"
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr "  дірка на %ld (%d)\n"
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr "%s: Не-блочні (%ld) байти\n"
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr "%s: Безрозмірні (%ld проти %ld) байти\n"
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr "%s: неправильний cramfs - помилкова довжина шляху\n"
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr "%s: скомпільовано без підтримки -x\n"
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr "%s: попередження - не вдається визначити розмір файлової системи\n"
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr "%s не є блочним пристроєм чи файлом\n"
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr "%s: неправильний cramfs - довжина файлу надто коротка\n"
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr "%s: неправильний cramfs - неправильна сигнатура\n"
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr "%s: попередження - довжина файлу надто велика, доповнений образ?\n"
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr "%s: неправильний cramfs - помилка контрольної суми\n"
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr "%s: попередження - старий тип cramfs образу, немає контрольної суми\n"
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr "%s: неправильний cramfs - неправильний суперблок\n"
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 "%s: неправильний cramfs - кінець даних каталогу (%ld) != початку файлових "
 "даних (%ld)\n"
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: неправильний cramfs - неправильний зсув файлових даних\n"
@@ -774,7 +773,7 @@ msgstr "надто багато вузлів - максимум 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "не вистачає простору, потрібно принаймні %lu блоків"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr "Пристрій: %s\n"
@@ -843,18 +842,18 @@ msgstr "помилка запису елемента '..'"
 msgid "error closing %s"
 msgstr "помилка закривання %s"
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Використання: mkfs [-V] [-t типФС] [параметри-ФС] пристрій [розмір]\n"
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Недостатньо пам'яті!\n"
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs версії %s (%s)\n"
@@ -917,7 +916,6 @@ msgstr ""
 "Перевищено MAXENTRIES. Збільште це значення у mkcramfs.c та перекомпілюйте.\n"
 "Завершення.\n"
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -972,10 +970,6 @@ msgstr "не вистачає простору для ROM образу (виді
 msgid "ROM image write failed (%d %d)\n"
 msgstr "помилка запису ROM обрізу (%d %d)\n"
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -1051,7 +1045,6 @@ msgstr "не вдається записати вузли"
 msgid "write failed in write_block"
 msgstr "помилка запису у функції write_block"
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1087,7 +1080,7 @@ msgstr "помилка позиціювання при перевірці бло
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Незрозуміле значення у функції do_check: можливо помилка\n"
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr "помилка позиціювання у функції check_blocks"
 
@@ -1129,107 +1122,107 @@ msgstr "не вдається запустити %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "файлова система не буде створена на '%s'"
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Неправильний вказаний користувачем розмір сторінки %d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Використовується вказаний користувачем розмір сторінки %d, замість системних "
 "значень %d/%d\n"
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Передбачається розмір сторінки %d (а не %d)\n"
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "етикетка"
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr "Використання: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/назва [блоки]\n"
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr "надто багато пошкоджених сторінок"
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr "одна пошкоджена сторінка\n"
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d пошкоджених сторінок\n"
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: помилка: Не вказано де створити підкачку?\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, fuzzy, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: помилка: розмір %ld більший ніж розмір пристрою %d\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: помилка: невідома версія %d\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: помилка: область підкачки повинна бути принаймні %ldкб\n"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: попередження: область підкачки відсікається до %ldкб\n"
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr "%s: помилка: Не вказано де створити підкачку?\n"
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Не буде створено пристрій підкачки на '%s'"
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr "фатальна помилка: не вдається прочитати першу сторінку"
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1243,123 +1236,85 @@ msgstr ""
 "на цьому розділі, тоді використовуйте параметр -f для примусового "
 "створення.\n"
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr "не вдається встановити простір підкачки: не вдається прочитати"
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Встановлюється область підкачки версії %d, розмір = %llu кб\n"
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr "помилка позиціювання на початок пристрою підкачки"
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr "не вдається записати сторінку підпису"
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr "помилка виконання fsync"
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr "Неправильне число: %s\n"
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr "Синтаксична помилка: '%s'\n"
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr "Немає такого набору параметрів: '%s'\n"
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr "   %s [ -p ] пристрій назва\n"
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] пристрій розмір сект головок доріжок stretch gap rate spec1 "
-"fmt_gap\n"
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "   %s [ -c | -y | -n | -d ] пристрій\n"
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "   %s [ -c | -y | -n ] пристрій\n"
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr "Не використано"
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr "Вільний простір"
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux JFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Диск було змінено.\n"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Перезавантажте систему щоб впевнитись, що таблиця розділів коректно "
 "оновлена.\n"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1372,340 +1327,321 @@ msgstr ""
 "DOS 6.x розділи, перегляньте man сторінку з cfdisk\n"
 "щоб отримати докладнішу інформацію.\n"
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr "ФАТАЛЬНА ПОМИЛКА"
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr "Натисніть будь-яку клавішу для завершення cfdisk"
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr "не вдається прочитати дисковий пристрій"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr "не вдається записати на дисковий пристрій"
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr "Надто багато розділів"
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr "Розділ починається перед сектором 0"
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr "Розділ закінчується перед сектором 0"
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr "Розділ починається після кінця диску"
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr "Розділ закінчується після кінця диску"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr "Розділ закінчується у останньому неповному циліндрі"
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr "логічні розділи не у тому порядку як на диску"
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr "логічні розділи перекриваються"
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr "збільшені логічні розділи перекриваються"
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Внутрішня помилка створення логічного пристрою без розширеного "
 "розділу !!!!"
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "не вдається створити тут логічний пристрій -- буде створено два розширених "
 "розділи"
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr "Пункт меню надто довгий. Меню виглядатиме дивно."
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Меню без орієнтації. Типова орієнтація - горизонтальна."
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr "Неправильний ключ"
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr "Натисніть будь-яку клавішу для продовження"
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr "Первинний"
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr "Створити новий розділ"
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr "Логічний"
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr "Створити новий логічний пристрій"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr "Не створювати розділ"
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr "!!! Внутрішня помилка !!!"
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr "Розмір (у MB): "
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr "Початок"
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr "Додати розділ на початку вільного простору"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr "Кінець"
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr "Додати розділ наприкінці вільного простору"
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr "Недостатньо простору для створення розширеного розділу"
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "відсутня таблиця розділів.\n"
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Немає таблиці розділів або невідома сигнатура таблиці розділів"
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Просто вивести таблицю розділів"
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "відсутня таблиця розділів.\n"
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Бажаєте почати з нульової таблиці [y/N] ?"
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ви вказали більше циліндрів ніж є на диску"
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr "не вдається відкрити пристрій диску"
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Відкритий диск лише для читання - у вас немає прав для запису"
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr "не вдається отримати розмір диску"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr "Неправильний первинний розділ"
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr "Неправильний логічний розділ"
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Увага!! Це може знищити дані на диску!"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Ви впевнені, що бажаєте записати таблицю розділів на диск? (yes або no): "
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr "Не записувати таблицю розділів на диск"
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr "Введіть `yes'(так) або `no'(ні)"
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr "Записується таблиця розділів на диск..."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr "Таблиця розділів записана на диск"
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Таблиця розділів записана, але виникла помилка при її перечитуванні. "
 "Перезавантажтесь для оновлення таблиці."
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Немає первинних розділів позначених як завантажувальні. DOS MBR не зможе "
 "завантажуватись."
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Більш ніж один розділ позначений як завантажувальний. DOS MBR не зможе "
 "завантажуватись."
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Введіть назву файлу або натисніть Enter, щоб відобразити екран: "
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "не вдається відкрити файл '%s'"
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Дисковий пристій: %s\n"
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr "Сектор 0:\n"
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Сектор %d:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr "   Немає    "
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr "   Перв/Лог "
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr "   Первинний"
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr "   Логічний "
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Заван."
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr "Немає"
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Таблиця розділів для %s\n"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr "            Перший    Останній\n"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 " # Тип      Сектор   Сектор   Зсув    Довжина  Тип файл. системи(ID) Ознаки\n"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1713,469 +1649,466 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Початок---       ----Кінець----   Початк.   Кільк.\n"
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Ознак Гол  Сект Цил   ID  Гол  Сект Цил    Сектор  Секторів\n"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr "Неформатов."
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr "Вивести таблицю у 'неформатованому' вигляді"
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr "Сектори"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr "Вивести таблицю сортовану за секторами"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr "Таблиця"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr "Просто вивести таблицю розділів"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr "Не виводити таблицю"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr "Екран з довідкою для cfdisk"
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Це cfdisk - консольна програма роботи з розділами на базі curses, яка"
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "дозволяє створювати, видаляти та змінювати розділи вашого"
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr "жорсткого диску."
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr "Команда      Призначення"
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr "-------      -----------"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Перемикнути ознаку завантаження поточного розділу"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr "  d          Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Змінити параметри: циліндри, головки, сектори-на-доріжку"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             УВАГА: Цей параметр повинен використовуватись лише людьми"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr "             які знають, що вони роблять."
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr "  h          Вивести цю довідку"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Максимізувати використання диску поточним розділом"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Зауважте: це може зробити розділ несумісним з"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr "  n          Створити новий розділ у вільному просторі"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Вивести таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr "             Є декілька форматів виводу розділів:"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - не форматовані дані (у вигляді, в якому вони запишуться "
 "на диск)"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Таблиця сортована по секторам"
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr "                t - таблиця не форматованих даних"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Вийти з програми без запису таблиці розділів"
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr "  t          Змінити тип файлової системи"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Змінити одиниці вимірювання розміру розділів"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Перемикає між Мб, секторами та циліндрами"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Записати таблицю розділів на диск ( W повинен бути в верхньому "
 "регістрі)"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Це може зруйнувати дані на диску, тому необхідно або"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             підтвердити або відмовитись від запису набравши `yes' чи "
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "СтрілкаВгору Перемістити курсор на попередню позицію"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "СтрілкаВниз  Перемістити курсор у наступну позицію"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Оновлює вміст екрану"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr "  ?          Виводить цю довідку"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Зауважте: Всі команди вводяться або у нижньому або у верхньому"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr "регістрах (за винятком (W)запису)."
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr "Циліндрів"
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr "Змінити геометрію циліндру"
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr "Головки"
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr "Змінити геометрію головки"
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr "Змінити геометрію сектору"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr "Виконано"
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr "Завершити зміну геометрії"
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr "Введіть кількість циліндрів: "
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr "Недопустиме значення циліндрів"
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr "Введіть геометрію головок: "
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr "Недопустиме значення головок"
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr "Введіть кількість секторів на доріжку: "
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr "Недопустиме значення секторів"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr "Введіть тип файлової системи: "
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr "Тип ФС не може бути порожнім"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr "Не можна змінювати тип ФС на розширений"
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Невід(%02X)"
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ", НК"
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr "НК"
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr "Перв/Лог"
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Невідомий (%02X)"
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Пристій диску: %s"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Розмір: %lld байт, %lld Мб"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Розмір: %lld байт, %lld.%lld Гб"
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Головок: %d   Секторів на доріжку: %d   Циліндрів: %lld"
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr "Назва"
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr "Ознаки"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr "Тип розд."
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr "Тип ФС"
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr "[Позначка]"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr "   Секторів"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr "  Циліндрів"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr "Розмір (Мб)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr "Розмір (Гб)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr "Завантаж."
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr "Перемикнути ознаку завантаження поточного розділу"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr "Видалити"
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr "Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr "Геометрія"
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr "Змінити геометрію диску (лише для фахівців)"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr "Довідка"
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr "Вивести вікно з довідкою"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr "Максимум"
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Максимізувати використання диску поточним розділом (для фахівців)"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr "Новий"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr "Створити новий розділ у вільному просторі"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr "Вивести"
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr "Вивести таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr "Вихід"
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr "Вийти з програми без запису таблиці розділів"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr "Тип"
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Змінити тип файлової системи (DOS, Linux, OS/2 та ін.)"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr "Одиниці"
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Змінити одиниці вимірювання розмірів розділу (МБ. сект, цил)"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr "Записати"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Записати таблицю розділів на диск (може зіпсувати дані)"
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr "не вдається зробити розділ завантажувальним"
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr "не вдається видалити порожній розділ"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr "не вдається максимізувати цей розділ"
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr "Цей розділ не використовується"
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr "Цей розділ вже використовується"
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr "не вдається змінити тип порожнього розділу"
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr "Немає більше розділів"
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr "Неправильна команда"
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2246,9 +2179,9 @@ msgstr ""
 "\n"
 "BSD етикетка пристрою: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr "Команда дія"
 
@@ -2268,10 +2201,9 @@ msgstr "   i   встановити bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   перелік відомих типів файлових систем"
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr "   m   вивести це меню"
 
@@ -2283,14 +2215,14 @@ msgstr "   n   додати новий BSD розділ"
 msgid "   p   print BSD partition table"
 msgstr "   p   вивести таблицю розділів BSD"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr "   q   вийти без збереження змін"
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr "   r   повернутись до головного меню"
 
@@ -2333,13 +2265,13 @@ msgstr "Немає *BSD розділів на %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Команда режиму BSD етикетки диску (m - довідка): "
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Перший %s"
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Останній %s або +size або +sizeM або +sizeK"
@@ -2384,8 +2316,6 @@ msgstr " ecc"
 msgid " badsect"
 msgstr " пошк.сект"
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2486,8 +2416,8 @@ msgstr "секторів/доріжку"
 msgid "tracks/cylinder"
 msgstr "доріжок/циліндр"
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr "циліндри"
 
@@ -2544,7 +2474,7 @@ msgstr "Встановлено у %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Розділ (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Вже створено максимальну кількість розділів\n"
@@ -2568,7 +2498,7 @@ msgstr ""
 "\n"
 "Синхронізуються диски.\n"
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2588,7 +2518,7 @@ msgstr ""
 "-u: виводити початковий та кінцевий сектори (замість циліндрів)\n"
 "-b 2048: (для деяких MO дисків) використовуються 2048-байтові сектори\n"
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2604,198 +2534,184 @@ msgstr ""
 "  або: fdisk /dev/rd/c0d0  або: fdisk /dev/ida/c0d0  (RAID пристрої)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "не вдається прочитати %s\n"
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "не вдається перейти на %s\n"
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "не вдається записати %s\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "помилка BLKGETSIZE ioctl на %s\n"
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr "не вдається виділити додаткову пам'ять\n"
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr "Фатальна помилка\n"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr "   a   перемикнути ознаку лише-для-читання"
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr "   b   редагувати bsd етикетку диску"
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr "   c   перемикнути ознаку монтування"
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr "   d   видалити розділ"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr "   l   перелік відомих типів розділів"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr "   n   додати новий пристрій"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   створити нову порожню DOS таблицю розділів"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr "   p   вивести таблицю розділів"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   створити нову порожню Sun етикетку диску"
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr "   t   змінити системний ідентифікатор розділу"
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr "   u   змінити одиниці відображення/вводу"
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr "   v   перевірити таблицю розділів"
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr "   w   записати таблицю на диск та вийти"
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   додаткова функціональність (для фахівців)"
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr "   a   вибрати завантажувальний розділ"
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr "   b   редагувати елемент завантажувального файлу"
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr "   c   вибрати sgi розділ підкачки"
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr "   a   перемикнути ознаку завантаження"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   перемикнути ознаку сумісності з dos"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   змінити кількість запасних циліндрів"
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr "   c   змінити кількість циліндрів"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   вивести таблицю розділів у не форматованому вигляді"
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e  змінити кількість додаткових секторів на циліндр"
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr "   h   змінити кількість головок"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr "   i   змінити фактор чергування"
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   змінити швидкість обертання (rpm)"
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr "   s   змінити кількість секторів/доріжку"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr "   y   змінити кількість фізичних циліндрів"
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   перемістити початок даних розділу"
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr "   e   вивести список розширених розділів"
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   створити IRIX (SGI) таблицю розділів"
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr "   f   виправити порядок розділів"
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr "Необхідно встановити"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr "головки"
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr "сектори"
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2804,11 +2720,11 @@ msgstr ""
 "%s%s.\n"
 "Ви можете зробити це з меню додаткових функцій.\n"
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr " та "
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2827,29 +2743,29 @@ msgstr ""
 "2) завантаженням та зміною розділів з інших операційних систем\n"
 "   (наприклад, DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Неправильний зсув у головному розширеному розділі\n"
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Попередження: додатковий вказівник у таблиці розділів %d\n"
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Попередження: додаткові дані у таблиці розділів проігноровано %d\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2862,17 +2778,17 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Примітка: розмір сектору %d (не %d)\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Ви не зможете записати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -2881,7 +2797,7 @@ msgstr ""
 "Цей диск має як DOS сигнатуру, так і BSD.\n"
 "Дайте команду 'b', щоб перейти у BSD режим.\n"
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2890,17 +2806,17 @@ msgstr ""
 "Пристрій не містить ані правильної DOS таблиці розділів, ані Sun, SGI чи OSF "
 "етикетки диску\n"
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr "Внутрішня помилка\n"
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Додаткові розширені розділи ігноруються %d\n"
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2909,7 +2825,7 @@ msgstr ""
 "Попередження: неправильна ознака 0x%04x таблиці розділів %d буде виправлена "
 "при w(запису)\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
@@ -2918,83 +2834,83 @@ msgstr ""
 "\n"
 "тричі отримано EOF - завершення..\n"
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr "Шістнадцятковий код (наберіть L щоб переглянути перелік кодів)"
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, типово %u): "
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Використовується типове значення %u\n"
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Значення за межами діапазону.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr "Номер розділу"
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Попередження: розділ %d має порожнє поле типу\n"
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Вибраний розділ %d\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ще не визначено жодного розділу!\n"
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Всі первинні розділи вже були визначені!\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr "циліндр"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr "сектор"
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Змінюються одиниці відображення/вводу на %s\n"
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "УВАГА: Розділ %d є розширеним розділом\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr "Ознаку сумісності з DOS встановлено\n"
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Ознаку сумісності з DOS не встановлено\n"
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Розділ %d ще не існує!\n"
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3007,7 +2923,7 @@ msgstr ""
 "можливо, нерозсудливо. Ви можете видалити\n"
 "розділ використовуючи команду `d'.\n"
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3016,7 +2932,7 @@ msgstr ""
 "Не можна перетворювати первинний розділ у розширений, або навпаки\n"
 "Спочатку видаліть його.\n"
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3027,7 +2943,7 @@ msgstr ""
 "тому що на це покладаються SunOS/Solaris, та Linux також це сприймає.\n"
 "\n"
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3038,52 +2954,52 @@ msgstr ""
 "та розділу 11 на весь том (6), тому що IRIX на це покладається.\n"
 "\n"
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Змінено тип системи розділу %d на %x (%s)\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "У розділу %d відрізняються фізичний та логічний початок (не-Linux?):\n"
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     фіз=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "логічний=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "У розділу %d відрізняються фізичний та логічний кінці:\n"
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Розділ %i не починається на межі циліндру:\n"
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "повинно бути (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Розділ %i не закінчується на межі циліндру.\n"
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "повинно бути (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
@@ -3092,7 +3008,7 @@ msgstr ""
 "\n"
 "Диск %s: %ld Мб, %lld байт\n"
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
@@ -3101,17 +3017,17 @@ msgstr ""
 "\n"
 "Диск %s: %ld.%ld Гб, %lld байт\n"
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d головок, %d секторів/доріжку, %d циліндрів"
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", загалом %llu секторів"
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -3120,7 +3036,7 @@ msgstr ""
 "Одиниці виміру = %s з %d * %d = %d байт\n"
 "\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3129,7 +3045,7 @@ msgstr ""
 "Немає що робити. Порядок вже коректний.\n"
 "\n"
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3137,16 +3053,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Завант  Початок     Кінець     Блоків  Ід  Система\n"
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr "Пристрій"
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
@@ -3155,7 +3071,7 @@ msgstr ""
 "\n"
 "Елементи таблиці розділів не у тому порядку, як на диску\n"
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -3166,83 +3082,83 @@ msgstr ""
 "Диск %s: %d головок, %d секторів, %d циліндрів\n"
 "\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "№ Акт Гол Сек Цил Гол Сек  Цил  Початок   Розмір Ід\n"
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Попередження: розділ %d містить нульовий сектор\n"
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Розділ %d: головка %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Розділ %d: сектор %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Розділ %d: циліндр %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Розділ %d: кількість попередніх секторів %d відрізняється від загальної %d\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Попередження: неправильна область початку даних у розділі %d\n"
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Попередження: розділ %d перекривається з розділом %d.\n"
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Попередження: розділ %d порожній\n"
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Логічний розділ %d не вміщується цілком у розділ %d\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, fuzzy, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Загальна кількість розподілених секторів %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, fuzzy, c-format
 msgid "%lld unallocated sectors\n"
 msgstr "%d нерозподілених секторів\n"
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Розділ %d вже визначений.  Видаліть його перед повторним додаванням.\n"
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Немає наявних вільних секторів\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3255,23 +3171,23 @@ msgstr ""
 "\tDOS таблицю розділів. (Використовуйте команду o.)\n"
 "\tЗАСТЕРЕЖЕННЯ: Це призведе до знищення поточного вмісту диску.\n"
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Спочатку необхідно видалити деякий розділ та додати розширений розділ\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "логічні розділи не у тому порядку як на диску"
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Неправильний первинний розділ"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3282,20 +3198,20 @@ msgstr ""
 "   %s\n"
 "   p   первинний розділ (1-4)\n"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr "l   логічний (5 або більше)"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr "e   розширений"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Неправильний номер розділу для типу `%c'\n"
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3304,12 +3220,12 @@ msgstr ""
 "Таблиця розділів була змінена!\n"
 "\n"
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Викликається ioctl(), щоб перечитати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3322,7 +3238,7 @@ msgstr ""
 "Ядро досі використовує стару таблицю розділів.\n"
 "Нова таблиця розділів використовуватиметься після перезавантаження.\n"
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3335,75 +3251,75 @@ msgstr ""
 "розділи, перегляньте man-сторінку з fdisk для отримання додаткової\n"
 "інформації.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Помилка закривання %s\n"
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Синхронізація дисків.\n"
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Розділ %d не має області даних\n"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr "Новий початок даних"
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr "Команди експертного режиму(m - довідка): "
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr "Кількість циліндрів"
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr "Кількість головок"
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr "Кількість секторів"
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Попередження: встановлюється зсув сектору для сумісності з DOS\n"
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Диск %s не містить правильної таблиці розділів\n"
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: невідома команда\n"
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Це ядро визначає розмір сектору саме, тому -b параметри проігноровано\n"
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3412,17 +3328,16 @@ msgstr ""
 "Попередження: з вказаним пристроєм повинен використовуватись параметр -b "
 "(встановити розмір сектора)\n"
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Знайдено OSF/1 етикетку диску на %s, перехід у режим етикетки диску.\n"
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr "Команда (m - довідка): "
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3431,16 +3346,16 @@ msgstr ""
 "\n"
 "Поточний файл завантаження: %s\n"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr "Введіть назву нового файлу завантаження: "
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Файл завантаження не змінено\n"
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3507,15 +3422,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3594,7 +3509,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s сектор%5u розмір%8u\n"
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3651,7 +3565,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Присутній більш ніж один елемент диску.\n"
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Не визначено розділів\n"
@@ -3736,7 +3650,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tВи вибрали незвичайну назву файлу завантаження.\n"
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3756,11 +3669,10 @@ msgstr ""
 "Не дотримуватись цього можуть лише \"SGI volume\" на весь диск.\n"
 "Введіть YES, якщо ви впевнені, що хочете позначити цей розділ по-іншому.\n"
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr "YES\n"
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3834,44 +3746,43 @@ msgstr "Спроба зберегти параметри розділу %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ІД=%02x\tПОЧАТОК=%d\tДОВЖИНА=%d\n"
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr "Порожн"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr "Весь диск"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3884,12 +3795,12 @@ msgstr ""
 "такі як головки, сектори, циліндри та розділи\n"
 "або примусово очистити етикетку (команда s у головному меню)\n"
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Автоматичне визначення знайшло %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3902,7 +3813,7 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3912,72 +3823,72 @@ msgstr ""
 "   ?   авто конфігурація\n"
 "   0   власний (з автоматично знайденими типовими значеннями)"
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Виберіть тип (? автоматично, 0 власний): "
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr "Помилка при автоматичному визначенні.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr "Секторів/доріжку"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr "Запасні циліндри"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr "Фізичні сектори"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr "Швидкість обертання (об/хв)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr "Фактор чергування"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr "Додаткових секторів у циліндрі"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr "Ви можете змінити всі параметри диску з меню x"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" дискета"
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Розділ %d не закінчується на межі циліндру\n"
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Розділ %d перекривається з іншим у секторах %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Невикористаний простір - сектори 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Невикористаний простір - сектори %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -3986,7 +3897,7 @@ msgstr ""
 "Інші розділи вже займають весь диск.\n"
 "Видаліть частину/зменшіть їх розмір перед спробою.\n"
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3997,7 +3908,7 @@ msgstr ""
 "%d %s перекриває деякий інший розділ. Ваш елемент було змінено\n"
 "на %d %s\n"
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4007,7 +3918,7 @@ msgstr ""
 "як\n"
 "весь диск(5), починаючи з 0, розміром %u секторів\n"
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4021,7 +3932,7 @@ msgstr ""
 "Введіть YES, якщо ви справді впевнені, що бажаєте позначити розділ\n"
 "типом 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -4040,7 +3951,7 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -4053,16 +3964,16 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Ознака Початок    Кінець     Блоки   Ід  Система\n"
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr "Кількість запасних циліндрів"
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr "Кількість фізичних циліндрів"
 
@@ -4086,32 +3997,26 @@ msgstr "FAT16 <32M"
 msgid "Extended"
 msgstr "Extended"
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr "FAT16"
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr "AIX"
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr "AIX bootable"
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr "OS/2 Boot Manager"
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
@@ -4120,7 +4025,6 @@ msgstr "W95 FAT32"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
@@ -4213,12 +4117,10 @@ msgstr "OnTrack DM"
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
@@ -4239,8 +4141,6 @@ msgstr "Golden Bow"
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -4250,7 +4150,6 @@ msgstr "SpeedStor"
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD or SysV"
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
@@ -4271,12 +4170,10 @@ msgstr "PC/IX"
 msgid "Old Minix"
 msgstr "Old  Minix"
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 #, fuzzy
 msgid "Linux swap / Solaris"
@@ -4307,12 +4204,10 @@ msgstr "Amoeba"
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr "BSD/OS"
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
@@ -4321,7 +4216,6 @@ msgstr "IBM Thinkpad hibernation"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr "OpenBSD"
@@ -4387,30 +4281,22 @@ msgstr "Не-ФС дані"
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr "Dell Utility"
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr "BootIt"
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr "BeOS fs"
@@ -4419,117 +4305,110 @@ msgstr "BeOS fs"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC boot"
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr "LANstep"
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "помилка позиціювання %s - не вдається перейти на %lu\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "помилка позиціювання: очікувалось 0x%08x%08x, отримано 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr "недостатньо пам'яті - відмова\n"
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "помилка читання %s - не вдається прочитати сектор %lu\n"
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ПОМИЛКА: сектор %lu немає msdos сигнатури\n"
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "помилка запису на %s - не вдається записати сектор %lu\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "не вдається відкрити файл збереження сектору розділу (%s)\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr "помилка запису на %s\n"
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "не вдається отримати інформацію про файл відновлення розділу (%s)\n"
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "файл відновлення розділу має неправильний розмір - відміна відновлення\n"
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr "недостатньо пам'яті\n"
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "не вдається відкрити файл відновлення (%s)\n"
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr "помилка читання %s\n"
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "не вдається відкрити пристрій %s для запису\n"
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "помилка запису сектору %lu на %s\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Диск %s: не вдається отримати геометрію\n"
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Диск %s: не вдається отримати розмір\n"
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4540,22 +4419,22 @@ msgstr ""
 "Використання fdisk для нього мабуть безглуздо..\n"
 "[Використовуйте параметр --force, якщо ви дійсно цього бажаєте]\n"
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Попередження: HDIO_GETGEO вказує, що є %lu головок\n"
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Попередження: HDIO_GETGEO вказує, що є %lu секторів\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Попередження: BLKGETSIZE/HDIO_GETGEO вказує, що є %lu циліндрів\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4565,7 +4444,7 @@ msgstr ""
 "63\n"
 "Це буде спричиняти проблеми з усім ПЗ, яке використовує C/H/S адресацію.\n"
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
@@ -4574,7 +4453,7 @@ msgstr ""
 "\n"
 "Диск %s: %lu циліндрів, %lu головок, %lu секторів/доріжку\n"
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4582,7 +4461,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості головок: %lu (мусить бути 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4591,7 +4470,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості секторів: %lu (мусить бути "
 "1-%lu)\n"
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4600,7 +4479,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості циліндрів: %lu (мусить бути "
 "0-%lu)\n"
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -4609,12 +4488,12 @@ msgstr ""
 "Ідентиф. Назва\n"
 "\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Перечитується таблиця розділів ...\n"
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4622,31 +4501,31 @@ msgstr ""
 "Команда перечитування таблиці розділів завершилась аварійно\n"
 "Перезавантажте систему перед використанням mkfs\n"
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Помилка закривання %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: немає такого розділу\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr "нерозпізнаний формат - використовуються сектори\n"
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# таблиця розділів диску %s\n"
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "нереалізований формат - використовується %s\n"
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4655,12 +4534,12 @@ msgstr ""
 "Одиниці виміру = циліндри по %lu байт, блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "Пристрій Завант Початок Кінець Циліндрів Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4669,12 +4548,12 @@ msgstr ""
 "Одиниці виміру = сектори по 512 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "Пристрій Завант Початок    Кінець   Секторів  Ід  Система\n"
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4683,12 +4562,12 @@ msgstr ""
 "Одиниця виміру = блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "Пристрій Завант Початок   Кінець     Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4698,32 +4577,32 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  Пристрій Завант Початок Кінець Мб     Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tпочаток: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tкінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ закінчується на циліндрі  %ld, за межею обсягу диску\n"
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr "Не знайдено розділів\n"
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4734,51 +4613,51 @@ msgstr ""
 "  для C/H/S=*/%ld/%ld (замість %ld/%ld/%ld).\n"
 "Для цього виводу вважатиметься ця геометрія.\n"
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr "відсутня таблиця розділів.\n"
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "дивно, визначено лише %d розділів.\n"
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Попередження: розділ %s має розмір 0, але не позначений порожнім\n"
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Попередження: розділ %s має розмір 0 та позначений завантажувальним\n"
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Попередження: розділ %s має розмір 0 але починається не з нуля\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Попередження: розділ %s "
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "не розташований у розділі %s\n"
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Попередження: розділи %s "
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr "та %s перекриваються\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4787,17 +4666,17 @@ msgstr ""
 "Попередження: розділ %s містить частину таблиці розділів (сектор %lu),\n"
 "та її буде знищено при його заповненні\n"
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Попередження: розділ %s починається з сектор 0\n"
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Попередження: розділ %s поширюється за межі диску\n"
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4805,17 +4684,17 @@ msgstr ""
 "Крім первинних розділів, принаймні один може бути розширеним\n"
 " (хоча це не проблема для Linux)\n"
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Попередження: розділ %s починається не з межі циліндра\n"
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Попередження: розділ %s не закінчується на межі циліндра\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4825,7 +4704,7 @@ msgstr ""
 "Це не має значення для Lilo, але DOS MBR не зможе завантажуватись з цього "
 "диску.\n"
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4833,7 +4712,7 @@ msgstr ""
 "Попередження: зазвичай можна завантажуватись лише з первинних розділів\n"
 "LILO не звертає уваги на ознаку `завантажувальний'.\n"
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4842,11 +4721,11 @@ msgstr ""
 "(активним)\n"
 "Це несуттєво для LILO, але DOS MBR не зможе завантажуватись з цього диску.\n"
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr "початок"
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4854,22 +4733,22 @@ msgstr ""
 "розділ %s: початок: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%"
 "ld)\n"
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr "кінець"
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "розділ %s: кінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ %s закінчується на циліндрі %ld, за межами диску\n"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4878,7 +4757,7 @@ msgstr ""
 "Попередження: зміщено початок розширеного розділу з %ld на %ld\n"
 "(Лише для відображення. Не змінюйте вміст.)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4886,133 +4765,132 @@ msgstr ""
 "Попередження: розширений розділ не починаєтеся на межі циліндра.\n"
 "DOS та Linux будуть інтерпретувати вміст по-різному.\n"
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "надто багато розділів - ігнорується попередній nr (%d)\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr "дерево розділів?\n"
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "знайдено Disk Manager - це нне вдаєтьсяобробити\n"
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr "знайдено DM6 сигнатуру - відміна операції\n"
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "дивно..., розширений розділ нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "дивно..., BSD розмір нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: нерозпізнаний розділ\n"
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr "вказано параметр -n: Нічого не змінено\n"
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "не вдається зберегти старі сектори - виконання перервано\n"
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "не вдається записати розділ на %s\n"
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr "довгий або незавершений вхідний рядок - завершення\n"
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "помилка вводу: очікувався символ `=' після поля %s\n"
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "помилка вводу: очікувався символ %c після поля %s\n"
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "нерозпізнаний ввід: %s\n"
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr "число занадто велике\n"
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr "не цифри після числа\n"
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr "немає місця для дескриптору розділу\n"
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr "не вдається створити оточуючий розширений розділ\n"
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr "надто багато вхідних полів\n"
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr "Немає більше місця\n"
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr "Недопустимий тип\n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Попередження: вказаний розмір (%lu) перевищує допустимий розмір (%lu)\n"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr "Попередження: порожній розділ\n"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Попередження: неправильний початок розділу (раніше %lu)\n"
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "не розпізнана завантажувальна ознака - виберіть - або *\n"
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr "часткова специфікація цил,гол,сект?\n"
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr "Розширений розділ не там де має бути розширений\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr "неправильний ввід\n"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr "надто багато розділів\n"
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5024,108 +4902,104 @@ msgstr ""
 "Зазвичай, вам необхідно лише вказати <початок> та <розмір> (та можливо "
 "<тип>).\n"
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr "версія"
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "пристрій: щось на зразок /dev/hda чи /dev/sda"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr "корисні параметри:"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [або --show-size]: вивести розмір розділу"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [або --id]:        вивести або змінити ідентифікатор розділу"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [або --list]:      вивести розділи кожного пристрою"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [або --dump]:      те ж саме, але у форматі прийнятному для "
 "подальшого вводу"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [або --increment]: кількість циліндрів починається з 1, а не з 0"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:   ввід/вивід у одиницях сектори/блоки/циліндри/Мб"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [або --list-types]:вивести всі відомі типи розділів"
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [або --DOS]:       для DOS-сумісності: втрачається трохи простору"
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [або --re-read]:   змусити ядро перечитати таблицю розділів"
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 змінити лише розділ з номером #"
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  не записувати нічого на диск"
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :             зберегти у файл сектори, які будуть перезаписані"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :             відновити ці сектори знову"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [або --version]:   вивести версію"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [або --help]:      вивести це повідомлення"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr "небезпечні параметри:"
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [або --show-geometry]: вивести видану ядром геометрію"
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -g [або --show-geometry]: вивести видану ядром геометрію"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5133,115 +5007,115 @@ msgstr ""
 "    -x [або --show-extended]: також вивести перелік розширених розділів\n"
 "                              або очікувати їх дескриптори при вводі"
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [або --Linux]:      не скаржитись на несуттєві для Linux речі"
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [або --quiet]:      не виводити попередження"
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr "    Ви можете перевизначити виявлену геометрію використовуючи:"
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [або --cylinders #]:встановити кількість циліндрів"
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [або --heads #]:    встановити кількість головок"
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [або --sectors #]:  встановити кількість секторів"
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr "Ви можете вимкнути перевірку логічності за допомогою:"
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [або --force]:      виконувати команди примусово, навіть безглузді"
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr "Використання:"
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s пристрій\t\t вивести активні розділи пристрою\n"
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s пристрій n1 n2 ... активувати розділ n1 ..., де-активувати решту\n"
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An пристрій\t активувати розділ n, де-активувати решту розділів\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr "немає команди?\n"
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "загалом: %d блоків\n"
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "використання: sfdisk --print-id пристрій номер_розділу\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "використання: sfdisk --change-id пристрій номер_розділу ідентиф.\n"
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "використання: sfdisk --id пристрій номер_пристрою [ідентиф.]\n"
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "можна вказувати лише один пристрій (за винятком -l чи -s)\n"
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "неможливі відкрити %s для читання-запису\n"
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "неможливі відкрити %s для читання\n"
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Гаразд\n"
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld циліндрів, %ld головок, %ld секторів/трек\n"
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "не вдається отримати розмір %s"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "неправильний 'активний' байт 0x%x замість 0x80\n"
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
@@ -5249,7 +5123,7 @@ msgstr ""
 "Виконано\n"
 "\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5258,35 +5132,35 @@ msgstr ""
 "Позначено активними %d розділів. Це немає значення для LILO,\n"
 "Але DOS MBR може завантажуватись лише з дисків, у яких 1 активний розділ.\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "розділ %s має ідентиф. %x та він не прихований\n"
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Неправильний Ідент. %lx\n"
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr "Цей диск наразі використовується.\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Фатальна помилка: не вдається знайти %s\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Попередження: %s не є блочним пристроєм\n"
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Перевіряється, що ніхто наразі не використовує диск ...\n"
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5299,30 +5173,30 @@ msgstr ""
 "диску.\n"
 "Використовуйте параметр --no-reread щоб обминути цю перевірку.\n"
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr "Гаразд\n"
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr "Старий стан:\n"
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Розділ %d не існує, не вдається його змінити\n"
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr "Новий стан:\n"
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5330,21 +5204,21 @@ msgstr ""
 "Ці розділи виглядають неправильно - нічого не змінено.\n"
 "(Якщо ви дійсно цього бажаєте, використовуйте параметр --force.)\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Ці розділи виглядають неправильно - можливо слід відповісти No\n"
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ви цим задоволені? [ynq] "
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Бажаєте записати на диск? [ynq] "
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
@@ -5353,16 +5227,16 @@ msgstr ""
 "\n"
 "sfdisk: передчасне закінчення вводу\n"
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr "Завершення - нічого не змінено\n"
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Відповідайте одне з y,n,q\n"
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5371,7 +5245,7 @@ msgstr ""
 "Успішно записано нову таблицю розділів\n"
 "\n"
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5477,135 +5351,135 @@ msgstr "getopt (розширена) 1.1.3\n"
 msgid "internal error, contact the author."
 msgstr "внутрішня помилка, зв'яжіться з автором."
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr "система завантажена з MILO\n"
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD годинник\n"
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "порт годинника настроєно на 0x%x\n"
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr "боязливий TOY!\n"
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: помилка атомарної операція %s за 1000 ітерацій!"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "не вдається відкрити /dev/port: %s"
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr "не вдається отримати дозвіл, тому-що не було зроблено спроби.\n"
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s не вдається отримати доступ до порту I/O:  помилка системного виклику iopl"
 "(3).\n"
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr "Можливо слід мати права адміністратора.\n"
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Вважається, що апаратний годинник синхронізований з %s часом.\n"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr "UTC"
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr "локальний"
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Попередження: нерозпізнаний третій рядок у adjtime файлі\n"
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Очікувалось: або `UTC', або `LOCAL', або порожній рядок.)\n"
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "Остання корекція відхилення виконана у %ld секунд після 1969\n"
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "Останнє калібрування виконано у %ld секунд після 1969\n"
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Апаратний годинник налаштований на %s час\n"
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr "невідомий"
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "Очікується сигнал годинника...\n"
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...отримано сигнал годинника\n"
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Неправильне значення у апаратному годиннику: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Час апаратного годинника: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld секунд після "
 "1969\n"
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Час прочитаний з апаратного годинника: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Апаратний годинник встановлюється у %.2d:%.2d:%.2d = %ld секунд після 1969\n"
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr "Годинник не змінено - лише перевірка.\n"
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -5614,7 +5488,7 @@ msgstr ""
 "Час, що минув з синхронізації часу %.6f секунд.\n"
 "Очікується досягнення наступної повної секунди.\n"
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
@@ -5624,22 +5498,22 @@ msgstr ""
 "(наприклад 50-й день місяця), або за межами, які може обробити програма "
 "(наприклад 2095рік).\n"
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f секунд\n"
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr "Не було вказано параметр --date.\n"
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr "аргумент --date надто довгий\n"
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
@@ -5648,22 +5522,22 @@ msgstr ""
 "Значення аргументу --date не є правильною датою.\n"
 "Зокрема, воно містить лапки.\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Виконується команда date: %s\n"
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "не вдається виконати команду 'date' у оболонці /bin/sh. Помилка popen()"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "вивід команди date = %s\n"
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5678,7 +5552,7 @@ msgstr ""
 "Результат:\n"
 "  %s\n"
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5695,12 +5569,12 @@ msgstr ""
 "Результат:\n"
 " %s\n"
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr "рядок дати %s дорівнює %ld секундам з 1969.\n"
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
@@ -5709,38 +5583,38 @@ msgstr ""
 "Апаратний годинник містить неправильний час, програма не може встановити по "
 "ньому системний час.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr "Запускається settimeofday:\n"
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "Системний час не встановлюється, тому що запущений у тестовому режимі.\n"
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 "Для встановлення системного часу необхідно мати права адміністратора.\n"
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr "помилка у settimeofday()"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
@@ -5749,7 +5623,7 @@ msgstr ""
 "Коефіцієнт відхилення не корегується, тому що попереднє значення апаратного "
 "годинника було неправильним.\n"
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -5759,7 +5633,7 @@ msgstr ""
 "дорівнює нулю,\n"
 "тому попереднє значення неправильне та необхідне рекалібрування.\n"
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
@@ -5768,7 +5642,7 @@ msgstr ""
 "Коефіцієнт відхилення не корегується, тому що минуло менше доби з моменту "
 "останнього калібрування.\n"
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5779,24 +5653,24 @@ msgstr ""
 "поправочний коефіцієнт відхилення %f секунд/добу.\n"
 "Коефіцієнт відхилення корегується на %f секунд/добу\n"
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "З моменту останнього корегування минуло %d секунд\n"
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Необхідно вставити %d секунд та знову перевірити час знову %.6f секунд "
 "назад\n"
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "У тестовому режимі файл adjtime не оновлюється.\n"
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -5805,12 +5679,12 @@ msgstr ""
 "У файл %s було б записано:\n"
 "%s"
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Параметри корекції відхилення не оновлені.\n"
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
@@ -5818,28 +5692,28 @@ msgstr ""
 "У апаратному годиннику встановлено некоректний час, тому його не "
 "вдаєтьсяскорегувати.\n"
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Необхідна корекція менше ніж на одну секунду, тому годинник не оновлюється.\n"
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr "Використовується %s.\n"
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "Не знайдено підтримуваного інтерфейсу годинника.\n"
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr "не вдається встановити системний час.\n"
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5851,17 +5725,17 @@ msgstr ""
 "Ця копія hwclock скомпільована для іншої архітектури, ніж Alpha\n"
 "(тож, напевно, ця система не є системою Alpha). Ніяких дій не виконано.\n"
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "не вдається отримати значення епохи від ядра.\n"
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ядро вважає, що значення епохи - %lu\n"
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -5870,17 +5744,22 @@ msgstr ""
 "Щоб встановити значення епохи, необхідно використовувати параметр 'epoch' із "
 "зазначенням встановлюваного значення.\n"
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Епоха не встановлюється у %d - лише тестування.\n"
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "не вдається встановити значення епохи у ядрі.\n"
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s з %s\n"
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5940,7 +5819,7 @@ msgstr ""
 "  --noadjfile   не обробляти /etc/adjtime. Вимагає використання або --utc,\n"
 "                або --localtime\n"
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -5950,12 +5829,12 @@ msgstr ""
 "                вказати hwclock тип вашої системи alpha (дивіться hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s не очікує параметрів без ключів. Ви вказали %d.\n"
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -5964,7 +5843,7 @@ msgstr ""
 "Ви вказали декілька функцій.\n"
 "Можна виконувати лише одну функцію одночасно.\n"
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -5973,7 +5852,7 @@ msgstr ""
 "%s: Параметри --utc та --localtime виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -5982,28 +5861,28 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Разом з --noadjfile, необхідно вказувати або --utc, або --localtime\n"
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Вказано неправильне значення часу. не вдається встановити годинник.\n"
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Змінювати значення апаратного годинника може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Змінювати системний час може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6012,14 +5891,14 @@ msgstr ""
 "Змінювати значення епохи апаратного годинника у ядрі може лише "
 "адміністратор.\n"
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "не вдається отримати доступ до апаратного годинника використовуючи будь-який "
 "відомий метод.\n"
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6053,7 +5932,6 @@ msgstr "помилка зчитування часу у ioctl() з %s"
 msgid "ioctl KDSHWCLK failed"
 msgstr "помилка ioctl KDSHWCLK"
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr "не вдається відкрити /dev/tty1 чи /dev/vc/1"
@@ -6147,9 +6025,6 @@ msgstr "помилка у ioctl(RTC_EPOCH_READ) для %s"
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "прочитано значення епохи %ld з %s через RTC_EPOCH_READ ioctl.\n"
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -6176,7 +6051,6 @@ msgstr "помилка у ioctl(RTC_EPOCH_SET) для %s"
 msgid "calling open_tty\n"
 msgstr "викликається open_tty\n"
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr "викликається termio_init\n"
@@ -6185,7 +6059,6 @@ msgstr "викликається termio_init\n"
 msgid "writing init string\n"
 msgstr "записується рядок ініціалізації\n"
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr "перед auto_baud\n"
@@ -6199,7 +6072,6 @@ msgstr "пошук символу нового рядка\n"
 msgid "read %c\n"
 msgstr "прочитано %c\n"
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr "читається реєстраційне ім'я\n"
@@ -6253,7 +6125,6 @@ msgstr "помилка chdir(\"/dev\"): %m"
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: не є символьним пристроєм"
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr "open(2)\n"
@@ -6268,12 +6139,10 @@ msgstr "/dev/%s: не вдається відкрити стандартний �
 msgid "%s: not open for read/write"
 msgstr "%s: не вдається відкрити для читання/запису"
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr "виклик dup()\n"
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -6317,30 +6186,25 @@ msgstr ""
 "або\t[-hiLmw] [-l програма_входу] [-t час_очікування] [-I рядок_ініц] [-H "
 "реєстрац_вузол] рядок швидкість_передачі,... [тип_терміналу]\n"
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr "login: недостатньо пам'яті, login може зазнати невдачі\n"
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr "не вдається виділити пам'ять для ttyclass"
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr "не вдається виділити пам'ять для grplist"
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Вхід на %s з %s заборонений перманентно.\n"
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Вхід на %s з %s заборонений.\n"
@@ -6387,8 +6251,8 @@ msgstr "Зміна finger інформації для %s.\n"
 msgid "Password error."
 msgstr "Помилка паролю."
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr "Пароль: "
@@ -6564,34 +6428,6 @@ msgstr "Використовуйте %s -l щоб переглянути спи�
 msgid "No known shells.\n"
 msgstr "Немає відомих оболонок.\n"
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr "не вдається відкрити /dev/urandom"
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr "не вдається прочитати дані з /dev/urandom"
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr "не вдається відкрити %s для читання"
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr "помилка при stat(%s)"
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr "%s не має правильних прав файлу"
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr "не вдається прочитати дані з %s"
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6603,11 +6439,11 @@ msgstr ""
 "Використання: last [-#] [-f file] [-t tty] [-h назва_вузла] "
 "[користувач ...]\n"
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr "  досі у системі"
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
@@ -6616,15 +6452,15 @@ msgstr ""
 "\n"
 "wtmp починається %s"
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr "last: помилка виділення пам'яті.\n"
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr "last: помилка gethostname"
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
@@ -6633,51 +6469,45 @@ msgstr ""
 "\n"
 "перервано %10.10s %5.5s \n"
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ФАТАЛЬНА ПОМИЛКА: не вдається відкрити tty: %s"
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr "ФАТАЛЬНА ПОМИЛКА: неправильний tty"
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: параметр -h може використовувати лише адміністратор.\n"
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "використання: login [-fp] [ім'я_користувача]\n"
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: помилка PAM, перервано: %s\n"
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "не вдається ініціалізувати PAM: %s"
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr "Ім'я:"
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ПОМИЛОК ВХОДУ %d З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -6686,17 +6516,17 @@ msgstr ""
 "Некоректний вхід\n"
 "\n"
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "НАДТО БАГАТО ПОМИЛОК ВХОДУ (%d) З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "НЕВДАЛИЙ СЕАНС ВХОДУ З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
@@ -6705,7 +6535,7 @@ msgstr ""
 "\n"
 "Некоректний вхід\n"
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6714,135 +6544,120 @@ msgstr ""
 "\n"
 "Помилка встановлення сеансу, перервано.\n"
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ім'я користувача у %s:%d. Вихід."
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Неправильне ім'я користувача \"%s\" у %s:%d. Вихід."
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Недостатньо пам'яті\n"
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr "Недопустиме ім'я користувача"
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s заборонено входити на цьому терміналі.\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s ЗАБОРОНЕНО ВХОДИТИ З %s НА TTY %s"
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ВХІД %s ЗАБОРОНЕНИЙ НА TTY %s"
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Некоректний вхід\n"
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-"Наразі у системі надто багато користувачів.\n"
-"Спробуйте пізніше.\n"
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr "Ви запустили надто багато процесів.\n"
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "ВХІД НА %s ВІД %s"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ВХІД ROOT НА %s З %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ВХІД ROOT НА %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ВХІД НА %s КОРИСТУВАЧ %s З %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ВХІД НА %s КОРИСТУВАЧ %s"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Для вас є нова пошта.\n"
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr "Для вас є пошта.\n"
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: помилка розгалуження: %s"
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "помилка TIOCSCTTY: %m"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr "помилка setuid()"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Немає каталогу %s!\n"
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Вхід з домашнім каталогом = \"/\".\n"
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: недостатньо пам'яті для сценарію оболонки.\n"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: не вдається виконати сценарій оболонки: %s.\n"
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: немає оболонки: %s.\n"
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
@@ -6851,65 +6666,65 @@ msgstr ""
 "\n"
 "%s ім'я: "
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr "реєстраційне ім'я надто довге.\n"
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr "Ім'я надто довге"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "реєстраційне ім'я не може починатись з '-'.\n"
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "надто багато надмірних нових рядків.\n"
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr "НАДМІРНІ символи нового рядка"
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Вийшов час очікування входу після %d секунд\n"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Останній вхід: %.*s "
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr "з %.*s\n"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr "на %.*s\n"
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ПОМИЛКА ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ПОМИЛКА ВХОДУ НА %s, %s"
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ НА %s, %s"
@@ -6929,170 +6744,30 @@ msgstr "встановлено  n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "використання: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Ви хто?"
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr "newgrp: немає такої групи."
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Доступ заборонено"
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr "Немає оболонки"
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr "Пароль повинен складатися принаймні з 6 символів, спробуйте ще раз.\n"
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-"Пароль повинен містити символи двох наступних груп категорій:\n"
-"літери у верхньому та нижньому регістрі, цифри та не алфавітно-цифрові\n"
-"символи. Додаткову інформацію дивіться у passwd(1).\n"
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr "Не можна використовувати свій старий пароль.\n"
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr "Не використовуйте ваше ім'я у якості паролю!\n"
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr "Не використовуйте ваше справжнє ім'я у якості паролю!\n"
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr "Використання: passwd [ім'я_користувача [пароль]]\n"
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Лише адміністратор може використовувати варіант з одним чи двома "
-"параметрами.\n"
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Використання: passwd [-foqsvV] [користувач [пароль]]\n"
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr "не вдається виконати %s: %s\n"
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr "не вдається знайти реєстраційне ім'я"
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr "Лише адміністратор може змінювати пароль інших користувачів.\n"
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr "Надто багато параметрів.\n"
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"не вдається ніде знайти ім'я користувача. Чи `%s' справді ім'я користувача?"
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Можна змінювати лише локальні паролі. Використовуйте yppasswd натомість."
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr "UID та ім'я користувача не відповідають одне одному, ви шахрай!"
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr "Змінюється пароль для %s\n"
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr "Введіть старий пароль: "
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr "Неправильний пароль, шахрай."
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr "Введіть новий пароль: "
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr "Пароль не змінено."
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr "Введіть пароль повторно: "
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr "Паролі не співпадають. Пароль не змінено."
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr "пароль змінено, користувач %s"
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr "ПАРОЛЬ АДМІНІСТРАТОРА ЗМІНЕНО"
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr "пароль змінено адміністратором, користувач %s"
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr "викликається setpwnam для встановлення паролю.\n"
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Пароль НЕ змінено. Спробуйте ще раз пізніше.\n"
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr "Пароль змінено.\n"
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -7139,7 +6814,6 @@ msgstr "перезавантаження ініційоване %s: %s"
 msgid "halted by %s: %s"
 msgstr "завершення системи ініційоване %s: %s"
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -7176,7 +6850,6 @@ msgstr "Запускається програма \"%s\" ...\n"
 msgid "Error executing\t%s\n"
 msgstr "Помилка виконання\t%s\n"
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -7266,7 +6939,6 @@ msgstr "помилка встановлення close-on-exec на /dev/initctl"
 msgid "error running finalprog\n"
 msgstr "помилка запуску final_prog\n"
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr "помилка створення процесу final_prog\n"
@@ -7295,7 +6967,7 @@ msgstr "помилка відкривання каталогу\n"
 msgid "fork failed\n"
 msgstr "помилка створення процесу\n"
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr "помилка запуску\n"
 
@@ -7444,12 +7116,6 @@ msgstr "неправильне значення місяця: використо
 msgid "illegal year value: use 1-9999"
 msgstr "неправильне значення року: використовуйте 1-9999"
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -7460,13 +7126,12 @@ msgstr "%s %d"
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr "використання: cal [-13smjyV] [[місяць] рік]\n"
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "використання: %s [+формат] [день місяць рік]\n"
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr "День святого Tib"
 
@@ -7598,7 +7263,7 @@ msgstr "%s: помилка перейменування %s на %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "виклик: %s звідки куди файли...\n"
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7610,22 +7275,22 @@ msgstr ""
 "використовувати.\n"
 "Сценарій не запущено.\n"
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "використання: script [-a] [-f] [-q] [-t] [файл]\n"
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Сценарій запущено, файл - %s\n"
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr "Сценарій запущено на %s"
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7634,254 +7299,253 @@ msgstr ""
 "\n"
 "Сценарій завершено на %s"
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Сценарій завершено, файл %s\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr "помилка openpty\n"
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Скінчились pty-пристрої\n"
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Помилка у параметрах, використання\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term назва_терміналу ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ табул1 табул2 табул3 ... ] ]     (табулn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ табул1 табул2 табул3 ... ] ]  (табулn = 1-160)\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file назва_файлу_дампу ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq частота_звуку ]\n"
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr "не вдається встановити/зняти режим енергозбереження\n"
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "помилка klogctl %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Помилка читання %s\n"
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr "Помилка запису знімку екрану \n"
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "не вдається прочитати %s, або не вдається виконати ioctl дампу\n"
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: не визначено $TERM.\n"
@@ -7956,10 +7620,6 @@ msgstr "Попередження: не вдається відкрити %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: не вдається відкрити %s - натомість використовується %s\n"
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -8262,82 +7922,73 @@ msgstr "mount: помилка відкривання %s для встановл�
 msgid "mount: cannot set speed: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: помилка створення процесу: %s"
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: цю версію програми скомпільовано без підтримки `nfs'"
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: помилка підключення nfs версії 4, пробується 3..\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: не вдається визначити тип файлової системи, та тип явно не вказаний"
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: необхідно вказати тип файлової системи"
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr "mount: помилка підключення"
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: точка монтування %s не є каталогом"
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr "mount: доступ заборонено"
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr "mount: для використання mount необхідно мати права адміністратора"
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s зайнятий"
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr "mount: proc вже підключено"
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s вже підключено або %s зайнятий"
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: точка монтування %s не існує"
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: точка монтування %s є символічним посиланням, яке вказує нікуди"
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: спеціальний пристрій %s не існує"
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8346,12 +7997,12 @@ msgstr ""
 "mount: спеціальний пристрій %s не існує\n"
 "       (префікс шляху не є каталогом)\n"
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ще не підключений, або неправильний параметр"
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8361,72 +8012,71 @@ msgstr ""
 "неправильний суперблок на %s,\n"
 "       або підключено надто багато файлових систем"
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr "таблиця монтування переповнена"
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: не вдається прочитати суперблок"
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: невідомий пристрій"
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   перелік відомих типів файлових систем"
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: можливо ви мали на увазі %s"
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: можливо ви мали на увазі iso9660 ?"
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: можливо ви мали на увазі iso9660 ?"
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s має неправильний номер пристрою або файлова система типу %s не "
 "підтримується"
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s не є блочним пристроєм, та stat зазнав невдачі?"
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8435,72 +8085,67 @@ msgstr ""
 "mount: ядро не розпізнало %s як блочний пристрій\n"
 "       (можливо треба виконати `insmod драйвер'?)"
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s не є блочним пристроєм (можливо, спробуйте `-o loop'?)"
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s не є блочним пристроєм"
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s не є правильним блочним пристроєм"
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr "блочний пристрій "
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: не вдається підключити %s%s лише для читання"
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s захищений від запису, але було вказано ключ `-w'"
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: не вказано тип - вважається nfs, через наявність двокрапки\n"
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: не вказано тип - вважається smbfs, через наявність префіксу //\n"
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: продовження спроб у фоні \"%s\"\n"
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: залишено спроби підключити \"%s\"\n"
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8549,34 +8194,34 @@ msgstr ""
 "Інші параметри: [-nfFrsvw] [-o параметри] [-p пароль].\n"
 "Додаткову інформацію дивіться у man 8 mount .\n"
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr "mount: це може робити лише адміністратор(root)"
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: не знайдено %s - створюється..\n"
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr "mount: не знайдено такого розділу"
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: підключення %s\n"
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr "нічого не було підключено"
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: не вдається знайти %s у %s"
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: не вдається знайти %s у %s або %s"
@@ -8611,98 +8256,98 @@ msgstr "       буде випробувано тип %s\n"
 msgid "Trying %s\n"
 msgstr "Випробовується %s\n"
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: надмірна довжина аргументу вузол:каталог\n"
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: попередження: вказування кількох назв вузлів не підтримується\n"
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: каталог для підключення не у форматі вузол:каталог\n"
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: не вдається отримати адресу для %s\n"
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: отримано неправильний hp->h_length\n"
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr "mount: надмірно довгий параметр\n"
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Попередження: Нерозпізнаний параметр proto=.\n"
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Попередження: параметр namlen не підтримується.\n"
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "невідомий параметр підключення nfs: %s=%d\n"
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Попередження: параметр nolock не підтримується.\n"
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "невідомий параметр підключення nfs: %s%s\n"
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: отримано неправильний hp->h_length?\n"
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS через TCP не підтримується.\n"
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr "nfs сокет"
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr "nfs сервер повідомив, що служба недоступна"
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr "використано portmapper, щоб знайти NFS порт\n"
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "використовується порт %d служби nfs\n"
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "повернений невідомий код стану nfs: %d"
@@ -8711,7 +8356,7 @@ msgstr "повернений невідомий код стану nfs: %d"
 msgid "bug in xstrndup call"
 msgstr "помилка при виклику xstrndup"
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8724,7 +8369,7 @@ msgstr ""
 "       %s [-v] [-p пріоритет] спец_файл ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8735,140 +8380,138 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] спец_файл ...\n"
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s на %s\n"
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, fuzzy, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr "%s: не вдається знайти \"_stext\" у %s\n"
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, fuzzy, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "swapon: не вдається отримати статистику %s: %s\n"
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, fuzzy, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: попередження: %s має небезпечні права %04o, пропонується %04o\n"
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, fuzzy, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: пропускається файл %s - схоже, що він містить дірки.\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr "Не адміністратор.\n"
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: не вдається відкрити %s: %s\n"
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: скомпільовано без підтримки -f\n"
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: помилка створення процесу: %s"
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "вузол: %s, каталог: %s\n"
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: не вдається отримати адресу для %s\n"
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: отримано неправильний hostp->h_length\n"
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: неправильний блочний пристрій"
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: не підключений"
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: не вдається записати суперблок"
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: не існує"
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: для використання umount необхідно мати права адміністратора"
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: блочні пристрої не дозволено на файловій системі"
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "немає umount2, пробується umount...\n"
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "не вдається відключити umount %s - натомість пробується %s\n"
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: не вдається перепідключити %s у режим лише-для-читання\n"
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s відключено\n"
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: не вдається знайти перелік файлових систем для відключення"
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8879,48 +8522,47 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t тип_фс] [-O параметри]\n"
 "       umount [-f] [-r] [-n] [-v] спец_файл | каталог...\n"
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "не вдається відкрити "
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Спроба відключити %s\n"
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "не вдається знайти %s у mtab\n"
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s не є підключеним (згідно mtab)"
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: здається %s підключений декілька разів"
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s відсутній у fstab (та ви не адміністратор)"
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: підключений %s відрізняється від fstab"
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: лише адміністратор може відключити %s від %s"
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: це може робити лише адміністратор(root)"
 
@@ -9078,7 +8720,7 @@ msgstr "%s: невідомий сигнал %s\n"
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -9246,8 +8888,6 @@ msgstr "підтримку спільної пам'яті не налаштов�
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Обмеження спільної пам'яті --------\n"
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
@@ -10037,17 +9677,17 @@ msgstr ""
 "hexdump: [-bcCdovx] [-e формат] [-f файл_формату] [-n довжина] [-s зсув] "
 "[файл ...]\n"
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "використання: %s [-dflpcsu] [+linenum | +/pattern] назва1 назва2 ...\n"
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, fuzzy, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr "%s: невідомий сигнал %s\n"
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -10058,8 +9698,7 @@ msgstr ""
 "*** %s: каталог ***\n"
 "\n"
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -10070,45 +9709,45 @@ msgstr ""
 "******** %s: не є текстовим файлом ********\n"
 "\n"
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr "[Використовуйте q чи Q щоб вийти]"
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr "--Далі--"
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Наступний файл: %s)"
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Натисніть пробіл, щоб продовжити, або 'q', щоб вийти.]"
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr "...назад %d сторінок"
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr "...назад 1 сторінку"
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr "...пропускається один рядок"
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...пропускається %d рядків"
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
@@ -10118,7 +9757,7 @@ msgstr ""
 "***Назад***\n"
 "\n"
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -10130,7 +9769,7 @@ msgstr ""
 "значення у кутових дужках.\n"
 "Зірочка (*) означає, що параметр стає новим типовим значенням.\n"
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -10177,34 +9816,34 @@ msgstr ""
 ":f                      Відобразити назву поточного файлу та номер рядка\n"
 ".                       Повторити попередню команду\n"
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr "[Натисніть 'h' щоб переглянути довідку.]"
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" рядок %d"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Не файл] рядок %d"
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr "  Переповнення\n"
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr "...перехід\n"
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr "Невдалий регулярний вираз"
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -10212,15 +9851,15 @@ msgstr ""
 "\n"
 "Шаблон не знайдено\n"
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr "Шаблон не знайдено"
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr "не вдається створити процес\n"
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
@@ -10228,19 +9867,19 @@ msgstr ""
 "\n"
 "...Перехід "
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr "...Перехід до файлу"
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr "...Перехід назад до файлу"
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr "Рядок надто довгий"
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr "Немає попередньої команди для заміни"
 
@@ -10293,7 +9932,7 @@ msgstr "hexdump: неправильний формат {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: неправильний символ перетворення %%%s.\n"
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -10301,84 +9940,81 @@ msgstr ""
 "%s: Використання: %s [-number] [-p рядок] [-cefnrs] [+line] [+/pattern/] "
 "[файли]\n"
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: параметр потребує вказування аргументу -- %s\n"
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: неправильний параметр -- %s\n"
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr "...перехід вперед\n"
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr "...перехід назад\n"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr "Немає наступного файлу"
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr "Немає попереднього файлу"
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Помилка читання з файлу %s\n"
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Невідома помилка у файлі %s\n"
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: не вдається створити тимчасовий файл\n"
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr "Помилка РВ: "
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr "(Кінець файлу)"
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr "Немає збереженого у пам'яті рядку пошуку"
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr "не вдається відкрити "
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr "збережено"
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": команда ! не допустима у режимі rflag.\n"
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr "помилка виконання fork(), спробуйте пізніше ще раз\n"
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr "(Наступний файл: "
 
@@ -10432,6 +10068,160 @@ msgstr "Вхідний рядок надто довгий.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Недостатньо пам'яті для збільшення буфера.\n"
 
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Неправильне число: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Синтаксична помилка: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Немає такого набору параметрів: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] пристрій назва\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] пристрій розмір сект головок доріжок stretch gap rate spec1 "
+#~ "fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] пристрій\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] пристрій\n"
+
+#~ msgid "version"
+#~ msgstr "версія"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "не вдається відкрити /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "не вдається прочитати дані з /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "не вдається відкрити %s для читання"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "помилка при stat(%s)"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s не має правильних прав файлу"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "не вдається прочитати дані з %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Наразі у системі надто багато користувачів.\n"
+#~ "Спробуйте пізніше.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Ви запустили надто багато процесів.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr ""
+#~ "Пароль повинен складатися принаймні з 6 символів, спробуйте ще раз.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Пароль повинен містити символи двох наступних груп категорій:\n"
+#~ "літери у верхньому та нижньому регістрі, цифри та не алфавітно-цифрові\n"
+#~ "символи. Додаткову інформацію дивіться у passwd(1).\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Не можна використовувати свій старий пароль.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Не використовуйте ваше ім'я у якості паролю!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Не використовуйте ваше справжнє ім'я у якості паролю!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Використання: passwd [ім'я_користувача [пароль]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr ""
+#~ "Лише адміністратор може використовувати варіант з одним чи двома "
+#~ "параметрами.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Використання: passwd [-foqsvV] [користувач [пароль]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "не вдається виконати %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "не вдається знайти реєстраційне ім'я"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Лише адміністратор може змінювати пароль інших користувачів.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Надто багато параметрів.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr ""
+#~ "не вдається ніде знайти ім'я користувача. Чи `%s' справді ім'я "
+#~ "користувача?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Можна змінювати лише локальні паролі. Використовуйте yppasswd натомість."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID та ім'я користувача не відповідають одне одному, ви шахрай!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Змінюється пароль для %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Введіть старий пароль: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Неправильний пароль, шахрай."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Введіть новий пароль: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Пароль не змінено."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Введіть пароль повторно: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Паролі не співпадають. Пароль не змінено."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "пароль змінено, користувач %s"
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "ПАРОЛЬ АДМІНІСТРАТОРА ЗМІНЕНО"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "пароль змінено адміністратором, користувач %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "викликається setpwnam для встановлення паролю.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Пароль НЕ змінено. Спробуйте ще раз пізніше.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Пароль змінено.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: цю версію програми скомпільовано без підтримки `nfs'"
+
 #, fuzzy
 #~ msgid "Warning: omitting partitions after %d\n"
 #~ msgstr "Попередження: видалення розділів після %d\n"
diff --git a/po/update-potfiles b/po/update-potfiles
index 2b7baf8c7..737202a20 100644..100755
--- a/po/update-potfiles
+++ b/po/update-potfiles
@@ -2,15 +2,8 @@
 #
 #
 
-> POTFILES
-> .null
 > POTFILES.in
 
-for x in ../*/*.c; do
-echo "$x \\" >> POTFILES
-done
-echo .null   >> POTFILES
-
 cd ..
 for x in */*.c; do
 echo "$x" >> po/POTFILES.in
diff --git a/po/util-linux.pot b/po/util-linux.pot
index 5b6786f13..57390392a 100644
--- a/po/util-linux.pot
+++ b/po/util-linux.pot
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
+# Copyright (C) YEAR Adrian Bunk <bunk@stusta.de>
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 23:42+0100\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+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"
@@ -113,7 +114,7 @@ msgstr ""
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
-#: disk-utils/elvtune.c:50 disk-utils/setfdprm.c:100
+#: disk-utils/elvtune.c:50
 #, c-format
 msgid "usage:\n"
 msgstr ""
@@ -155,13 +156,12 @@ msgid "usage: %s [ -n ] device\n"
 msgstr ""
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
-#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:54
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
-#: disk-utils/mkswap.c:523 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1176
-#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189
-#: misc-utils/rename.c:79 misc-utils/script.c:143
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
 #, c-format
-msgid "%s from %s\n"
+msgid "%s from %s%s\n"
 msgstr ""
 
 #: disk-utils/fdformat.c:130
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Single"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:108
+#: disk-utils/fsck.cramfs.c:107
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -196,97 +196,97 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:253
+#: disk-utils/fsck.cramfs.c:250
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:268 disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:297
+#: disk-utils/fsck.cramfs.c:294
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:329
+#: disk-utils/fsck.cramfs.c:326
 #, c-format
 msgid "  hole at %ld (%d)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:344
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:350
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:399
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:479
 #, c-format
 msgid "%s: compiled without -x support\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:508
+#: disk-utils/fsck.cramfs.c:505
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:515
 #, c-format
 msgid "%s is not a block device or file\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:524 disk-utils/fsck.cramfs.c:559
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:551
+#: disk-utils/fsck.cramfs.c:548
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:564
+#: disk-utils/fsck.cramfs.c:561
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:574
+#: disk-utils/fsck.cramfs.c:571
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:577
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:602
+#: disk-utils/fsck.cramfs.c:599
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:618
+#: disk-utils/fsck.cramfs.c:615
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:626
+#: disk-utils/fsck.cramfs.c:623
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
@@ -742,7 +742,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2232
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -811,18 +811,18 @@ msgstr ""
 msgid "error closing %s"
 msgstr ""
 
-#: disk-utils/mkfs.c:75
+#: disk-utils/mkfs.c:73
 #, c-format
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:90 disk-utils/mkfs.c:98 fdisk/cfdisk.c:347
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
 #: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:105
+#: disk-utils/mkfs.c:103
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr ""
@@ -865,7 +865,6 @@ msgid ""
 "Exiting.\n"
 msgstr ""
 
-#. (I don't think this can happen with zlib.)
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
@@ -918,10 +917,6 @@ msgstr ""
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
 
-#. (These warnings used to come at the start, but they scroll off the
-#. screen too quickly.)
-#. (can't happen when reading from ext2fs)
-#. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
@@ -994,7 +989,6 @@ msgstr ""
 msgid "write failed in write_block"
 msgstr ""
 
-#. Could make triple indirect block here
 #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
 #: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
@@ -1028,7 +1022,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:428
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1070,105 +1064,105 @@ msgstr ""
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:178
+#: disk-utils/mkswap.c:177
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:186
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:190
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:233
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:244
+#: disk-utils/mkswap.c:243
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:250
+#: disk-utils/mkswap.c:249
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:258
+#: disk-utils/mkswap.c:257
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:382
+#: disk-utils/mkswap.c:381
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:404
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:419 misc-utils/look.c:183 misc-utils/setterm.c:1145
-#: text-utils/more.c:1974 text-utils/more.c:1985
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:438
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:614
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:638
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "%s: error: label only with v1 swap area\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:660
+#: disk-utils/mkswap.c:659
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:669 disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
 msgid "fatal: first page unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:674
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1177,118 +1171,82 @@ msgid ""
 "the -f option to force it.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:699
+#: disk-utils/mkswap.c:698
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:700
+#: disk-utils/mkswap.c:699
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:709
+#: disk-utils/mkswap.c:708
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:712
+#: disk-utils/mkswap.c:711
 msgid "unable to write signature page"
 msgstr ""
 
-#: disk-utils/mkswap.c:720
+#: disk-utils/mkswap.c:719
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/setfdprm.c:31
-#, c-format
-msgid "Invalid number: %s\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:81
-#, c-format
-msgid "Syntax error: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:91
-#, c-format
-msgid "No such parameter set: '%s'\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:101
-#, c-format
-msgid "   %s [ -p ] dev name\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:102
-#, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:105
-#, c-format
-msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
-
-#: disk-utils/setfdprm.c:107
-#, c-format
-msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
-
-#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
 msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:374 fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
 msgid "Free Space"
 msgstr ""
 
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr ""
 
-#: fdisk/cfdisk.c:379
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr ""
 
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:381
 msgid "Linux JFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:385
+#: fdisk/cfdisk.c:383
 msgid "Linux ReiserFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:387 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr ""
 
-#: fdisk/cfdisk.c:390
+#: fdisk/cfdisk.c:388
 msgid "OS/2 HPFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:392
+#: fdisk/cfdisk.c:390
 msgid "OS/2 IFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:396
+#: fdisk/cfdisk.c:394
 msgid "NTFS"
 msgstr ""
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:407
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1297,788 +1255,766 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:508
+#: fdisk/cfdisk.c:506
 msgid "FATAL ERROR"
 msgstr ""
 
-#: fdisk/cfdisk.c:509
+#: fdisk/cfdisk.c:507
 msgid "Press any key to exit cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:556 fdisk/cfdisk.c:564
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:558
+#: fdisk/cfdisk.c:556
 msgid "Cannot read disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:564
 msgid "Cannot write disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:909
+#: fdisk/cfdisk.c:907
 msgid "Too many partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:914
+#: fdisk/cfdisk.c:912
 msgid "Partition begins before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:919
+#: fdisk/cfdisk.c:917
 msgid "Partition ends before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:924
+#: fdisk/cfdisk.c:922
 msgid "Partition begins after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:929
+#: fdisk/cfdisk.c:927
 msgid "Partition ends after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:932
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:958
+#: fdisk/cfdisk.c:956
 msgid "logical partitions not in disk order"
 msgstr ""
 
-#: fdisk/cfdisk.c:961
+#: fdisk/cfdisk.c:959
 msgid "logical partitions overlap"
 msgstr ""
 
-#. the enlarged logical partition starts at the
-#. partition table sector that defines it
-#: fdisk/cfdisk.c:965
+#: fdisk/cfdisk.c:963
 msgid "enlarged logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:995
+#: fdisk/cfdisk.c:993
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1006 fdisk/cfdisk.c:1018
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1160
+#: fdisk/cfdisk.c:1158
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1216
+#: fdisk/cfdisk.c:1214
 msgid "Menu without direction. Defaulting horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1345
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1370
+#: fdisk/cfdisk.c:1368
 msgid "Press a key to continue"
 msgstr ""
 
-#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2566
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
 msgid "Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:1417
+#: fdisk/cfdisk.c:1415
 msgid "Create a new primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1418 fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2565
-#: fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
 msgid "Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:1418
+#: fdisk/cfdisk.c:1416
 msgid "Create a new logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474 fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
 msgid "Cancel"
 msgstr ""
 
-#: fdisk/cfdisk.c:1419 fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
 msgid "Don't create a partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1435
+#: fdisk/cfdisk.c:1433
 msgid "!!! Internal error !!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1438
+#: fdisk/cfdisk.c:1436
 msgid "Size (in MB): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Beginning"
 msgstr ""
 
-#: fdisk/cfdisk.c:1472
+#: fdisk/cfdisk.c:1470
 msgid "Add partition at beginning of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "End"
 msgstr ""
 
-#: fdisk/cfdisk.c:1473
+#: fdisk/cfdisk.c:1471
 msgid "Add partition at end of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1491
+#: fdisk/cfdisk.c:1489
 msgid "No room to create the extended partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1565
+#: fdisk/cfdisk.c:1563
 msgid "No partition table.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1569
+#: fdisk/cfdisk.c:1567
 msgid "No partition table. Starting with zero table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1577
 msgid "Bad signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Unknown partition table type"
 msgstr ""
 
-#: fdisk/cfdisk.c:1585
+#: fdisk/cfdisk.c:1583
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1633
+#: fdisk/cfdisk.c:1631
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1663
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1667 fdisk/cfdisk.c:1847
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1686
 msgid "Cannot get disk size"
 msgstr ""
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Bad primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1744
+#: fdisk/cfdisk.c:1742
 msgid "Bad logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1859
+#: fdisk/cfdisk.c:1857
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1861
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1867
 msgid "no"
 msgstr ""
 
-#: fdisk/cfdisk.c:1870
+#: fdisk/cfdisk.c:1868
 msgid "Did not write partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1870
 msgid "yes"
 msgstr ""
 
-#: fdisk/cfdisk.c:1875
+#: fdisk/cfdisk.c:1873
 msgid "Please enter `yes' or `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1877
 msgid "Writing partition table to disk..."
 msgstr ""
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
 msgid "Wrote partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1904
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1914
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1918
+#: fdisk/cfdisk.c:1916
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1976 fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 
-#: fdisk/cfdisk.c:1985 fdisk/cfdisk.c:2103 fdisk/cfdisk.c:2187
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1994
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:1996
 msgid "Sector 0:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2003
 #, c-format
 msgid "Sector %d:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:2023
 msgid "   None   "
 msgstr ""
 
-#: fdisk/cfdisk.c:2027
+#: fdisk/cfdisk.c:2025
 msgid "   Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2029
+#: fdisk/cfdisk.c:2027
 msgid "   Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:2031
+#: fdisk/cfdisk.c:2029
 msgid "   Logical"
 msgstr ""
 
-#. odd flag on end
-#. type id
-#. type name
-#. fdisk part number
-#. device
-#. flags
-#. flags
-#. start
-#. end
-#. no odd flag on end
-#. type id
-#. type name
-#. start
-#. end
-#. odd flag on end
-#. type id
-#. type name
-#: fdisk/cfdisk.c:2069 fdisk/fdisk.c:1438 fdisk/fdisk.c:1750
-#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:694 fdisk/sfdisk.c:651
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
 msgid "Unknown"
 msgstr ""
 
-#: fdisk/cfdisk.c:2075 fdisk/cfdisk.c:2543 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2075
 #, c-format
 msgid "(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2077
 msgid "None"
 msgstr ""
 
-#: fdisk/cfdisk.c:2114 fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2114
 msgid "               First       Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2115
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2116
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
 
-#. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2199
 msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2202
+#: fdisk/cfdisk.c:2200
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2201
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Raw"
 msgstr ""
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2234
 msgid "Print the table using raw data format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2237 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
 msgid "Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2235
 msgid "Print the table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2236
 msgid "Just print the partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2237
 msgid "Don't print the table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2265
 msgid "Help Screen for cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2267
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 
-#: fdisk/cfdisk.c:2270
+#: fdisk/cfdisk.c:2268
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 
-#: fdisk/cfdisk.c:2271
+#: fdisk/cfdisk.c:2269
 msgid "disk drive."
 msgstr ""
 
-#: fdisk/cfdisk.c:2273
+#: fdisk/cfdisk.c:2271
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr ""
 
-#: fdisk/cfdisk.c:2275
+#: fdisk/cfdisk.c:2273
 msgid "Command      Meaning"
 msgstr ""
 
-#: fdisk/cfdisk.c:2276
+#: fdisk/cfdisk.c:2274
 msgid "-------      -------"
 msgstr ""
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2275
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2276
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2277
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2278
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2279
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2280
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2281
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2282
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2283
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2286
+#: fdisk/cfdisk.c:2284
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2285
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2288
+#: fdisk/cfdisk.c:2286
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2287
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2288
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2289
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2292
+#: fdisk/cfdisk.c:2290
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2291
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2294
+#: fdisk/cfdisk.c:2292
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2293
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2294
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2295
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2296
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2297
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2298
 msgid "             `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2299
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2300
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2301
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2302
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2304
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2305
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2338 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2336
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2337
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2338
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done"
 msgstr ""
 
-#: fdisk/cfdisk.c:2341
+#: fdisk/cfdisk.c:2339
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2354
+#: fdisk/cfdisk.c:2352
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2365 fdisk/cfdisk.c:2936
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2371
+#: fdisk/cfdisk.c:2369
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2946
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2382
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2953
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2492
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:2510
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2512
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2545
+#: fdisk/cfdisk.c:2543
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2548 fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556 fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2567
+#: fdisk/cfdisk.c:2565
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2574
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Unknown (%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2641
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2648
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2651
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2657
+#: fdisk/cfdisk.c:2655
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr ""
 
-#: fdisk/cfdisk.c:2661
+#: fdisk/cfdisk.c:2659
 msgid "Name"
 msgstr ""
 
-#: fdisk/cfdisk.c:2662
+#: fdisk/cfdisk.c:2660
 msgid "Flags"
 msgstr ""
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2661
 msgid "Part Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2662
 msgid "FS Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2665
+#: fdisk/cfdisk.c:2663
 msgid "[Label]"
 msgstr ""
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2665
 msgid "    Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2667
 msgid "  Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2669
 msgid "  Size (MB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2671
 msgid "  Size (GB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2725
 msgid "Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete"
 msgstr ""
 
-#: fdisk/cfdisk.c:2728
+#: fdisk/cfdisk.c:2726
 msgid "Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2729
+#: fdisk/cfdisk.c:2727
 msgid "Change disk geometry (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Help"
 msgstr ""
 
-#: fdisk/cfdisk.c:2730
+#: fdisk/cfdisk.c:2728
 msgid "Print help screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize"
 msgstr ""
 
-#: fdisk/cfdisk.c:2731
+#: fdisk/cfdisk.c:2729
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "New"
 msgstr ""
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2730
 msgid "Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print"
 msgstr ""
 
-#: fdisk/cfdisk.c:2733
+#: fdisk/cfdisk.c:2731
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit"
 msgstr ""
 
-#: fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2732
 msgid "Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2735
+#: fdisk/cfdisk.c:2733
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Units"
 msgstr ""
 
-#: fdisk/cfdisk.c:2736
+#: fdisk/cfdisk.c:2734
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2735
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2783
+#: fdisk/cfdisk.c:2781
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2793
+#: fdisk/cfdisk.c:2791
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2815
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2823
+#: fdisk/cfdisk.c:2821
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2825
+#: fdisk/cfdisk.c:2823
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2842
+#: fdisk/cfdisk.c:2840
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2869 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2882
+#: fdisk/cfdisk.c:2880
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2890
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr ""
 
-#. Unfortunately, xgettext does not handle multi-line strings
-#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2899
+#: fdisk/cfdisk.c:2897
 #, c-format
 msgid ""
 "\n"
@@ -2121,9 +2057,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:330 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:374 fdisk/fdisk.c:397 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:431 fdisk/fdisk.c:447
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
 msgid "Command action"
 msgstr ""
 
@@ -2143,10 +2079,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#. sun
-#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:336 fdisk/fdisk.c:355
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:380 fdisk/fdisk.c:405 fdisk/fdisk.c:422
-#: fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
 msgid "   m   print this menu"
 msgstr ""
 
@@ -2158,14 +2093,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:340 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:384 fdisk/fdisk.c:407 fdisk/fdisk.c:424
-#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
 msgid "   q   quit without saving changes"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:408 fdisk/fdisk.c:425
-#: fdisk/fdisk.c:441 fdisk/fdisk.c:458
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2208,13 +2143,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1945 fdisk/fdisksgilabel.c:649
-#: fdisk/fdisksunlabel.c:518
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2005 fdisk/fdisksunlabel.c:575
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2259,8 +2194,6 @@ msgstr ""
 msgid " badsect"
 msgstr ""
 
-#. On various machines the fields of *lp are short/int/long
-#. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
@@ -2359,8 +2292,8 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:591 fdisk/fdisk.c:1260
-#: fdisk/sfdisk.c:937
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
 msgid "cylinders"
 msgstr ""
 
@@ -2417,7 +2350,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2082
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2439,7 +2372,7 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:188
+#: fdisk/fdisk.c:190
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2451,7 +2384,7 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:200
+#: fdisk/fdisk.c:202
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2461,209 +2394,195 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:211
 #, c-format
 msgid "Unable to open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:213
+#: fdisk/fdisk.c:215
 #, c-format
 msgid "Unable to read %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:217
+#: fdisk/fdisk.c:219
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:221
+#: fdisk/fdisk.c:223
 #, c-format
 msgid "Unable to write %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:229
+#: fdisk/fdisk.c:231
 msgid "Unable to allocate any more memory\n"
 msgstr ""
 
-#: fdisk/fdisk.c:232
+#: fdisk/fdisk.c:234
 msgid "Fatal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:333
 msgid "   a   toggle a read only flag"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:335
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#. sun
-#. sgi flavour
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
 msgid "   d   delete a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   l   list known partition types"
 msgstr ""
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
 msgid "   n   add a new partition"
 msgstr ""
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
 msgid "   o   create a new empty DOS partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
 msgid "   p   print the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
 msgid "   t   change a partition's system id"
 msgstr ""
 
-#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
 msgid "   v   verify the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:390
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
 msgid "   x   extra functionality (experts only)"
 msgstr ""
 
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:352
 msgid "   a   select bootable partition"
 msgstr ""
 
-#. sgi flavour
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:353
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#. sgi
-#: fdisk/fdisk.c:352
+#: fdisk/fdisk.c:354
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:377
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:379
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:400
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#. sun
-#. !sun
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:403
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#. sun
-#. sgi
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:405
 msgid "   i   change interleave factor"
 msgstr ""
 
-#. sun
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:406
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:414
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
 msgid "   e   list extended partitions"
 msgstr ""
 
-#. !sun
-#. !sun, !aix, !sgi
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#. !sun
-#: fdisk/fdisk.c:452
+#: fdisk/fdisk.c:454
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:570
+#: fdisk/fdisk.c:572
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:589
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:589 fdisk/fdisk.c:1260 fdisk/sfdisk.c:937
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:597
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:598
 msgid " and "
 msgstr ""
 
-#: fdisk/fdisk.c:613
+#: fdisk/fdisk.c:615
 #, c-format
 msgid ""
 "\n"
@@ -2675,29 +2594,29 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:636
+#: fdisk/fdisk.c:638
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:650
+#: fdisk/fdisk.c:652
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:669
+#: fdisk/fdisk.c:671
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:677
+#: fdisk/fdisk.c:679
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:724
 #, c-format
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
@@ -2706,131 +2625,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:766
+#: fdisk/fdisk.c:768
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:925
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:952
+#: fdisk/fdisk.c:954
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:962
+#: fdisk/fdisk.c:964
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:979
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Internal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:992
+#: fdisk/fdisk.c:994
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1006
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1028
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1065
+#: fdisk/fdisk.c:1067
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1105
+#: fdisk/fdisk.c:1107
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1174
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1176
+#: fdisk/fdisk.c:1178
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1188
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1197
+#: fdisk/fdisk.c:1199
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1219 fdisk/fdisk.c:1245
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
 #, c-format
 msgid "Selected partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1224
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1248
+#: fdisk/fdisk.c:1250
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1260
 msgid "sector"
 msgstr ""
 
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1291
 #, c-format
 msgid "DOS Compatibility flag is set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1295
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1395
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1398
+#: fdisk/fdisk.c:1400
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -2839,14 +2758,14 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1409
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1416
+#: fdisk/fdisk.c:1418
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -2854,7 +2773,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1422
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -2862,90 +2781,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1435
+#: fdisk/fdisk.c:1437
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1492
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1492 fdisk/fdisk.c:1500 fdisk/fdisk.c:1509 fdisk/fdisk.c:1519
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr ""
 
-#: fdisk/fdisk.c:1493 fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1507
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1510
+#: fdisk/fdisk.c:1512
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1516
+#: fdisk/fdisk.c:1518
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1520
+#: fdisk/fdisk.c:1522
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1537
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1537
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:1540
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1543
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1653
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1707
+#: fdisk/fdisk.c:1709
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -2953,23 +2872,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1723
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1722 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
 msgid "Device"
 msgstr ""
 
-#: fdisk/fdisk.c:1759
+#: fdisk/fdisk.c:1761
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1769
+#: fdisk/fdisk.c:1771
 #, c-format
 msgid ""
 "\n"
@@ -2977,82 +2896,82 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1816
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1819
+#: fdisk/fdisk.c:1821
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:1824
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1829
+#: fdisk/fdisk.c:1831
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1869
+#: fdisk/fdisk.c:1871
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1889
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1894
+#: fdisk/fdisk.c:1896
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:1902
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1903
+#: fdisk/fdisk.c:1905
 #, c-format
 msgid "%lld unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1918 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1960 fdisk/fdisksunlabel.c:564
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:1998
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3061,22 +2980,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2090
+#: fdisk/fdisk.c:2092
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2095
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2096
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2101
 #, c-format
 msgid ""
 "Command action\n"
@@ -3084,32 +3003,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2103
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2122
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2156
+#: fdisk/fdisk.c:2158
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2165
+#: fdisk/fdisk.c:2167
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2181
+#: fdisk/fdisk.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -3118,7 +3037,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2191
+#: fdisk/fdisk.c:2193
 #, c-format
 msgid ""
 "\n"
@@ -3127,107 +3046,106 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2199
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2201
+#: fdisk/fdisk.c:2203
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2248
+#: fdisk/fdisk.c:2250
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2255
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2269
+#: fdisk/fdisk.c:2271
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2282
+#: fdisk/fdisk.c:2284
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2309
+#: fdisk/fdisk.c:2311
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2334
+#: fdisk/fdisk.c:2336
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2339
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2409
+#: fdisk/fdisk.c:2411
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2420
+#: fdisk/fdisk.c:2422
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2438 fdisk/sfdisk.c:2457
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2458
+#: fdisk/fdisk.c:2460
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2526
+#: fdisk/fdisk.c:2528
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2530
+#: fdisk/fdisk.c:2532
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#. OSF label, and no DOS label
-#: fdisk/fdisk.c:2589
+#: fdisk/fdisk.c:2591
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2599
+#: fdisk/fdisk.c:2601
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2615
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2619
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2619
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2692
+#: fdisk/fdisk.c:2694
 #, c-format
 msgid ""
 "\n"
@@ -3291,15 +3209,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3360,7 +3278,6 @@ msgstr ""
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#. "/a\n" is minimum
 #: fdisk/fdisksgilabel.c:304
 #, c-format
 msgid ""
@@ -3404,7 +3321,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3479,7 +3396,6 @@ msgstr ""
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr ""
 
-#. caught already before, ...
 #: fdisk/fdisksgilabel.c:544
 #, c-format
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
@@ -3494,11 +3410,10 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:633
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
 msgid "YES\n"
 msgstr ""
 
-#. rebuild freelist
 #: fdisk/fdisksgilabel.c:579
 #, c-format
 msgid "Do You know, You got a partition overlap on the disk?\n"
@@ -3563,44 +3478,43 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS home"
 msgstr ""
 
-#. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:133
+#: fdisk/fdisksunlabel.c:132
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3609,12 +3523,12 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:232
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:259
+#: fdisk/fdisksunlabel.c:258
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -3623,86 +3537,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:270
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:280
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:292
+#: fdisk/fdisksunlabel.c:291
 #, c-format
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:315
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:322
 msgid "Alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:325
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:729
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:722
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:715
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:347
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:355
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:462
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:484
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:513
+#: fdisk/fdisksunlabel.c:512
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:594
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3710,14 +3624,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:616
+#: fdisk/fdisksunlabel.c:615
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:627
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3726,7 +3640,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:659
+#: fdisk/fdisksunlabel.c:658
 #, c-format
 msgid ""
 "\n"
@@ -3738,7 +3652,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:673
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid ""
 "\n"
@@ -3747,16 +3661,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:677
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:703
+#: fdisk/fdisksunlabel.c:702
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:736
+#: fdisk/fdisksunlabel.c:735
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3780,32 +3694,26 @@ msgstr ""
 msgid "Extended"
 msgstr ""
 
-#. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
 msgstr ""
 
-#. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
 msgstr ""
 
-#. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
 msgstr ""
 
-#. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
 msgstr ""
 
-#. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
 msgstr ""
 
-#. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
 msgid "W95 FAT32"
 msgstr ""
@@ -3814,7 +3722,6 @@ msgstr ""
 msgid "W95 FAT32 (LBA)"
 msgstr ""
 
-#. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
 msgid "W95 FAT16 (LBA)"
 msgstr ""
@@ -3907,12 +3814,10 @@ msgstr ""
 msgid "OnTrack DM6 Aux1"
 msgstr ""
 
-#. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr ""
 
-#. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr ""
@@ -3933,8 +3838,6 @@ msgstr ""
 msgid "Priam Edisk"
 msgstr ""
 
-#. DOS R/O or SpeedStor
-#. Linux/PA-RISC boot loader
 #: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
 #: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
 msgid "SpeedStor"
@@ -3944,7 +3847,6 @@ msgstr ""
 msgid "GNU HURD or SysV"
 msgstr ""
 
-#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr ""
@@ -3965,12 +3867,10 @@ msgstr ""
 msgid "Old Minix"
 msgstr ""
 
-#. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr ""
 
-#. Minix 1.4b and later
 #: fdisk/i386_sys_types.c:56
 msgid "Linux swap / Solaris"
 msgstr ""
@@ -3999,12 +3899,10 @@ msgstr ""
 msgid "Amoeba BBT"
 msgstr ""
 
-#. (bad block table)
 #: fdisk/i386_sys_types.c:66
 msgid "BSD/OS"
 msgstr ""
 
-#. BSDI
 #: fdisk/i386_sys_types.c:67
 msgid "IBM Thinkpad hibernation"
 msgstr ""
@@ -4013,7 +3911,6 @@ msgstr ""
 msgid "FreeBSD"
 msgstr ""
 
-#. various BSD flavours
 #: fdisk/i386_sys_types.c:69
 msgid "OpenBSD"
 msgstr ""
@@ -4078,30 +3975,22 @@ msgstr ""
 msgid "CP/M / CTOS / ..."
 msgstr ""
 
-#. CP/M or Concurrent CP/M or
-#. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:86
 msgid "Dell Utility"
 msgstr ""
 
-#. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:87
 msgid "BootIt"
 msgstr ""
 
-#. BootIt EMBRM
 #: fdisk/i386_sys_types.c:88
 msgid "DOS access"
 msgstr ""
 
-#. DOS access or SpeedStor 12-bit FAT
-#. extended partition
 #: fdisk/i386_sys_types.c:90
 msgid "DOS R/O"
 msgstr ""
 
-#. SpeedStor 16-bit FAT extended
-#. partition < 1024 cyl.
 #: fdisk/i386_sys_types.c:93
 msgid "BeOS fs"
 msgstr ""
@@ -4110,116 +3999,109 @@ msgstr ""
 msgid "EFI GPT"
 msgstr ""
 
-#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:95
 msgid "EFI (FAT-12/16/32)"
 msgstr ""
 
-#. Intel EFI System Partition
 #: fdisk/i386_sys_types.c:96
 msgid "Linux/PA-RISC boot"
 msgstr ""
 
-#. SpeedStor large partition
 #: fdisk/i386_sys_types.c:99
 msgid "DOS secondary"
 msgstr ""
 
-#. New (2.2.x) raid partition with
-#. autodetect using persistent
-#. superblock
 #: fdisk/i386_sys_types.c:103
 msgid "LANstep"
 msgstr ""
 
-#. SpeedStor >1024 cyl. or LANstep
 #: fdisk/i386_sys_types.c:104
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:197
+#: fdisk/sfdisk.c:195
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:200
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:248
+#: fdisk/sfdisk.c:246
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:253 fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:271
+#: fdisk/sfdisk.c:269
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:284
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:322
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:340
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:360
+#: fdisk/sfdisk.c:358
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:365
+#: fdisk/sfdisk.c:363
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:369
+#: fdisk/sfdisk.c:367
 msgid "out of memory?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:375
+#: fdisk/sfdisk.c:373
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:381
+#: fdisk/sfdisk.c:379
 #, c-format
 msgid "error reading %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:388
+#: fdisk/sfdisk.c:386
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:400
+#: fdisk/sfdisk.c:398
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:451
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:470
+#: fdisk/sfdisk.c:468
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:503
+#: fdisk/sfdisk.c:501
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4227,165 +4109,165 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:510
+#: fdisk/sfdisk.c:508
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:513
+#: fdisk/sfdisk.c:511
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:515
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:520
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:526
+#: fdisk/sfdisk.c:524
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:608
+#: fdisk/sfdisk.c:606
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:613
+#: fdisk/sfdisk.c:611
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:618
+#: fdisk/sfdisk.c:616
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:658
+#: fdisk/sfdisk.c:656
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:812
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:820
+#: fdisk/sfdisk.c:818
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:825
+#: fdisk/sfdisk.c:823
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:861
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:884
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:925
+#: fdisk/sfdisk.c:923
 #, c-format
 msgid "# partition table of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:936
+#: fdisk/sfdisk.c:934
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:940
+#: fdisk/sfdisk.c:938
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:943
+#: fdisk/sfdisk.c:941
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:948
+#: fdisk/sfdisk.c:946
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:950
+#: fdisk/sfdisk.c:948
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:953
+#: fdisk/sfdisk.c:951
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:955
+#: fdisk/sfdisk.c:953
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:956
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:960
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1118
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1130
+#: fdisk/sfdisk.c:1128
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1140
+#: fdisk/sfdisk.c:1138
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1144
+#: fdisk/sfdisk.c:1142
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4393,519 +4275,514 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1193
+#: fdisk/sfdisk.c:1191
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1195
+#: fdisk/sfdisk.c:1193
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1207
+#: fdisk/sfdisk.c:1205
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1210
+#: fdisk/sfdisk.c:1208
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1219
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1220
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1233
+#: fdisk/sfdisk.c:1231
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1232
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1243
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1257
+#: fdisk/sfdisk.c:1255
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1261
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1276
+#: fdisk/sfdisk.c:1274
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1294
+#: fdisk/sfdisk.c:1292
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1300
+#: fdisk/sfdisk.c:1298
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1316
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1325
+#: fdisk/sfdisk.c:1323
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1331
+#: fdisk/sfdisk.c:1329
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1345
+#: fdisk/sfdisk.c:1343
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1348
+#: fdisk/sfdisk.c:1346
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1354
+#: fdisk/sfdisk.c:1352
 msgid "end"
 msgstr ""
 
-#: fdisk/sfdisk.c:1357
+#: fdisk/sfdisk.c:1355
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1358
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1383
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1389
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1409 fdisk/sfdisk.c:1486
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1422
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1545
+#: fdisk/sfdisk.c:1543
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1552
+#: fdisk/sfdisk.c:1550
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1572
+#: fdisk/sfdisk.c:1570
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579 fdisk/sfdisk.c:1590
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1624
+#: fdisk/sfdisk.c:1622
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1636
+#: fdisk/sfdisk.c:1634
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1652
+#: fdisk/sfdisk.c:1650
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1657
+#: fdisk/sfdisk.c:1655
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1734
+#: fdisk/sfdisk.c:1732
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1770
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1777
+#: fdisk/sfdisk.c:1775
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1783
+#: fdisk/sfdisk.c:1781
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1825
+#: fdisk/sfdisk.c:1823
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1829
+#: fdisk/sfdisk.c:1827
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1950
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1985
+#: fdisk/sfdisk.c:1983
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2036
+#: fdisk/sfdisk.c:2034
 msgid "too many input fields\n"
 msgstr ""
 
-#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2068
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2087
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2119
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2125
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2139
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2154
+#: fdisk/sfdisk.c:2152
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2171 fdisk/sfdisk.c:2184
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2195
+#: fdisk/sfdisk.c:2193
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2225
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2247
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2282
+#: fdisk/sfdisk.c:2280
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
-msgid "version"
-msgstr ""
-
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2306
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2311
+#: fdisk/sfdisk.c:2307
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2308
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2309
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2310
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2311
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2312
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2313
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2315
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2320
+#: fdisk/sfdisk.c:2316
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2321
+#: fdisk/sfdisk.c:2317
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2322
+#: fdisk/sfdisk.c:2318
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2323
+#: fdisk/sfdisk.c:2319
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2324
+#: fdisk/sfdisk.c:2320
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2321
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2322
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2323
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2324
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2329
+#: fdisk/sfdisk.c:2325
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2330
+#: fdisk/sfdisk.c:2326
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2327
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2333
+#: fdisk/sfdisk.c:2329
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2334
+#: fdisk/sfdisk.c:2330
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2335
+#: fdisk/sfdisk.c:2331
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2336
+#: fdisk/sfdisk.c:2332
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2337
+#: fdisk/sfdisk.c:2333
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2338
+#: fdisk/sfdisk.c:2334
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2339
+#: fdisk/sfdisk.c:2335
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2340
+#: fdisk/sfdisk.c:2336
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2346
+#: fdisk/sfdisk.c:2342
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2347
+#: fdisk/sfdisk.c:2343
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2348
+#: fdisk/sfdisk.c:2344
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2349
+#: fdisk/sfdisk.c:2345
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2512
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2639
+#: fdisk/sfdisk.c:2635
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2678
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2676
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2682
+#: fdisk/sfdisk.c:2678
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2689
+#: fdisk/sfdisk.c:2685
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2715
+#: fdisk/sfdisk.c:2711
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2717
+#: fdisk/sfdisk.c:2713
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2738
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759 fdisk/sfdisk.c:2790
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2803
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2881
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2956 fdisk/sfdisk.c:2987
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2908
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2922
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2983
+#: fdisk/sfdisk.c:2979
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2998
+#: fdisk/sfdisk.c:2994
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:3011
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3014
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3024
+#: fdisk/sfdisk.c:3020
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3026
+#: fdisk/sfdisk.c:3022
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4913,73 +4790,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3030
+#: fdisk/sfdisk.c:3026
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034
+#: fdisk/sfdisk.c:3030
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3043
+#: fdisk/sfdisk.c:3039
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3047
+#: fdisk/sfdisk.c:3043
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3055
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3060
+#: fdisk/sfdisk.c:3056
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3059
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3068
+#: fdisk/sfdisk.c:3064
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3070
+#: fdisk/sfdisk.c:3066
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3075
+#: fdisk/sfdisk.c:3071
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3077
+#: fdisk/sfdisk.c:3073
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3083
+#: fdisk/sfdisk.c:3079
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3091
+#: fdisk/sfdisk.c:3087
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3097
+#: fdisk/sfdisk.c:3093
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
@@ -5073,179 +4950,179 @@ msgstr ""
 msgid "internal error, contact the author."
 msgstr ""
 
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:176
 #, c-format
 msgid "booted from MILO\n"
 msgstr ""
 
-#: hwclock/cmos.c:186
+#: hwclock/cmos.c:185
 #, c-format
 msgid "Ruffian BCD clock\n"
 msgstr ""
 
-#: hwclock/cmos.c:202
+#: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr ""
 
-#: hwclock/cmos.c:214
+#: hwclock/cmos.c:213
 #, c-format
 msgid "funky TOY!\n"
 msgstr ""
 
-#: hwclock/cmos.c:268
+#: hwclock/cmos.c:267
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr ""
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:591
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr ""
 
-#: hwclock/cmos.c:599
+#: hwclock/cmos.c:598
 #, c-format
 msgid "I failed to get permission because I didn't try.\n"
 msgstr ""
 
-#: hwclock/cmos.c:602
+#: hwclock/cmos.c:601
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 
-#: hwclock/cmos.c:605
+#: hwclock/cmos.c:604
 #, c-format
 msgid "Probably you need root privileges.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:224
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:319
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
 msgstr ""
 
-#: hwclock/hwclock.c:225 hwclock/hwclock.c:318
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
 msgstr ""
 
-#: hwclock/hwclock.c:304
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr ""
 
-#: hwclock/hwclock.c:306
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr ""
 
-#: hwclock/hwclock.c:313
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:315
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:317
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:319
+#: hwclock/hwclock.c:318
 msgid "unknown"
 msgstr ""
 
-#: hwclock/hwclock.c:343
+#: hwclock/hwclock.c:342
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr ""
 
-#: hwclock/hwclock.c:347
+#: hwclock/hwclock.c:346
 #, c-format
 msgid "...got clock tick\n"
 msgstr ""
 
-#: hwclock/hwclock.c:400
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:408
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:436
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:463
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 
-#: hwclock/hwclock.c:469
+#: hwclock/hwclock.c:468
 #, c-format
 msgid "Clock not changed - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:517
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:546
+#: hwclock/hwclock.c:545
 #, c-format
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
 
-#: hwclock/hwclock.c:556
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:590
+#: hwclock/hwclock.c:589
 #, c-format
 msgid "No --date option specified.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:596
+#: hwclock/hwclock.c:595
 #, c-format
 msgid "--date argument too long\n"
 msgstr ""
 
-#: hwclock/hwclock.c:603
+#: hwclock/hwclock.c:602
 #, c-format
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:615
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:625
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -5255,7 +5132,7 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:637
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -5266,69 +5143,69 @@ msgid ""
 " %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:648
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:680
+#: hwclock/hwclock.c:679
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:701
 #, c-format
 msgid "Calling settimeofday:\n"
 msgstr ""
 
-#: hwclock/hwclock.c:703
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr ""
 
-#: hwclock/hwclock.c:705
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
 msgstr ""
 
-#: hwclock/hwclock.c:708
+#: hwclock/hwclock.c:707
 #, c-format
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:717
+#: hwclock/hwclock.c:716
 #, c-format
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:720
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
 msgstr ""
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:749
 #, c-format
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:755
+#: hwclock/hwclock.c:754
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:761
+#: hwclock/hwclock.c:760
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:809
+#: hwclock/hwclock.c:808
 #, c-format
 msgid ""
 "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
@@ -5336,60 +5213,60 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: hwclock/hwclock.c:860
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr ""
 
-#: hwclock/hwclock.c:862
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 
-#: hwclock/hwclock.c:891
+#: hwclock/hwclock.c:890
 #, c-format
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:892
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 
-#: hwclock/hwclock.c:916
+#: hwclock/hwclock.c:915
 #, c-format
 msgid "Drift adjustment parameters not updated.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:957
+#: hwclock/hwclock.c:956
 #, c-format
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:989
+#: hwclock/hwclock.c:988
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1015
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1017
+#: hwclock/hwclock.c:1016
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1113
+#: hwclock/hwclock.c:1112
 #, c-format
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1143
+#: hwclock/hwclock.c:1142
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5398,34 +5275,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1151
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1154
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1157
+#: hwclock/hwclock.c:1156
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1160
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1163
+#: hwclock/hwclock.c:1162
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1197
+#: hwclock/hwclock.c:1175
+#, c-format
+msgid "%s from util-linux-%s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -5457,72 +5339,72 @@ msgid ""
 "                either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1224
+#: hwclock/hwclock.c:1223
 #, c-format
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1398
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1404
+#: hwclock/hwclock.c:1403
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1411
+#: hwclock/hwclock.c:1410
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1418
+#: hwclock/hwclock.c:1417
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1425
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1439
+#: hwclock/hwclock.c:1438
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1455
+#: hwclock/hwclock.c:1454
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1460
+#: hwclock/hwclock.c:1459
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1465
+#: hwclock/hwclock.c:1464
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1485
+#: hwclock/hwclock.c:1484
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1489
+#: hwclock/hwclock.c:1488
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -5556,7 +5438,6 @@ msgstr ""
 msgid "ioctl KDSHWCLK failed"
 msgstr ""
 
-#. probably KDGHWCLK exists on m68k only
 #: hwclock/kd.c:177
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr ""
@@ -5648,9 +5529,6 @@ msgstr ""
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
-#. kernel would not accept this epoch value
-#. Hmm - bad habit, deciding not to do what the user asks
-#. just because one believes that the kernel might not like it.
 #: hwclock/rtc.c:421
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
@@ -5676,7 +5554,6 @@ msgstr ""
 msgid "calling open_tty\n"
 msgstr ""
 
-#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
 msgstr ""
@@ -5685,7 +5562,6 @@ msgstr ""
 msgid "writing init string\n"
 msgstr ""
 
-#. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
 msgstr ""
@@ -5699,7 +5575,6 @@ msgstr ""
 msgid "read %c\n"
 msgstr ""
 
-#. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
 msgstr ""
@@ -5753,7 +5628,6 @@ msgstr ""
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
 msgstr ""
@@ -5768,12 +5642,10 @@ msgstr ""
 msgid "%s: not open for read/write"
 msgstr ""
 
-#. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
 msgstr ""
 
-#. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
@@ -5812,30 +5684,25 @@ msgid ""
 "line baud_rate,... [termtype]\n"
 msgstr ""
 
-#: login-utils/checktty.c:104 login-utils/checktty.c:125
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
 #, c-format
 msgid "login: memory low, login may fail\n"
 msgstr ""
 
-#: login-utils/checktty.c:105
+#: login-utils/checktty.c:85
 msgid "can't malloc for ttyclass"
 msgstr ""
 
-#: login-utils/checktty.c:126
+#: login-utils/checktty.c:106
 msgid "can't malloc for grplist"
 msgstr ""
 
-#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:422
+#: login-utils/checktty.c:396
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr ""
 
-#. if we get here, /etc/usertty exists, there's a line
-#. matching our username, but it doesn't contain the
-#. name of the tty where the user is trying to log in.
-#. So deny access!
-#: login-utils/checktty.c:433
+#: login-utils/checktty.c:407
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr ""
@@ -5880,8 +5747,8 @@ msgstr ""
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
 #: mount/lomount.c:300
 msgid "Password: "
 msgstr ""
@@ -6051,34 +5918,6 @@ msgstr ""
 msgid "No known shells.\n"
 msgstr ""
 
-#: login-utils/cryptocard.c:68
-msgid "couldn't open /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:73
-msgid "couldn't read random data from /dev/urandom"
-msgstr ""
-
-#: login-utils/cryptocard.c:96
-#, c-format
-msgid "can't open %s for reading"
-msgstr ""
-
-#: login-utils/cryptocard.c:100
-#, c-format
-msgid "can't stat(%s)"
-msgstr ""
-
-#: login-utils/cryptocard.c:106
-#, c-format
-msgid "%s doesn't have the correct filemodes"
-msgstr ""
-
-#: login-utils/cryptocard.c:111
-#, c-format
-msgid "can't read data from %s"
-msgstr ""
-
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
@@ -6088,299 +5927,280 @@ msgstr ""
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
 
-#: login-utils/last.c:312
+#: login-utils/last.c:284
 msgid "  still logged in"
 msgstr ""
 
-#: login-utils/last.c:340
+#: login-utils/last.c:306
 #, c-format
 msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
 
-#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
 msgid "last: malloc failure.\n"
 msgstr ""
 
-#: login-utils/last.c:441
+#: login-utils/last.c:407
 msgid "last: gethostname"
 msgstr ""
 
-#: login-utils/last.c:490
+#: login-utils/last.c:456
 #, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:254
+#: login-utils/login.c:196
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr ""
 
-#: login-utils/login.c:285
+#: login-utils/login.c:227
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:418
+#: login-utils/login.c:355
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:445
+#: login-utils/login.c:382
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:538
+#: login-utils/login.c:475
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/login.c:540
+#: login-utils/login.c:477
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr ""
 
-#.
-#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. * so that the "login: " prompt gets localized. Unfortunately,
-#. * PAM doesn't have an interface to specify the "Password: " string
-#. * (yet).
-#.
-#: login-utils/login.c:557
+#: login-utils/login.c:494
 msgid "login: "
 msgstr ""
 
-#: login-utils/login.c:597
+#: login-utils/login.c:534
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:601
+#: login-utils/login.c:538
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
 
-#: login-utils/login.c:610
+#: login-utils/login.c:547
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:614
+#: login-utils/login.c:551
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:618
+#: login-utils/login.c:555
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:641
+#: login-utils/login.c:578
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:648
+#: login-utils/login.c:585
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:667
+#: login-utils/login.c:604
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:709
+#: login-utils/login.c:646
 msgid "Illegal username"
 msgstr ""
 
-#: login-utils/login.c:752
+#: login-utils/login.c:689
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:694
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:761
+#: login-utils/login.c:698
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:814
+#: login-utils/login.c:751
 #, c-format
 msgid "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:836
-#, c-format
-msgid ""
-"Too many users logged on already.\n"
-"Try again later.\n"
-msgstr ""
-
-#: login-utils/login.c:840
-#, c-format
-msgid "You have too many processes running.\n"
-msgstr ""
-
-#: login-utils/login.c:1063
+#: login-utils/login.c:972
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:979
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:982
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr ""
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:985
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:988
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1009
 #, c-format
 msgid "You have new mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1102
+#: login-utils/login.c:1011
 #, c-format
 msgid "You have mail.\n"
 msgstr ""
 
-#. error in fork()
-#: login-utils/login.c:1122
+#: login-utils/login.c:1031
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1159
+#: login-utils/login.c:1068
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1074
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1080
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1175
+#: login-utils/login.c:1084
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1183
+#: login-utils/login.c:1092
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1119
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1213
+#: login-utils/login.c:1122
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1228
+#: login-utils/login.c:1137
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1239
+#: login-utils/login.c:1148
 #, c-format
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1240
+#: login-utils/login.c:1149
 msgid "NAME too long"
 msgstr ""
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1156
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1257
+#: login-utils/login.c:1166
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1258
+#: login-utils/login.c:1167
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1290
+#: login-utils/login.c:1199
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1287
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1291
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1294
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1405
+#: login-utils/login.c:1314
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1408
+#: login-utils/login.c:1317
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1412
+#: login-utils/login.c:1321
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1415
+#: login-utils/login.c:1324
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -6400,163 +6220,30 @@ msgstr ""
 msgid "usage: mesg [y | n]\n"
 msgstr ""
 
-#: login-utils/newgrp.c:68
+#: login-utils/newgrp.c:69
 msgid "newgrp: Who are you?"
 msgstr ""
 
-#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
 msgid "newgrp: setgid"
 msgstr ""
 
-#: login-utils/newgrp.c:81
+#: login-utils/newgrp.c:82
 msgid "newgrp: No such group."
 msgstr ""
 
-#: login-utils/newgrp.c:90
+#: login-utils/newgrp.c:91
 msgid "newgrp: Permission denied"
 msgstr ""
 
-#: login-utils/newgrp.c:97
+#: login-utils/newgrp.c:98
 msgid "newgrp: setuid"
 msgstr ""
 
-#: login-utils/newgrp.c:103
+#: login-utils/newgrp.c:104
 msgid "No shell"
 msgstr ""
 
-#: login-utils/passwd.c:161
-#, c-format
-msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-
-#: login-utils/passwd.c:174
-#, c-format
-msgid ""
-"The password must contain characters out of two of the following\n"
-"classes:  upper and lower case letters, digits and non alphanumeric\n"
-"characters. See passwd(1) for more information.\n"
-msgstr ""
-
-#: login-utils/passwd.c:183
-#, c-format
-msgid "You cannot reuse the old password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:188
-#, c-format
-msgid "Please don't use something like your username as password!\n"
-msgstr ""
-
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
-#, c-format
-msgid "Please don't use something like your realname as password!\n"
-msgstr ""
-
-#: login-utils/passwd.c:224
-#, c-format
-msgid "Usage: passwd [username [password]]\n"
-msgstr ""
-
-#: login-utils/passwd.c:225
-#, c-format
-msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-
-#: login-utils/passwd.c:280
-#, c-format
-msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr ""
-
-#: login-utils/passwd.c:301
-#, c-format
-msgid "Can't exec %s: %s\n"
-msgstr ""
-
-#: login-utils/passwd.c:312
-msgid "Cannot find login name"
-msgstr ""
-
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
-#, c-format
-msgid "Only root can change the password for others.\n"
-msgstr ""
-
-#: login-utils/passwd.c:334
-#, c-format
-msgid "Too many arguments.\n"
-msgstr ""
-
-#: login-utils/passwd.c:339
-#, c-format
-msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-
-#: login-utils/passwd.c:343
-msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-
-#: login-utils/passwd.c:349
-msgid "UID and username does not match, imposter!"
-msgstr ""
-
-#: login-utils/passwd.c:354
-#, c-format
-msgid "Changing password for %s\n"
-msgstr ""
-
-#: login-utils/passwd.c:358
-msgid "Enter old password: "
-msgstr ""
-
-#: login-utils/passwd.c:360
-msgid "Illegal password, imposter."
-msgstr ""
-
-#: login-utils/passwd.c:372
-msgid "Enter new password: "
-msgstr ""
-
-#: login-utils/passwd.c:374
-msgid "Password not changed."
-msgstr ""
-
-#: login-utils/passwd.c:383
-msgid "Re-type new password: "
-msgstr ""
-
-#: login-utils/passwd.c:386
-msgid "You misspelled it. Password not changed."
-msgstr ""
-
-#: login-utils/passwd.c:401
-#, c-format
-msgid "password changed, user %s"
-msgstr ""
-
-#: login-utils/passwd.c:404
-msgid "ROOT PASSWORD CHANGED"
-msgstr ""
-
-#: login-utils/passwd.c:406
-#, c-format
-msgid "password changed by root, user %s"
-msgstr ""
-
-#: login-utils/passwd.c:413
-#, c-format
-msgid "calling setpwnam to set password.\n"
-msgstr ""
-
-#: login-utils/passwd.c:417
-#, c-format
-msgid "Password *NOT* changed.  Try again later.\n"
-msgstr ""
-
-#: login-utils/passwd.c:423
-#, c-format
-msgid "Password changed.\n"
-msgstr ""
-
 #: login-utils/shutdown.c:113
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
@@ -6603,7 +6290,6 @@ msgstr ""
 msgid "halted by %s: %s"
 msgstr ""
 
-#. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
 msgid ""
 "\n"
@@ -6636,7 +6322,6 @@ msgstr ""
 msgid "Error executing\t%s\n"
 msgstr ""
 
-#. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
@@ -6726,7 +6411,6 @@ msgstr ""
 msgid "error running finalprog\n"
 msgstr ""
 
-#. Error
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
 msgstr ""
@@ -6753,7 +6437,7 @@ msgstr ""
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1621
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
 msgid "exec failed\n"
 msgstr ""
 
@@ -6902,12 +6586,6 @@ msgstr ""
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#.
-#. * %s is the month name, %d the year number.
-#. * you can change the order and/or add something here; eg for
-#. * Basque the translation should be: "%2$dko %1$s", and
-#. * the Vietnamese should be "%s na(m %d", etc.
-#.
 #: misc-utils/cal.c:439
 #, c-format
 msgid "%s %d"
@@ -6918,13 +6596,12 @@ msgstr ""
 msgid "usage: cal [-13smjyV] [[month] year]\n"
 msgstr ""
 
-#: misc-utils/ddate.c:204
+#: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr ""
 
-#. handle St. Tib's Day
-#: misc-utils/ddate.c:251
+#: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
 msgstr ""
 
@@ -7054,7 +6731,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:107
+#: misc-utils/script.c:106
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7062,276 +6739,275 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:169
+#: misc-utils/script.c:168
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:192
+#: misc-utils/script.c:191
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:278
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:362
+#: misc-utils/script.c:361
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:369
+#: misc-utils/script.c:368
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:379
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:414
+#: misc-utils/script.c:413
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
 
-#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:746
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:749
 #, c-format
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:750
 #, c-format
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:751
 #, c-format
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:752
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:754
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:755
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:757
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:758
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:759
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:760
 #, c-format
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:761
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
-#: misc-utils/setterm.c:770
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:777
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:779
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:781
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:783
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:785
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:786
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:788
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1049
+#: misc-utils/setterm.c:1051
 #, c-format
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1151
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1164
+#: misc-utils/setterm.c:1166
 #, c-format
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1178
+#: misc-utils/setterm.c:1180
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1244
+#: misc-utils/setterm.c:1246
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7406,10 +7082,6 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#. linktargetfile does not exist (as a file)
-#. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system?
-#. Filesystem full?
 #: mount/fstab.c:484
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
@@ -7693,232 +7365,217 @@ msgstr ""
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:763 mount/mount.c:1348
+#: mount/mount.c:763 mount/mount.c:1339
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:851
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-
-#: mount/mount.c:891
+#: mount/mount.c:885
 #, c-format
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:895
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:898
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#. should not happen
-#: mount/mount.c:908
+#: mount/mount.c:901
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:914 mount/mount.c:949
+#: mount/mount.c:907 mount/mount.c:942
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:916
+#: mount/mount.c:909
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:911
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#. heuristic: if /proc/version exists, then probably proc is mounted
-#. proc mounted?
-#: mount/mount.c:922 mount/mount.c:926
+#: mount/mount.c:915 mount/mount.c:919
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#. no
-#. yes, don't mention it
-#: mount/mount.c:928
+#: mount/mount.c:921
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:930
+#: mount/mount.c:923
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:936
+#: mount/mount.c:929
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:938
+#: mount/mount.c:931
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:941
+#: mount/mount.c:934
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:951
+#: mount/mount.c:944
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:964
+#: mount/mount.c:957
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:959
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or other error"
 msgstr ""
 
-#: mount/mount.c:976
+#: mount/mount.c:969
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:975
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:992
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:998
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1007
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1011
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1016
+#: mount/mount.c:1009
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1028
+#: mount/mount.c:1021
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1030
+#: mount/mount.c:1023
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1032
+#: mount/mount.c:1025
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1035
+#: mount/mount.c:1028
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#. strange ...
-#: mount/mount.c:1041
+#: mount/mount.c:1034
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1043
+#: mount/mount.c:1036
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1046
+#: mount/mount.c:1039
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1049
+#: mount/mount.c:1042
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1052
+#: mount/mount.c:1045
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#. pre-linux 1.1.38, 1.1.41 and later
-#. linux 1.1.38 and later
-#: mount/mount.c:1055
+#: mount/mount.c:1048
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1057
+#: mount/mount.c:1050
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1061
+#: mount/mount.c:1054
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1078
+#: mount/mount.c:1071
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1183
+#: mount/mount.c:1176
 #, c-format
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
-#.
-#. * Retry in the background.
-#.
-#: mount/mount.c:1200
+#: mount/mount.c:1193
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1204
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1286
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1416
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7944,34 +7601,34 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1615
+#: mount/mount.c:1605
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1620
+#: mount/mount.c:1610
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1632
+#: mount/mount.c:1622
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1634
+#: mount/mount.c:1624
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1643
+#: mount/mount.c:1633
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1658
+#: mount/mount.c:1648
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1673
+#: mount/mount.c:1663
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8006,98 +7663,98 @@ msgstr ""
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:237
+#: mount/nfsmount.c:235
 #, c-format
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:251
+#: mount/nfsmount.c:249
 #, c-format
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:256
+#: mount/nfsmount.c:254
 #, c-format
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:273
+#: mount/nfsmount.c:271
 #, c-format
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:290
+#: mount/nfsmount.c:288
 #, c-format
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:382
+#: mount/nfsmount.c:380
 #, c-format
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:389
+#: mount/nfsmount.c:387
 #, c-format
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:393
+#: mount/nfsmount.c:391
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:427
+#: mount/nfsmount.c:425
 #, c-format
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:432
+#: mount/nfsmount.c:430
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
+#: mount/nfsmount.c:526
 #, c-format
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:716
+#: mount/nfsmount.c:714
 #, c-format
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:723
+#: mount/nfsmount.c:721
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:727
+#: mount/nfsmount.c:725
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:741
+#: mount/nfsmount.c:739
 msgid "nfs server reported service unavailable"
 msgstr ""
 
-#: mount/nfsmount.c:750
+#: mount/nfsmount.c:748
 #, c-format
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:754
+#: mount/nfsmount.c:752
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:765
+#: mount/nfsmount.c:763
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:852
+#: mount/nfsmount.c:850
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
@@ -8106,7 +7763,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:57
+#: mount/swapon.c:56
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8115,7 +7772,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:67
+#: mount/swapon.c:66
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8123,138 +7780,136 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:174 mount/swapon.c:266
+#: mount/swapon.c:173 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:178 mount/swapon.c:244
+#: mount/swapon.c:177 mount/swapon.c:243
 #, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr ""
 
-#: mount/swapon.c:185
+#: mount/swapon.c:184
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:196
+#: mount/swapon.c:195
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:208
+#: mount/swapon.c:207
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:275
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:310 mount/swapon.c:502
+#: mount/swapon.c:309 mount/swapon.c:501
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
 
-#: mount/umount.c:51
+#: mount/umount.c:49
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:141
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:171
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:194
+#: mount/umount.c:191
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:199
+#: mount/umount.c:196
 #, c-format
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:247
+#: mount/umount.c:243
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:249
+#: mount/umount.c:245
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:247
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#. Let us hope fstab has a line "proc /proc ..."
-#. and not "none /proc ..."
-#: mount/umount.c:255
+#: mount/umount.c:251
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:257
+#: mount/umount.c:253
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:259
+#: mount/umount.c:255
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:257
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:259
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:313
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:335
+#: mount/umount.c:329
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:353
+#: mount/umount.c:347
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:357
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:372
+#: mount/umount.c:366
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:464
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:494
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8262,47 +7917,46 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#. "" would be expanded to `pwd`
-#: mount/umount.c:553
+#: mount/umount.c:546
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:559
+#: mount/umount.c:552
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:565
+#: mount/umount.c:558
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:572
+#: mount/umount.c:565
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:579
+#: mount/umount.c:572
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:592
+#: mount/umount.c:585
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:596
+#: mount/umount.c:589
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:637
+#: mount/umount.c:630
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:718
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8447,7 +8101,7 @@ msgstr ""
 #: sys-utils/flock.c:77
 #, c-format
 msgid ""
-"Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n"
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
 msgstr ""
 
 #: sys-utils/ipcrm.c:66
@@ -8601,8 +8255,6 @@ msgstr ""
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#. glibc 2.1.3 and all earlier libc's have ints as fields
-#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %lu\n"
@@ -9356,17 +9008,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:261
+#: text-utils/more.c:216
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:484
+#: text-utils/more.c:439
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr ""
 
-#: text-utils/more.c:516
+#: text-utils/more.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9374,8 +9026,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#. simple ELF detection
-#: text-utils/more.c:559
+#: text-utils/more.c:514
 #, c-format
 msgid ""
 "\n"
@@ -9383,52 +9034,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:662
+#: text-utils/more.c:617
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:754
+#: text-utils/more.c:709
 #, c-format
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:756
+#: text-utils/more.c:711
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:761
+#: text-utils/more.c:716
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 
-#: text-utils/more.c:1160
+#: text-utils/more.c:1115
 #, c-format
 msgid "...back %d pages"
 msgstr ""
 
-#: text-utils/more.c:1162
+#: text-utils/more.c:1117
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1205
+#: text-utils/more.c:1160
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1207
+#: text-utils/more.c:1162
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1244
+#: text-utils/more.c:1199
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1282
+#: text-utils/more.c:1237
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9436,7 +9087,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1289
+#: text-utils/more.c:1244
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9459,66 +9110,66 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1358 text-utils/more.c:1363
+#: text-utils/more.c:1313 text-utils/more.c:1318
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1397
+#: text-utils/more.c:1352
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1354
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1483
+#: text-utils/more.c:1438
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1530
+#: text-utils/more.c:1485
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1559
+#: text-utils/more.c:1514
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1571
+#: text-utils/more.c:1526
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1574 text-utils/pg.c:1145 text-utils/pg.c:1296
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1635
+#: text-utils/more.c:1590
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1674
+#: text-utils/more.c:1629
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1678
+#: text-utils/more.c:1633
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1680
+#: text-utils/more.c:1635
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1958
+#: text-utils/more.c:1913
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2001
+#: text-utils/more.c:1956
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9571,90 +9222,87 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:257
+#: text-utils/pg.c:237
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:266
+#: text-utils/pg.c:246
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:274
+#: text-utils/pg.c:254
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:391
+#: text-utils/pg.c:371
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:393
+#: text-utils/pg.c:373
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:395
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:419
+#: text-utils/pg.c:399
 msgid "No previous file"
 msgstr ""
 
-#: text-utils/pg.c:949
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#.
-#. * Most likely '\0' in input.
-#.
-#: text-utils/pg.c:955
+#: text-utils/pg.c:935
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:958
+#: text-utils/pg.c:938
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1053
+#: text-utils/pg.c:1033
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1062 text-utils/pg.c:1237
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1219
+#: text-utils/pg.c:1199
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1245
+#: text-utils/pg.c:1225
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1328
+#: text-utils/pg.c:1308
 msgid "Cannot open "
 msgstr ""
 
-#: text-utils/pg.c:1376
+#: text-utils/pg.c:1356
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1483
+#: text-utils/pg.c:1463
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1515
+#: text-utils/pg.c:1495
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1720
+#: text-utils/pg.c:1700
 msgid "(Next file: "
 msgstr ""
 
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 000000000..5bf072f70
--- /dev/null
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 000000000..80586b163
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,10162 @@
+# translation of util-linux-2.12q.po to Vietnamese
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.12q\n"
+"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
+"POT-Creation-Date: 2005-08-02 21:07+0200\n"
+"PO-Revision-Date: 2005-04-05 00:53+0400\n"
+"Last-Translator: Phan Vinh Thinh <teppi82@gmail.com>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#: disk-utils/blockdev.c:62
+msgid "set read-only"
+msgstr "thiết lập chỉ đọc"
+
+#: disk-utils/blockdev.c:63
+msgid "set read-write"
+msgstr "thiết lập đọc-viết"
+
+#: disk-utils/blockdev.c:66
+msgid "get read-only"
+msgstr "lấy chỉ đọc"
+
+#: disk-utils/blockdev.c:69
+msgid "get sectorsize"
+msgstr "lấy kích thước sector"
+
+#: disk-utils/blockdev.c:72
+msgid "get blocksize"
+msgstr "lấy kích thước block"
+
+#: disk-utils/blockdev.c:75
+msgid "set blocksize"
+msgstr "lấy kích thước block"
+
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr "lấy số sector 32 bit"
+
+#: disk-utils/blockdev.c:81
+msgid "get size in bytes"
+msgstr "lấy kích thước theo byte"
+
+#: disk-utils/blockdev.c:84
+msgid "set readahead"
+msgstr "đặt readahead"
+
+#: disk-utils/blockdev.c:87
+msgid "get readahead"
+msgstr "lấy readahead"
+
+#: disk-utils/blockdev.c:90
+msgid "flush buffers"
+msgstr "làm tràn bộ đệm"
+
+#: disk-utils/blockdev.c:94
+msgid "reread partition table"
+msgstr "đọc lại bảng phân vùng"
+
+#: disk-utils/blockdev.c:103
+#, c-format
+msgid "Usage:\n"
+msgstr "Sử dụng:\n"
+
+#: disk-utils/blockdev.c:105
+#, c-format
+msgid "  %s --report [devices]\n"
+msgstr "   %s --báo cáo [thiết bị]\n"
+
+#: disk-utils/blockdev.c:106
+#, c-format
+msgid "  %s [-v|-q] commands devices\n"
+msgstr "  %s [-v|-q] câu_lệnh thiết_bị\n"
+
+#: disk-utils/blockdev.c:107
+#, c-format
+msgid "Available commands:\n"
+msgstr "Những câu lệnh có:\n"
+
+#: disk-utils/blockdev.c:254
+#, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "%s: Câu lệnh không rõ: %s\n"
+
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
+#, c-format
+msgid "%s requires an argument\n"
+msgstr "%s yêu cầu một tham số\n"
+
+#: disk-utils/blockdev.c:323
+#, c-format
+msgid "%s succeeded.\n"
+msgstr "%s thành công.\n"
+
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
+#, c-format
+msgid "%s: cannot open %s\n"
+msgstr "%s: không thể mở %s\n"
+
+#: disk-utils/blockdev.c:384
+#, c-format
+msgid "%s: ioctl error on %s\n"
+msgstr "%s: lỗi ioctl trên %s\n"
+
+#: disk-utils/blockdev.c:391
+#, c-format
+msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
+msgstr "RO    RA   SSZ   BSZ   Secđầu     Kíchthước    Thiếtbị\n"
+
+#: disk-utils/elvtune.c:50
+#, c-format
+msgid "usage:\n"
+msgstr "sử dụng:\n"
+
+#: disk-utils/fdformat.c:31
+#, c-format
+msgid "Formatting ... "
+msgstr "Đang định dạng ... "
+
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
+#, c-format
+msgid "done\n"
+msgstr "xong\n"
+
+#: disk-utils/fdformat.c:60
+#, c-format
+msgid "Verifying ... "
+msgstr "Đang kiểm tra ... "
+
+#: disk-utils/fdformat.c:71
+msgid "Read: "
+msgstr "Đọc: "
+
+#: disk-utils/fdformat.c:73
+#, c-format
+msgid "Problem reading cylinder %d, expected %d, read %d\n"
+msgstr "Có vấn đề khi đọc cylinder %d, mong chờ %d, đọc %d\n"
+
+#: disk-utils/fdformat.c:79
+#, c-format
+msgid ""
+"bad data in cyl %d\n"
+"Continuing ... "
+msgstr ""
+"dữ liệu xấu tại cyl %d\n"
+"Đang tiếp tục ... "
+
+#: disk-utils/fdformat.c:94
+#, c-format
+msgid "usage: %s [ -n ] device\n"
+msgstr "sử dụng: %s [ -n ] thiết bị\n"
+
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:522 misc-utils/cal.c:313 misc-utils/ddate.c:179
+#: misc-utils/kill.c:189 misc-utils/rename.c:79 misc-utils/script.c:142
+#, fuzzy, c-format
+msgid "%s from %s%s\n"
+msgstr "%s từ %s\n"
+
+#: disk-utils/fdformat.c:130
+#, c-format
+msgid "%s: not a block device\n"
+msgstr "%s: không phải là thiết bị khối\n"
+
+#: disk-utils/fdformat.c:140
+msgid "Could not determine current format type"
+msgstr "Không thể xác định được định dạng hiện thời"
+
+#: disk-utils/fdformat.c:141
+#, c-format
+msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
+msgstr "%s mặt, %d track, %d sec/track. Tổng dung lượng %d kB.\n"
+
+#: disk-utils/fdformat.c:142
+msgid "Double"
+msgstr "Đôi"
+
+#: disk-utils/fdformat.c:142
+msgid "Single"
+msgstr "Đơn"
+
+#: disk-utils/fsck.cramfs.c:107
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h         print this help\n"
+" -x dir     extract into dir\n"
+" -v         be more verbose\n"
+" file       file to test\n"
+msgstr ""
+"sử dụng: %s [-hv] [-x dir] file\n"
+" -h\t\t in ra hướng dẫn này\n"
+" -x dir\t ghi thông tin vào thư mục dir\n"
+" -v\t\t hiện thị nhiều thông báo khi thực hiện\n"
+" file\t\t tệp tin để thử nghiệm\n"
+
+#: disk-utils/fsck.cramfs.c:200
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr "%s: lỗi %d trong khi giải nén! %p(%d)\n"
+
+#: disk-utils/fsck.cramfs.c:250
+#, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: lỗi kích thước trong symlink `%s'\n"
+
+#: disk-utils/fsck.cramfs.c:265 disk-utils/fsck.cramfs.c:335
+#, c-format
+msgid "  uncompressing block at %ld to %ld (%ld)\n"
+msgstr "  giải nén khối tại %ld tới %ld (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:294
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr "%s: chế độ không có thật trên `%s' (%o)\n"
+
+#: disk-utils/fsck.cramfs.c:326
+#, c-format
+msgid "  hole at %ld (%d)\n"
+msgstr "  lỗ trống tại %ld (%d)\n"
+
+#: disk-utils/fsck.cramfs.c:344
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr "%s: Không khối (%ld) byte\n"
+
+#: disk-utils/fsck.cramfs.c:350
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr "%s: Không kích thước (%ld với %ld) byte\n"
+
+#: disk-utils/fsck.cramfs.c:399
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr "%s: cramfs bị lỗi--độ dài đường dẫn xấu\n"
+
+#: disk-utils/fsck.cramfs.c:479
+#, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: không biên dịch hỗ trợ -x\n"
+
+#: disk-utils/fsck.cramfs.c:505
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr "%s: cảnh báo--không thể xác định kích thước hệ thống tập tin\n"
+
+#: disk-utils/fsck.cramfs.c:515
+#, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s không phải là thiết bị không hay tập tin\n"
+
+#: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr "%s: cramfs bị lỗi--kích thước tập tin quá ngắn\n"
+
+#: disk-utils/fsck.cramfs.c:548
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr "%s: cramfs bị lỗi--sai magic\n"
+
+#: disk-utils/fsck.cramfs.c:561
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr "%s: cảnh báo--tập tin quá dài, hình ảnh lớn?\n"
+
+#: disk-utils/fsck.cramfs.c:571
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: cramfs bị lỗi--lỗi crc\n"
+
+#: disk-utils/fsck.cramfs.c:577
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr "%s: cảnh báo--hình ảnh cramfs cũ, không có CRC\n"
+
+#: disk-utils/fsck.cramfs.c:599
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr "%s: cramfs bị lỗi--superblock xấu\n"
+
+#: disk-utils/fsck.cramfs.c:615
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+"%s: cramfs bị lỗi--điểm kết thúc dữ liệu thư mục (%ld) != khởi đầu dữ liệu "
+"tập tin (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:623
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr "%s: cramfs bị lỗi--bộ dữ liệu tập tin bị lỗi\n"
+
+#: disk-utils/fsck.minix.c:186
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Sử dụng: %s [-larvsmf] /dev/name\n"
+
+#: disk-utils/fsck.minix.c:293
+#, c-format
+msgid "%s is mounted.\t "
+msgstr "%s đã được gắn.\t"
+
+#: disk-utils/fsck.minix.c:295
+msgid "Do you really want to continue"
+msgstr "Bạn có thực sự muốn tiếp tục"
+
+#: disk-utils/fsck.minix.c:299
+#, c-format
+msgid "check aborted.\n"
+msgstr "kiểm tra bị dừng.\n"
+
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
+#, c-format
+msgid "Zone nr < FIRSTZONE in file `%s'."
+msgstr "Vùng nr < VÙNGĐẦUTIÊN trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
+#, c-format
+msgid "Zone nr >= ZONES in file `%s'."
+msgstr "Vùng nr >= CÁCVÙNG trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
+msgid "Remove block"
+msgstr "Xóa khối"
+
+#: disk-utils/fsck.minix.c:368
+#, c-format
+msgid "Read error: unable to seek to block in file '%s'\n"
+msgstr "Lỗi đọc: không thể tìm tới khối trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:374
+#, c-format
+msgid "Read error: bad block in file '%s'\n"
+msgstr "Lỗi đọc: khối xấu trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:389
+#, c-format
+msgid ""
+"Internal error: trying to write bad block\n"
+"Write request ignored\n"
+msgstr ""
+"Lỗi nội bộ: ghi vào khối xấu\n"
+"Yêu cầu ghi bị bỏ qua\n"
+
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
+msgid "seek failed in write_block"
+msgstr "tìm kiếm bị lỗi trong ghi_khối"
+
+#: disk-utils/fsck.minix.c:398
+#, c-format
+msgid "Write error: bad block in file '%s'\n"
+msgstr "Lỗi ghi: khối xấu trong tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:514
+msgid "seek failed in write_super_block"
+msgstr "tìm kiếm bị lỗi trong ghi_khối_super"
+
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
+msgid "unable to write super-block"
+msgstr "không thể ghi khối super"
+
+#: disk-utils/fsck.minix.c:526
+msgid "Unable to write inode map"
+msgstr "Không thể ghi bảng inode"
+
+#: disk-utils/fsck.minix.c:528
+msgid "Unable to write zone map"
+msgstr "Không thể ghi bảng vùng"
+
+#: disk-utils/fsck.minix.c:530
+msgid "Unable to write inodes"
+msgstr "Không thể ghi các chỉ mục inode"
+
+#: disk-utils/fsck.minix.c:557
+msgid "seek failed"
+msgstr "tìm kiếm bị lỗi"
+
+#: disk-utils/fsck.minix.c:559
+msgid "unable to read super block"
+msgstr "không thể đọc khối super"
+
+#: disk-utils/fsck.minix.c:577
+msgid "bad magic number in super-block"
+msgstr "số magic xấu trong siêu khối"
+
+#: disk-utils/fsck.minix.c:579
+msgid "Only 1k blocks/zones supported"
+msgstr "Chỉ hỗ trợ khối/vùng 1k"
+
+#: disk-utils/fsck.minix.c:581
+msgid "bad s_imap_blocks field in super-block"
+msgstr "vùng s_imap_blocks xấu trong khối super"
+
+#: disk-utils/fsck.minix.c:583
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "vùng s_zmap_blocks xấu trong khối super"
+
+#: disk-utils/fsck.minix.c:590
+msgid "Unable to allocate buffer for inode map"
+msgstr "Không thể phân phối bộ đệm cho bảng inode"
+
+#: disk-utils/fsck.minix.c:598
+msgid "Unable to allocate buffer for inodes"
+msgstr "Không thể phân phối bộ đệm cho các chỉ mục inode"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inode count"
+msgstr "Không thể phân phối bộ đệm cho việc đếm inode"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for zone count"
+msgstr "Không thể phân phối bộ đệm cho việc đếm vùng"
+
+#: disk-utils/fsck.minix.c:606
+msgid "Unable to read inode map"
+msgstr "Không thể đọc bảng inode"
+
+#: disk-utils/fsck.minix.c:608
+msgid "Unable to read zone map"
+msgstr "Không thể đọc bảng vùng"
+
+#: disk-utils/fsck.minix.c:610
+msgid "Unable to read inodes"
+msgstr "Không thể đọc các chỉ mục inodes"
+
+#: disk-utils/fsck.minix.c:612
+#, c-format
+msgid "Warning: Firstzone != Norm_firstzone\n"
+msgstr "Cảnh báo: Firszone != Norm_firstzone\n"
+
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
+#, c-format
+msgid "%ld inodes\n"
+msgstr "%ld chỉ mục inode\n"
+
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
+#, c-format
+msgid "%ld blocks\n"
+msgstr "%ld khối\n"
+
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
+#, c-format
+msgid "Firstdatazone=%ld (%ld)\n"
+msgstr "Vùngdữliệuđầutiên=%ld (%ld)\n"
+
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
+#, c-format
+msgid "Zonesize=%d\n"
+msgstr "Kíchthướcvùng=%d\n"
+
+#: disk-utils/fsck.minix.c:621
+#, c-format
+msgid "Maxsize=%ld\n"
+msgstr "Kíchthướclớnnhất=%ld\n"
+
+#: disk-utils/fsck.minix.c:622
+#, c-format
+msgid "Filesystem state=%d\n"
+msgstr "Trạng thái hệ thống tập tin=%d\n"
+
+#: disk-utils/fsck.minix.c:623
+#, c-format
+msgid ""
+"namelen=%d\n"
+"\n"
+msgstr ""
+"chiềudàitên=%d\n"
+"\n"
+
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
+#, c-format
+msgid "Inode %d marked unused, but used for file '%s'\n"
+msgstr "inode %d đánh dấu không sử dụng, nhưng lại dùng cho tập tin '%s'\n"
+
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
+msgid "Mark in use"
+msgstr "Dấu sử dụng"
+
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
+#, c-format
+msgid "The file `%s' has mode %05o\n"
+msgstr "Tập tin `%s' có chế độ %05o\n"
+
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#, c-format
+msgid "Warning: inode count too big.\n"
+msgstr "Cảnh báo: số đếm chỉ mục inode quá lớn.\n"
+
+#: disk-utils/fsck.minix.c:731
+msgid "root inode isn't a directory"
+msgstr "chỉ mục inode gốc (root inode) không phải là một thư mục"
+
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
+#, c-format
+msgid "Block has been used before. Now in file `%s'."
+msgstr "Không đã được sử dụng trước đó. Bây giờ trong tập tin `%s'."
+
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
+msgid "Clear"
+msgstr "Xóa"
+
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
+#, c-format
+msgid "Block %d in file `%s' is marked not in use."
+msgstr "Đánh dấu khối %d trong tập tin `%s' là chưa sử dụng."
+
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
+msgid "Correct"
+msgstr "Sửa"
+
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
+#, c-format
+msgid "The directory '%s' contains a bad inode number for file '%.*s'."
+msgstr "Thư mục '%s' chứa một số inode xấu cho tập tin '%.*s'."
+
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
+msgid " Remove"
+msgstr " Dỡ bỏ"
+
+#: disk-utils/fsck.minix.c:956
+#, c-format
+msgid "`%s': bad directory: '.' isn't first\n"
+msgstr "`%s': thư mục xấu: '.' không phải đứng đầu\n"
+
+#: disk-utils/fsck.minix.c:964
+#, c-format
+msgid "`%s': bad directory: '..' isn't second\n"
+msgstr "`%s': thư mục xấu: '..' không phải đứng đứng thứ hai\n"
+
+#: disk-utils/fsck.minix.c:1023
+#, c-format
+msgid "%s: bad directory: '.' isn't first\n"
+msgstr "%s: thư mục xấu: '.' không phải đứng đầu\n"
+
+#: disk-utils/fsck.minix.c:1032
+#, c-format
+msgid "%s: bad directory: '..' isn't second\n"
+msgstr "%s: thư mục xấu: '..' không phải đứng đứng thứ hai\n"
+
+#: disk-utils/fsck.minix.c:1066
+msgid "internal error"
+msgstr "lỗi nội bộ"
+
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
+#, c-format
+msgid "%s: bad directory: size < 32"
+msgstr "%s: thư mục xấu: kích thước < 32"
+
+#: disk-utils/fsck.minix.c:1100
+msgid "seek failed in bad_zone"
+msgstr "tìm kiếm không thành công trong bad_zone (vùng_xấu)"
+
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
+#, c-format
+msgid "Inode %d mode not cleared."
+msgstr "Không xóa chế độ của chỉ mục inode %d."
+
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
+#, c-format
+msgid "Inode %d not used, marked used in the bitmap."
+msgstr ""
+"Chưa sử dụng chỉ mục inode %d, đánh dấu thành đã dùng trong sơ đồ bitmap."
+
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
+#, c-format
+msgid "Inode %d used, marked unused in the bitmap."
+msgstr ""
+"Đã sử dụng chỉ mục inode %d, đánh dấu thành chưa dùng trong sơ đồ bitmap."
+
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
+#, c-format
+msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgstr "Chỉ mục inode %d (chế độ = %07o), i_nlinks=%d, đếm=%d."
+
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
+msgid "Set i_nlinks to count"
+msgstr "Đặt i_nlinks cho số đếm"
+
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
+#, c-format
+msgid "Zone %d: marked in use, no file uses it."
+msgstr "Vùng %d: được đánh dấu là đang dùng, không tập tin nào dùng nó."
+
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
+msgid "Unmark"
+msgstr "Bỏ đánh dấu"
+
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
+#, c-format
+msgid "Zone %d: in use, counted=%d\n"
+msgstr "Vùng %d: đang dùng, đếm=%d\n"
+
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
+#, c-format
+msgid "Zone %d: not in use, counted=%d\n"
+msgstr "Vùng %d: không dùng, đếm=%d\n"
+
+#: disk-utils/fsck.minix.c:1181
+msgid "Set"
+msgstr "Đặt"
+
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
+msgid "bad inode size"
+msgstr "kích thước inode xấu"
+
+#: disk-utils/fsck.minix.c:1256
+msgid "bad v2 inode size"
+msgstr "kích thước inode v2 xấu"
+
+#: disk-utils/fsck.minix.c:1282
+msgid "need terminal for interactive repairs"
+msgstr "cần terminal cho những sửa chữa tương tác qua lại (interactive)"
+
+#: disk-utils/fsck.minix.c:1286
+#, c-format
+msgid "unable to open '%s'"
+msgstr "không mở được '%s'"
+
+#: disk-utils/fsck.minix.c:1301
+#, c-format
+msgid "%s is clean, no check.\n"
+msgstr "%s sạch sẽ, không kiểm tra.\n"
+
+#: disk-utils/fsck.minix.c:1305
+#, c-format
+msgid "Forcing filesystem check on %s.\n"
+msgstr "Bắt buộc hệ thống tập tin kiểm tra trên %s.\n"
+
+#: disk-utils/fsck.minix.c:1307
+#, c-format
+msgid "Filesystem on %s is dirty, needs checking.\n"
+msgstr "Hệ thống tập tin %s bẩn, cần kiểm tra.\n"
+
+#: disk-utils/fsck.minix.c:1333
+#, c-format
+msgid ""
+"\n"
+"%6ld inodes used (%ld%%)\n"
+msgstr ""
+"\n"
+"%6ld inode được dùng (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1338
+#, c-format
+msgid "%6ld zones used (%ld%%)\n"
+msgstr "%6ld vùng được dùng (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1340
+#, c-format
+msgid ""
+"\n"
+"%6d regular files\n"
+"%6d directories\n"
+"%6d character device files\n"
+"%6d block device files\n"
+"%6d links\n"
+"%6d symbolic links\n"
+"------\n"
+"%6d files\n"
+msgstr ""
+"\n"
+"%6d tập tin thông thường\n"
+"%6d thư mục\n"
+"%6d tập tin thiết bị ký tự\n"
+"%6d tập tin thiết bị khối\n"
+"%6d liên kết\n"
+"%6d liên kết mềm\n"
+"------\n"
+"%6d tập tin\n"
+
+#: disk-utils/fsck.minix.c:1353
+#, c-format
+msgid ""
+"----------------------------\n"
+"FILE SYSTEM HAS BEEN CHANGED\n"
+"----------------------------\n"
+msgstr ""
+"----------------------------\n"
+"HỆ THỐNG TẬP TIN ĐÃ THAY ĐỔI\n"
+"----------------------------\n"
+
+#: disk-utils/isosize.c:129
+#, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "%s: không mở được: %s\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr "%s: lỗi tìm kiếm trên %s\n"
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr "%s: lỗi đọc trên %s\n"
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr "số sector: %d, kích thước sector: %d\n"
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr "%s: lỗi phân tích tùy chọn\n"
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr "Sử dụng: %s [-x] [-d <số>] tập-tin-ảnh-iso9660\n"
+
+#: disk-utils/mkfs.bfs.c:88
+#, c-format
+msgid ""
+"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
+"       [-F fsname] device [block-count]\n"
+msgstr ""
+"Sử dụng: %s [-v] [-N nr-of-inodes] [-V tên-volume]\n"
+"       [-F fsname] thiếtbị [đếm-khối]\n"
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr "tên volume quá dài"
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr "tên fsname quá dài"
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr "không thể stat thiết bị %s"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s không phải là thiết bị khối đặc biệt"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "không mở được %s"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "không lấy được kích thước %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr "tham số khối quá lớn, max là %lu"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "quá nhiều inode - lớn nhất là 512"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr "Không đủ chỗ trống, cần ít nhất %lu khối"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2234
+#, c-format
+msgid "Device: %s\n"
+msgstr "Thiết bị: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Bộ đĩa: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "Tên FS: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "Kích thước khối: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Chỉ mục Inodes: %d (trong 1 khối)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Chỉ mục Inodes: %d (trong %ld khối)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Khối: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Kết thúc inode: %d, Kết thúc dữ liệu: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "lỗi ghi nhớ siêu khối (superblock)"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr "lỗi ghi inode gốc (root)"
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr "lỗi ghi chỉ mục inode"
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr "lỗi tìm kiếm"
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr "lỗi ghi phần tử . "
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr "lỗi ghi phần tử .. "
+
+#: disk-utils/mkfs.bfs.c:286
+#, c-format
+msgid "error closing %s"
+msgstr "lỗi đóng %s"
+
+#: disk-utils/mkfs.c:73
+#, c-format
+msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
+msgstr "Sử dụng: mkfs [-V] [-t fstype] [tùychọn-fs] thiếtbị [kíchthước]\n"
+
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:345
+#: getopt/getopt.c:89 getopt/getopt.c:99 login-utils/wall.c:237
+#, c-format
+msgid "%s: Out of memory!\n"
+msgstr "%s: Tràn bộ nhớ!\n"
+
+#: disk-utils/mkfs.c:103
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs phiên bản %s (%s)\n"
+
+#: disk-utils/mkfs.cramfs.c:124
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname "
+"outfile\n"
+" -h         print this help\n"
+" -v         be verbose\n"
+" -E         make all warnings errors (non-zero exit status)\n"
+" -b blksz   use this blocksize, must equal page size\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name    set name of cramfs filesystem\n"
+" -p         pad by %d bytes for boot code\n"
+" -s         sort directory entries (old option, ignored)\n"
+" -z         make explicit holes (requires >= 2.3.39)\n"
+" dirname    root of the filesystem to be compressed\n"
+" outfile    output file\n"
+msgstr ""
+"Sử dụng: %s [-h] [-v] [-b blksz] [-e edition] [-i tậptin] [-n tên] tênthưmục "
+"tậptinra\n"
+" -h         in ra trợ giúp này\n"
+" -v         thông báo chi tiết\n"
+" -E         khiến tất cả cảnh báo thành lỗi (trạng thái thoát khác không)\n"
+" -b blksz   sử dụng kích thước khối chỉ ra, phải bằng kích thước trang\n"
+" -e edition đặt số lần in (một phần của fsid)\n"
+" -i file    chèn một ảnh tập tin vào hệ thống tập tin (yêu cầu >= 2.4.0)\n"
+" -n name    đặt tên của hệ thống tập tin cramfs\n"
+" -p         dán %d byte cho mã khởi động\n"
+" -s         sắp xếp các mục cho thư mục (tùy chọn cũ, bị lờ đi)\n"
+" -z         tạo các hố rõ ràng (yêu cầu >= 2.3.39)\n"
+" tênthưmục    gốc của hệ thống tập tin cần được nén\n"
+" tậptinra    tập tin chứa kết quả in ra\n"
+
+#: disk-utils/mkfs.cramfs.c:335
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
+msgstr ""
+"Tên (%u bytes) quá dài cho tập tin `%s'.\n"
+" Xin hãy tăng MAX_INPUT_NAMELEN trong mkcramfs.c và biên dịch lại.  Đang "
+"thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:463
+#, c-format
+msgid "filesystem too big.  Exiting.\n"
+msgstr "hệ thống tập tin quá lớn.  Đang thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:514
+#, c-format
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"Vượt quá MAXENTRIES.  Tăng giá trị này trong mkcramfs.c và biên dịch lại.  "
+"Đang thoát.\n"
+
+#: disk-utils/mkfs.cramfs.c:622
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr "AIEEE: khối \"đã nén\" > 2*chiềudàikhối (%ld)\n"
+
+#: disk-utils/mkfs.cramfs.c:641
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr "%6.2f%% (%+d byte)\t%s\n"
+
+#: disk-utils/mkfs.cramfs.c:819
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"cảnh báo: số lượng của kích thước yêu cầu (giới hạn trên) là %LdMB, nhưng "
+"kíchthước ảnh lớn nhất là %uMB.  Chúng ta có thể chết non.\n"
+
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
+msgid "Including: %s\n"
+msgstr "Bao gồm: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:866
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr "Dữ liệu thư mục: %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:874
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr "Mọi thứ: %d kilô byte\n"
+
+#: disk-utils/mkfs.cramfs.c:879
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr "Siêu khối: %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:886
+#, c-format
+msgid "CRC: %x\n"
+msgstr "CRC: %x\n"
+
+#: disk-utils/mkfs.cramfs.c:891
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr "không đủ khoảng trống phân phối cho ảnh ROM (phân phối %Ld, dùng %d)\n"
+
+#: disk-utils/mkfs.cramfs.c:903
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr "Ghi ảnh ROM không thành công (%d %d)\n"
+
+#: disk-utils/mkfs.cramfs.c:912
+#, c-format
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "cảnh báo: tên tập tin bị cắt ngắn thành 255 byte.\n"
+
+#: disk-utils/mkfs.cramfs.c:915
+#, c-format
+msgid "warning: files were skipped due to errors.\n"
+msgstr "cảnh báo: các tập tin bị bỏ qua vì có lỗi.\n"
+
+#: disk-utils/mkfs.cramfs.c:918
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr "cảnh báo: kích thước tập tin bị cắt ngắn thành %luMB (trừ 1 byte).\n"
+
+#: disk-utils/mkfs.cramfs.c:923
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo: uid bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
+"mật.)\n"
+
+#: disk-utils/mkfs.cramfs.c:928
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr ""
+"cảnh báo: gid bị cắt ngắn thành %u bit.  (Đây có thể là sự lo ngại bảo "
+"mật.)\n"
+
+#: disk-utils/mkfs.cramfs.c:933
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+"CẢNH BÁO: số thiết bị cắt ngắn thành %u bit.  Điều này thường có nghĩa là\n"
+"một vài tập tin thiết bị sẽ bị hỏng.\n"
+
+#: disk-utils/mkfs.minix.c:163
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr "Sử dụng: %s [-c | -l têntậptin] [-nXX] [-iXX] /dev/name [khối]\n"
+
+#: disk-utils/mkfs.minix.c:187
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr "%s đã được gắn, sẽ không tạo hệ thống tập tin ở đây!"
+
+#: disk-utils/mkfs.minix.c:248
+msgid "seek to boot block failed in write_tables"
+msgstr "tìm tới khối khởi động không thành công trong write_tables"
+
+#: disk-utils/mkfs.minix.c:250
+msgid "unable to clear boot sector"
+msgstr "không xóa được sector khởi động"
+
+#: disk-utils/mkfs.minix.c:252
+msgid "seek failed in write_tables"
+msgstr "tìm tới không thành công trong write_tables"
+
+#: disk-utils/mkfs.minix.c:256
+msgid "unable to write inode map"
+msgstr "không ghi nhớ được bản đồ inode"
+
+#: disk-utils/mkfs.minix.c:258
+msgid "unable to write zone map"
+msgstr "không ghi nhớ được bản đồ vùng (zone)"
+
+#: disk-utils/mkfs.minix.c:260
+msgid "unable to write inodes"
+msgstr "không ghi nhớ được các inode"
+
+#: disk-utils/mkfs.minix.c:269
+msgid "write failed in write_block"
+msgstr "khi nhớ không thành công trong write_block"
+
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
+msgid "too many bad blocks"
+msgstr "quá nhiều khối xấu"
+
+#: disk-utils/mkfs.minix.c:285
+msgid "not enough good blocks"
+msgstr "không đủ khối tốt"
+
+#: disk-utils/mkfs.minix.c:497
+msgid "unable to allocate buffers for maps"
+msgstr "không thể phân phối các bộ đệm cho bản đồ"
+
+#: disk-utils/mkfs.minix.c:506
+msgid "unable to allocate buffer for inodes"
+msgstr "không thể phân phối các bộ đệm cho inode"
+
+#: disk-utils/mkfs.minix.c:512
+#, c-format
+msgid ""
+"Maxsize=%ld\n"
+"\n"
+msgstr ""
+"Kíchthướclớnnhất=%ld\n"
+"\n"
+
+#: disk-utils/mkfs.minix.c:526
+msgid "seek failed during testing of blocks"
+msgstr "tìm tới không thành công trong khi kiểm tra (test) các khối"
+
+#: disk-utils/mkfs.minix.c:534
+#, c-format
+msgid "Weird values in do_check: probably bugs\n"
+msgstr "Giá trị kỳ lạ trong do_check: có thể là lỗi (bug)\n"
+
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:427
+msgid "seek failed in check_blocks"
+msgstr "tìm tới không thành công trong check_blocks"
+
+#: disk-utils/mkfs.minix.c:574
+msgid "bad blocks before data-area: cannot make fs"
+msgstr "khối xấu trước vùng dữ liệu: không thể tạo ra hệ thống tập tin"
+
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
+#, c-format
+msgid "%d bad blocks\n"
+msgstr "%d khối xấu\n"
+
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
+#, c-format
+msgid "one bad block\n"
+msgstr "một khối xấu\n"
+
+#: disk-utils/mkfs.minix.c:592
+msgid "can't open file of bad blocks"
+msgstr "không mở được tập tin của các khối xấu"
+
+#: disk-utils/mkfs.minix.c:674
+#, c-format
+msgid "strtol error: number of blocks not specified"
+msgstr "lỗi strtol: không chỉ ra số khối"
+
+#: disk-utils/mkfs.minix.c:704
+#, c-format
+msgid "unable to open %s"
+msgstr "không mở được %s"
+
+#: disk-utils/mkfs.minix.c:706
+#, c-format
+msgid "unable to stat %s"
+msgstr "không stat được %s"
+
+#: disk-utils/mkfs.minix.c:710
+#, c-format
+msgid "will not try to make filesystem on '%s'"
+msgstr "sẽ không thử tạo hệ thống tập tin trên '%s'"
+
+#: disk-utils/mkswap.c:177
+#, c-format
+msgid "Bad user-specified page size %d\n"
+msgstr "Kích thước trang do người dùng chỉ ra xấu %d\n"
+
+#: disk-utils/mkswap.c:186
+#, c-format
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
+msgstr ""
+"Sử dụng kích thước trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %"
+"d/%d\n"
+
+#: disk-utils/mkswap.c:190
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr "Coi như trang có kích thước %d (chứ không phải %d)\n"
+
+#: disk-utils/mkswap.c:233
+#, c-format
+msgid "Bad swap header size, no label written.\n"
+msgstr "Kích thước phần đầu swap xấu, không ghi nhãn nào.\n"
+
+#: disk-utils/mkswap.c:243
+#, c-format
+msgid "Label was truncated.\n"
+msgstr "Nhãn bị cắt ngắn.\n"
+
+#: disk-utils/mkswap.c:249
+#, c-format
+msgid "no label, "
+msgstr "không nhãn, "
+
+#: disk-utils/mkswap.c:257
+#, c-format
+msgid "no uuid\n"
+msgstr "không uuid\n"
+
+#: disk-utils/mkswap.c:381
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"
+msgstr "Sử dụng: %s [-c] [-v0|-v1] [-pPAGESZ] [-L nhãn] /dev/name [khối]\n"
+
+#: disk-utils/mkswap.c:404
+msgid "too many bad pages"
+msgstr "quá nhiều trang xấu"
+
+#: disk-utils/mkswap.c:418 misc-utils/look.c:183 misc-utils/setterm.c:1147
+#: text-utils/more.c:1929 text-utils/more.c:1940
+msgid "Out of memory"
+msgstr "Không đủ bộ nhớ"
+
+#: disk-utils/mkswap.c:435
+#, c-format
+msgid "one bad page\n"
+msgstr "một trang xấu\n"
+
+#: disk-utils/mkswap.c:437
+#, c-format
+msgid "%lu bad pages\n"
+msgstr "%lu trang xấu\n"
+
+#: disk-utils/mkswap.c:573
+#, c-format
+msgid "%s: error: Nowhere to set up swap on?\n"
+msgstr "%s: lỗi: Không có chỗ nào để đặt swap lên?\n"
+
+#: disk-utils/mkswap.c:591
+#, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
+msgstr "%s: lỗi: kích thước %lu lớn hơn kích thước thiết bị %lu\n"
+
+#: disk-utils/mkswap.c:614
+#, c-format
+msgid "%s: error: unknown version %d\n"
+msgstr "%s: lỗi: không rõ phiên bản %d\n"
+
+#: disk-utils/mkswap.c:621
+#, c-format
+msgid "%s: error: swap area needs to be at least %ldkB\n"
+msgstr "%s: lỗi: vùng swap cần ít nhất %ldkB\n"
+
+#: disk-utils/mkswap.c:638
+#, c-format
+msgid "%s: warning: truncating swap area to %ldkB\n"
+msgstr "%s: cảnh báo: cắt ngắn vùng swap thành %ldkB\n"
+
+#: disk-utils/mkswap.c:644
+#, c-format
+msgid "%s: error: label only with v1 swap area\n"
+msgstr "%s: lỗi: chỉ ghi nhãn với vùng swap v1\n"
+
+#: disk-utils/mkswap.c:659
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr "Sẽ không thử tạo thiết bị swap trên '%s'"
+
+#: disk-utils/mkswap.c:668 disk-utils/mkswap.c:689
+msgid "fatal: first page unreadable"
+msgstr "lỗi nặng: trang đầu tiên là không thể đọc"
+
+#: disk-utils/mkswap.c:674
+#, c-format
+msgid ""
+"%s: Device '%s' contains a valid Sun disklabel.\n"
+"This probably means creating v0 swap would destroy your partition table\n"
+"No swap created. If you really want to create swap v0 on that device, use\n"
+"the -f option to force it.\n"
+msgstr ""
+"%s: Thiết bị '%s' chứa một nhãn đĩa Sun đúng.\n"
+"Điều này có nghĩa việc tạo swap v0 sẽ hủy diệt bảng phân vùng của bạn\n"
+"Không tạo ra swap. Nếu bạn thực sự muốn tạo swap v0 trên thiết bị đó,\n"
+"thì hãy dùng tùy chọn -f để bắt buộc.\n"
+
+#: disk-utils/mkswap.c:698
+msgid "Unable to set up swap-space: unreadable"
+msgstr "Không thể cấu hình không gian swap: không thể đọc"
+
+#: disk-utils/mkswap.c:699
+#, c-format
+msgid "Setting up swapspace version %d, size = %llu kB\n"
+msgstr "Đặt không gian swap phiên bản %d, kích thước = %llu kB\n"
+
+#: disk-utils/mkswap.c:708
+msgid "unable to rewind swap-device"
+msgstr "không thể \"tua lại\" thiết bị swap"
+
+#: disk-utils/mkswap.c:711
+msgid "unable to write signature page"
+msgstr "không thể ghi nhớ trang chữ ký"
+
+#: disk-utils/mkswap.c:719
+msgid "fsync failed"
+msgstr "fsync không thành công"
+
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061
+msgid "Unusable"
+msgstr "Không thể sử dụng"
+
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063
+msgid "Free Space"
+msgstr "Không gian trống"
+
+#: fdisk/cfdisk.c:375
+msgid "Linux ext2"
+msgstr "Linux ext2"
+
+#: fdisk/cfdisk.c:377
+msgid "Linux ext3"
+msgstr "Linux ext3"
+
+#: fdisk/cfdisk.c:379
+msgid "Linux XFS"
+msgstr "Linux XFS"
+
+#: fdisk/cfdisk.c:381
+msgid "Linux JFS"
+msgstr "Linux JFS"
+
+#: fdisk/cfdisk.c:383
+msgid "Linux ReiserFS"
+msgstr "Linux ReiserFS"
+
+#: fdisk/cfdisk.c:385 fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
+#: fdisk/cfdisk.c:388
+msgid "OS/2 HPFS"
+msgstr "OS/2 HPFS"
+
+#: fdisk/cfdisk.c:390
+msgid "OS/2 IFS"
+msgstr "OS/2 IFS"
+
+#: fdisk/cfdisk.c:394
+msgid "NTFS"
+msgstr "NTFS"
+
+#: fdisk/cfdisk.c:405
+#, c-format
+msgid "Disk has been changed.\n"
+msgstr "Đĩa đã được thay đổi.\n"
+
+#: fdisk/cfdisk.c:407
+#, c-format
+msgid "Reboot the system to ensure the partition table is correctly updated.\n"
+msgstr ""
+"Khởi động lại hệ thống để đảm bảo là bảng phân vùng được cập nhật đúng.\n"
+
+#: fdisk/cfdisk.c:411
+#, c-format
+msgid ""
+"\n"
+"WARNING: If you have created or modified any\n"
+"DOS 6.x partitions, please see the cfdisk manual\n"
+"page for additional information.\n"
+msgstr ""
+"\n"
+"CẢNH BÁO: Nếu bạn phải tạo hay sử đổi bất kỳ\n"
+"phân vùng DOS 6.x nào, xin hãy xem hướng dẫn người\n"
+"dùng cfdisk để biết thêm thông tin.\n"
+
+#: fdisk/cfdisk.c:506
+msgid "FATAL ERROR"
+msgstr "LỖI NGHIÊM TRỌNG"
+
+#: fdisk/cfdisk.c:507
+msgid "Press any key to exit cfdisk"
+msgstr "Hãy nhấn phím bất kỳ để thoát khỏi cfdisk"
+
+#: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562
+msgid "Cannot seek on disk drive"
+msgstr "Không thể tìm kiếm trên ổ đĩa"
+
+#: fdisk/cfdisk.c:556
+msgid "Cannot read disk drive"
+msgstr "Không thể đọc ổ đĩa"
+
+#: fdisk/cfdisk.c:564
+msgid "Cannot write disk drive"
+msgstr "Không thể ghi vào ổi đĩa"
+
+#: fdisk/cfdisk.c:907
+msgid "Too many partitions"
+msgstr "Quá nhiều phân vùng"
+
+#: fdisk/cfdisk.c:912
+msgid "Partition begins before sector 0"
+msgstr "Phân vùng bắt đầu trước sector 0"
+
+#: fdisk/cfdisk.c:917
+msgid "Partition ends before sector 0"
+msgstr "Phân vùng kết thúc trước sector 0"
+
+#: fdisk/cfdisk.c:922
+msgid "Partition begins after end-of-disk"
+msgstr "Phân vùng bắt đầu trước kết thúc-của-đĩa"
+
+#: fdisk/cfdisk.c:927
+msgid "Partition ends after end-of-disk"
+msgstr "Phân vùng bắt đầu sau kết thúc-của-đĩa"
+
+#: fdisk/cfdisk.c:932
+msgid "Partition ends in the final partial cylinder"
+msgstr "Phân vùng kết thúc trong cylinder đóng phân vùng"
+
+#: fdisk/cfdisk.c:956
+msgid "logical partitions not in disk order"
+msgstr "Phân vùng lôgíc không trong thứ tự đĩa"
+
+#: fdisk/cfdisk.c:959
+msgid "logical partitions overlap"
+msgstr "phân vùng lôgíc chồng lên nhau"
+
+#: fdisk/cfdisk.c:963
+msgid "enlarged logical partitions overlap"
+msgstr "phân vùng lôgíc mở rộng chồng lên nhau"
+
+#: fdisk/cfdisk.c:993
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr "!!!! Lỗi nội bộ khi tạo các ổ lôgíc mà không có phân vùng mở rộng !!!!"
+
+#: fdisk/cfdisk.c:1004 fdisk/cfdisk.c:1016
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr "Không thể tạo ổ lôgíc ở đây -- vì như thế sẽ tạo hai phân vùng mở rộng"
+
+#: fdisk/cfdisk.c:1158
+msgid "Menu item too long. Menu may look odd."
+msgstr "Trình đơn của mục quá dài. Trình đơn có thể trông lạc lõng."
+
+#: fdisk/cfdisk.c:1214
+msgid "Menu without direction. Defaulting horizontal."
+msgstr "Trình đơn không có phương hướng. Mặc định nằm ngang."
+
+#: fdisk/cfdisk.c:1345
+msgid "Illegal key"
+msgstr "Phím không thích hợp"
+
+#: fdisk/cfdisk.c:1368
+msgid "Press a key to continue"
+msgstr "Nhấn một phím để tiếp tục"
+
+#: fdisk/cfdisk.c:1415 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2564
+#: fdisk/cfdisk.c:2566
+msgid "Primary"
+msgstr "Chính"
+
+#: fdisk/cfdisk.c:1415
+msgid "Create a new primary partition"
+msgstr "Tạo một phân vùng chính mới"
+
+#: fdisk/cfdisk.c:1416 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2566
+msgid "Logical"
+msgstr "Lôgíc"
+
+#: fdisk/cfdisk.c:1416
+msgid "Create a new logical partition"
+msgstr "Tạo một phân vùng lôgíc mới"
+
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472 fdisk/cfdisk.c:2237
+msgid "Cancel"
+msgstr "Hủy bỏ"
+
+#: fdisk/cfdisk.c:1417 fdisk/cfdisk.c:1472
+msgid "Don't create a partition"
+msgstr "Đừng tạo một phân vùng"
+
+#: fdisk/cfdisk.c:1433
+msgid "!!! Internal error !!!"
+msgstr "!!! Lỗi nội bộ !!!"
+
+#: fdisk/cfdisk.c:1436
+msgid "Size (in MB): "
+msgstr "Kích thước (theo MB): "
+
+#: fdisk/cfdisk.c:1470
+msgid "Beginning"
+msgstr "Bắt đầu"
+
+#: fdisk/cfdisk.c:1470
+msgid "Add partition at beginning of free space"
+msgstr "Thêm một phân vùng tại đầu vùng đĩa trống"
+
+#: fdisk/cfdisk.c:1471
+msgid "End"
+msgstr "Kết thúc"
+
+#: fdisk/cfdisk.c:1471
+msgid "Add partition at end of free space"
+msgstr "Thêm một phân vùng tại cuối vùng đĩa trống"
+
+#: fdisk/cfdisk.c:1489
+msgid "No room to create the extended partition"
+msgstr "Không còn chỗ để tạo phân vùng mở rộng"
+
+#: fdisk/cfdisk.c:1563
+msgid "No partition table.\n"
+msgstr "Không có bảng phân vùng\n"
+
+#: fdisk/cfdisk.c:1567
+msgid "No partition table. Starting with zero table."
+msgstr "Không có bảng phân vùng. Khởi động với một bảng trắng."
+
+#: fdisk/cfdisk.c:1577
+msgid "Bad signature on partition table"
+msgstr "Chữ ký xấu trong bảng phân vùng"
+
+#: fdisk/cfdisk.c:1581
+msgid "Unknown partition table type"
+msgstr "Loại bảng phân vùng không xác định"
+
+#: fdisk/cfdisk.c:1583
+msgid "Do you wish to start with a zero table [y/N] ?"
+msgstr "Bạn có muốn khởi động với một bảng trắng [y/N] ?"
+
+#: fdisk/cfdisk.c:1631
+msgid "You specified more cylinders than fit on disk"
+msgstr "Bạn đã đưa ra số cylinder lớn hơn số có trên đĩa"
+
+#: fdisk/cfdisk.c:1663
+msgid "Cannot open disk drive"
+msgstr "Không thể mở ổ đĩa"
+
+#: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845
+msgid "Opened disk read-only - you have no permission to write"
+msgstr "Mở ổ đĩa chỉ đọc - bạn phải có quyền ghi"
+
+#: fdisk/cfdisk.c:1686
+msgid "Cannot get disk size"
+msgstr "Không thể lấy kích thước đĩa"
+
+#: fdisk/cfdisk.c:1712
+msgid "Bad primary partition"
+msgstr "Phân vùng chính xấu"
+
+#: fdisk/cfdisk.c:1742
+msgid "Bad logical partition"
+msgstr "Phân vùng lôgíc xấu"
+
+#: fdisk/cfdisk.c:1857
+msgid "Warning!!  This may destroy data on your disk!"
+msgstr "Cảnh báo!!  Có thể sẽ xóa hết dữ liệu trên đĩa của bạn!"
+
+#: fdisk/cfdisk.c:1861
+msgid "Are you sure you want write the partition table to disk? (yes or no): "
+msgstr "Bạn có chắc muốn ghi bảng phân vùng lên đĩa? (yes hoặc no): "
+
+#: fdisk/cfdisk.c:1867
+msgid "no"
+msgstr "no (không)"
+
+#: fdisk/cfdisk.c:1868
+msgid "Did not write partition table to disk"
+msgstr "Bảng phân vùng đã không được ghi lên đĩa"
+
+#: fdisk/cfdisk.c:1870
+msgid "yes"
+msgstr "yes (có)"
+
+#: fdisk/cfdisk.c:1873
+msgid "Please enter `yes' or `no'"
+msgstr "Xin hãy nhập `yes' hoặc `no'"
+
+#: fdisk/cfdisk.c:1877
+msgid "Writing partition table to disk..."
+msgstr "Đang viết bảng phân vùng lên đĩa..."
+
+#: fdisk/cfdisk.c:1902 fdisk/cfdisk.c:1906
+msgid "Wrote partition table to disk"
+msgstr "Đã viết bảng phân vùng lên đĩa"
+
+#: fdisk/cfdisk.c:1904
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"Đã ghi bảng phân vùng, nhưng việc đọc lại thất bại.  Hãy khởi động lại để "
+"cập nhật bảng."
+
+#: fdisk/cfdisk.c:1914
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Không có phân vùng chính nào được đánh dấu có thể khởi động. MBR của DOS "
+"không thể khởi động trong trường hợp này."
+
+#: fdisk/cfdisk.c:1916
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Có vài phân vùng chính được đánh dấu là có thể khởi động. MBR của DOS không "
+"thể khởi động trong trường hợp này."
+
+#: fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2093 fdisk/cfdisk.c:2177
+msgid "Enter filename or press RETURN to display on screen: "
+msgstr "Nhập tên tập tin hoặc nhấn RETURN để hiển thị trên màn hình: "
+
+#: fdisk/cfdisk.c:1983 fdisk/cfdisk.c:2101 fdisk/cfdisk.c:2185
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "Không thể mở tập tin '%s'"
+
+#: fdisk/cfdisk.c:1994
+#, c-format
+msgid "Disk Drive: %s\n"
+msgstr "Ổ đĩa: %s\n"
+
+#: fdisk/cfdisk.c:1996
+msgid "Sector 0:\n"
+msgstr "Sector 0:\n"
+
+#: fdisk/cfdisk.c:2003
+#, c-format
+msgid "Sector %d:\n"
+msgstr "Sector %d:\n"
+
+#: fdisk/cfdisk.c:2023
+msgid "   None   "
+msgstr "   Không   "
+
+#: fdisk/cfdisk.c:2025
+msgid "   Pri/Log"
+msgstr "   Chính/Lôgíc"
+
+#: fdisk/cfdisk.c:2027
+msgid "   Primary"
+msgstr "   Chính"
+
+#: fdisk/cfdisk.c:2029
+msgid "   Logical"
+msgstr "   Lôgíc"
+
+#: fdisk/cfdisk.c:2067 fdisk/fdisk.c:1440 fdisk/fdisk.c:1752
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:693 fdisk/sfdisk.c:649
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2541 fdisk/fdisksunlabel.c:44
+msgid "Boot"
+msgstr "Khởi động"
+
+#: fdisk/cfdisk.c:2075
+#, c-format
+msgid "(%02X)"
+msgstr "(%02X)"
+
+#: fdisk/cfdisk.c:2077
+msgid "None"
+msgstr "Không"
+
+#: fdisk/cfdisk.c:2112 fdisk/cfdisk.c:2196
+#, c-format
+msgid "Partition Table for %s\n"
+msgstr "Bảng Phân Vùng cho %s\n"
+
+#: fdisk/cfdisk.c:2114
+msgid "               First       Last\n"
+msgstr "               Đầu         Cuối\n"
+
+#: fdisk/cfdisk.c:2115
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Loại       Sector      Sector   Offset    Độ dài    Hệ thống  Loại (ID) "
+"Cờ\n"
+
+#: fdisk/cfdisk.c:2116
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+
+#: fdisk/cfdisk.c:2199
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Bắt đầu---      ----Kết thúc----    Bắt_đầu     Số của\n"
+
+#: fdisk/cfdisk.c:2200
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " #Cờ Đầuđọc Sect Cyl   ID  Đầuđọc Sect Cyl     Sector    Sectors\n"
+
+#: fdisk/cfdisk.c:2201
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+
+#: fdisk/cfdisk.c:2234
+msgid "Raw"
+msgstr "Thô sơ"
+
+#: fdisk/cfdisk.c:2234
+msgid "Print the table using raw data format"
+msgstr "In bảng ra sử dụng định dạng dữ liệu thô"
+
+#: fdisk/cfdisk.c:2235 fdisk/cfdisk.c:2338
+msgid "Sectors"
+msgstr "Các Sector"
+
+#: fdisk/cfdisk.c:2235
+msgid "Print the table ordered by sectors"
+msgstr "In bảng theo thứ tự sector"
+
+#: fdisk/cfdisk.c:2236
+msgid "Table"
+msgstr "Bảng"
+
+#: fdisk/cfdisk.c:2236
+msgid "Just print the partition table"
+msgstr "Chỉ in bảng phân vùng"
+
+#: fdisk/cfdisk.c:2237
+msgid "Don't print the table"
+msgstr "Đừng in bảng phân vùng"
+
+#: fdisk/cfdisk.c:2265
+msgid "Help Screen for cfdisk"
+msgstr "Trợ giúp của cfdisk"
+
+#: fdisk/cfdisk.c:2267
+msgid "This is cfdisk, a curses based disk partitioning program, which"
+msgstr "Đây là cfdisk, một chương trình phân vùng đĩa dựa trên curse, "
+
+#: fdisk/cfdisk.c:2268
+msgid "allows you to create, delete and modify partitions on your hard"
+msgstr "chương trình cho phép bạn tạo, xóa và sửa đổi các phân vùng"
+
+#: fdisk/cfdisk.c:2269
+msgid "disk drive."
+msgstr "ổ đĩa cứng."
+
+#: fdisk/cfdisk.c:2271
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Bản quyền (C) 1994-1999 Kevin E. Martin & aeb"
+
+#: fdisk/cfdisk.c:2273
+msgid "Command      Meaning"
+msgstr "Câu lệnh      Ý nghĩa"
+
+#: fdisk/cfdisk.c:2274
+msgid "-------      -------"
+msgstr "-------      -------"
+
+#: fdisk/cfdisk.c:2275
+msgid "  b          Toggle bootable flag of the current partition"
+msgstr "  b          Bật/tắt khả năng khởi động của phân vùng hiện tại"
+
+#: fdisk/cfdisk.c:2276
+msgid "  d          Delete the current partition"
+msgstr "  d          Xóa phân vùng hiện thời"
+
+#: fdisk/cfdisk.c:2277
+msgid "  g          Change cylinders, heads, sectors-per-track parameters"
+msgstr ""
+"   g          Thay đổi các tham số: cylinders, heads, sectors-per-track"
+
+#: fdisk/cfdisk.c:2278
+msgid "             WARNING: This option should only be used by people who"
+msgstr "             CẢNH BÁO: Tùy chọn này chỉ dành cho những người dùng"
+
+#: fdisk/cfdisk.c:2279
+msgid "             know what they are doing."
+msgstr "             đã có kinh nghiệm."
+
+#: fdisk/cfdisk.c:2280
+msgid "  h          Print this screen"
+msgstr "  h          Hiển thị trợ giúp này"
+
+#: fdisk/cfdisk.c:2281
+msgid "  m          Maximize disk usage of the current partition"
+msgstr "  m          Giới hạn sử dụng lớn nhất của phân vùng hiện thời"
+
+#: fdisk/cfdisk.c:2282
+msgid "             Note: This may make the partition incompatible with"
+msgstr "             Chú ý: Có thể làm cho phân vùng không tương thích với"
+
+#: fdisk/cfdisk.c:2283
+msgid "             DOS, OS/2, ..."
+msgstr "             DOS, OS/2, ..."
+
+#: fdisk/cfdisk.c:2284
+msgid "  n          Create new partition from free space"
+msgstr "  n          Tạo một phân vùng mới từ không gian trống"
+
+#: fdisk/cfdisk.c:2285
+msgid "  p          Print partition table to the screen or to a file"
+msgstr "  p          In ra màn hình hay ghi vào tập tin bảng phân vùng"
+
+#: fdisk/cfdisk.c:2286
+msgid "             There are several different formats for the partition"
+msgstr "             Có vài định dạng khác nhau cho phân vùng"
+
+#: fdisk/cfdisk.c:2287
+msgid "             that you can choose from:"
+msgstr "             mà bạn có thể chọn từ:"
+
+#: fdisk/cfdisk.c:2288
+msgid "                r - Raw data (exactly what would be written to disk)"
+msgstr "                r - Dữ liệu thô (là những gì sẽ được ghi lên đĩa)"
+
+#: fdisk/cfdisk.c:2289
+msgid "                s - Table ordered by sectors"
+msgstr "                s - Bảng theo thứ tự sector"
+
+#: fdisk/cfdisk.c:2290
+msgid "                t - Table in raw format"
+msgstr "                t - Bảng trong định dạng thô"
+
+#: fdisk/cfdisk.c:2291
+msgid "  q          Quit program without writing partition table"
+msgstr "  q          Thoát khỏi chương trình và không ghi lại bảng phân vùng"
+
+#: fdisk/cfdisk.c:2292
+msgid "  t          Change the filesystem type"
+msgstr "  t          Thay đổi loại hệ thống tập tin"
+
+#: fdisk/cfdisk.c:2293
+msgid "  u          Change units of the partition size display"
+msgstr "  u          Thay đổi đơn vị hiển thị kích thước"
+
+#: fdisk/cfdisk.c:2294
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             Luân phiên MB, sector và cylinder"
+
+#: fdisk/cfdisk.c:2295
+msgid "  W          Write partition table to disk (must enter upper case W)"
+msgstr "  W          Ghi bảng phân vùng lên đĩa (cần nhập chữa W hoa)"
+
+#: fdisk/cfdisk.c:2296
+msgid "             Since this might destroy data on the disk, you must"
+msgstr "             Vì câu lệnh sẽ hủy dữ liệu trên đĩa, bạn cần"
+
+#: fdisk/cfdisk.c:2297
+msgid "             either confirm or deny the write by entering `yes' or"
+msgstr "             hoặc đồng ý hoặc hủy bỏ việc ghi bằng các nhập `yes' hoặc"
+
+#: fdisk/cfdisk.c:2298
+msgid "             `no'"
+msgstr "             `no'"
+
+#: fdisk/cfdisk.c:2299
+msgid "Up Arrow     Move cursor to the previous partition"
+msgstr "Mũi tên lên     Di chuyển con trỏ tới phân vùng ở trước"
+
+#: fdisk/cfdisk.c:2300
+msgid "Down Arrow   Move cursor to the next partition"
+msgstr "Mũi tên xuống   Di chuyển con trỏ tới phân vùng tiếp theo"
+
+#: fdisk/cfdisk.c:2301
+msgid "CTRL-L       Redraws the screen"
+msgstr "CTRL-L       Kéo màn hình lên"
+
+#: fdisk/cfdisk.c:2302
+msgid "  ?          Print this screen"
+msgstr "  ?          Hiển thị trợ giúp này"
+
+#: fdisk/cfdisk.c:2304
+msgid "Note: All of the commands can be entered with either upper or lower"
+msgstr "Chú ý: Có thể nhập tất cả các câu lệnh với chữ thường và chữ hoa"
+
+#: fdisk/cfdisk.c:2305
+msgid "case letters (except for Writes)."
+msgstr "(ngoại trừ Writes - ghi)."
+
+#: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319
+msgid "Cylinders"
+msgstr "Cylinder"
+
+#: fdisk/cfdisk.c:2336
+msgid "Change cylinder geometry"
+msgstr "Thay đổi cấu trúc cylinder"
+
+#: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314
+msgid "Heads"
+msgstr "Đầu đọc"
+
+#: fdisk/cfdisk.c:2337
+msgid "Change head geometry"
+msgstr "Thay đổi cấu trúc đầu đọc"
+
+#: fdisk/cfdisk.c:2338
+msgid "Change sector geometry"
+msgstr "Thay đổi cấu trúc sector"
+
+#: fdisk/cfdisk.c:2339
+msgid "Done"
+msgstr "Hoàn thành"
+
+#: fdisk/cfdisk.c:2339
+msgid "Done with changing geometry"
+msgstr "Hoàn thành việc thay đổi cấu trúc"
+
+#: fdisk/cfdisk.c:2352
+msgid "Enter the number of cylinders: "
+msgstr "Nhập số cylinders: "
+
+#: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934
+msgid "Illegal cylinders value"
+msgstr "Giá trị cylinder không thích hợp"
+
+#: fdisk/cfdisk.c:2369
+msgid "Enter the number of heads: "
+msgstr "Nhập số đầu đọc: "
+
+#: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944
+msgid "Illegal heads value"
+msgstr "Giá trị số đầu đọc không thích hợp"
+
+#: fdisk/cfdisk.c:2382
+msgid "Enter the number of sectors per track: "
+msgstr "Nhập số sector trên mỗi rãnh (track): "
+
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951
+msgid "Illegal sectors value"
+msgstr "Giá trị số sector không thích hợp"
+
+#: fdisk/cfdisk.c:2492
+msgid "Enter filesystem type: "
+msgstr "Nhập loại hệ thống tập tin: "
+
+#: fdisk/cfdisk.c:2510
+msgid "Cannot change FS Type to empty"
+msgstr "Không thể thay đổi loại hệ thống tập tin cho rỗng"
+
+#: fdisk/cfdisk.c:2512
+msgid "Cannot change FS Type to extended"
+msgstr "Không thể thay đổi loại hệ thống tập tin cho mở rộng"
+
+#: fdisk/cfdisk.c:2543
+#, c-format
+msgid "Unk(%02X)"
+msgstr "Khôngrõ(%02X)"
+
+#: fdisk/cfdisk.c:2546 fdisk/cfdisk.c:2549
+msgid ", NC"
+msgstr ", NC"
+
+#: fdisk/cfdisk.c:2554 fdisk/cfdisk.c:2557
+msgid "NC"
+msgstr "NC"
+
+#: fdisk/cfdisk.c:2565
+msgid "Pri/Log"
+msgstr "Chính/Lôgíc"
+
+#: fdisk/cfdisk.c:2572
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Không rõ (%02X)"
+
+#: fdisk/cfdisk.c:2641
+#, c-format
+msgid "Disk Drive: %s"
+msgstr "Ổ đĩa: %s"
+
+#: fdisk/cfdisk.c:2648
+#, c-format
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Kích thước: %lld byte, %lld MB"
+
+#: fdisk/cfdisk.c:2651
+#, c-format
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Kích thước: %lld byte, %lld.%lld GB"
+
+#: fdisk/cfdisk.c:2655
+#, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Đầu đọc: %d Sector mỗi rãnh: %d Cylinder: %lld"
+
+#: fdisk/cfdisk.c:2659
+msgid "Name"
+msgstr "Tên"
+
+#: fdisk/cfdisk.c:2660
+msgid "Flags"
+msgstr "Cờ"
+
+#: fdisk/cfdisk.c:2661
+msgid "Part Type"
+msgstr "Loại phân vùng"
+
+#: fdisk/cfdisk.c:2662
+msgid "FS Type"
+msgstr "Loại hệ thống tập tin"
+
+#: fdisk/cfdisk.c:2663
+msgid "[Label]"
+msgstr "[Nhãn]"
+
+#: fdisk/cfdisk.c:2665
+msgid "    Sectors"
+msgstr "    Sector"
+
+#: fdisk/cfdisk.c:2667
+msgid "  Cylinders"
+msgstr "  Cylinder"
+
+#: fdisk/cfdisk.c:2669
+msgid "  Size (MB)"
+msgstr "  Kích thước (MB)"
+
+#: fdisk/cfdisk.c:2671
+msgid "  Size (GB)"
+msgstr "  Kích thước (GB)"
+
+#: fdisk/cfdisk.c:2725
+msgid "Bootable"
+msgstr "Có thể khởi động"
+
+#: fdisk/cfdisk.c:2725
+msgid "Toggle bootable flag of the current partition"
+msgstr "Bặt tắt khả năng khởi động của phân vùng"
+
+#: fdisk/cfdisk.c:2726
+msgid "Delete"
+msgstr "Xóa"
+
+#: fdisk/cfdisk.c:2726
+msgid "Delete the current partition"
+msgstr "Xóa phân vùng hiện thời"
+
+#: fdisk/cfdisk.c:2727
+msgid "Geometry"
+msgstr "Cấu trúc"
+
+#: fdisk/cfdisk.c:2727
+msgid "Change disk geometry (experts only)"
+msgstr "Thay đổi cấu trúc đĩa (chỉ dành cho người có kinh nghiệm)"
+
+#: fdisk/cfdisk.c:2728
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: fdisk/cfdisk.c:2728
+msgid "Print help screen"
+msgstr "Hiển thị màn hình trợ giúp"
+
+#: fdisk/cfdisk.c:2729
+msgid "Maximize"
+msgstr "Lớn nhất"
+
+#: fdisk/cfdisk.c:2729
+msgid "Maximize disk usage of the current partition (experts only)"
+msgstr "Giới hạn dùng lớn nhất của phân vùng hiện thời"
+
+#: fdisk/cfdisk.c:2730
+msgid "New"
+msgstr "Mới"
+
+#: fdisk/cfdisk.c:2730
+msgid "Create new partition from free space"
+msgstr "Tạo một phân vùng mới từ vùng đĩa trống"
+
+#: fdisk/cfdisk.c:2731
+msgid "Print"
+msgstr "In"
+
+#: fdisk/cfdisk.c:2731
+msgid "Print partition table to the screen or to a file"
+msgstr "In bản phân vùng ra màn hình hay ghi vào tập tin"
+
+#: fdisk/cfdisk.c:2732
+msgid "Quit"
+msgstr "Thoát"
+
+#: fdisk/cfdisk.c:2732
+msgid "Quit program without writing partition table"
+msgstr "Thoát chương trình và không ghi lại bảng phân vùng"
+
+#: fdisk/cfdisk.c:2733
+msgid "Type"
+msgstr "Loại"
+
+#: fdisk/cfdisk.c:2733
+msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
+msgstr "Thay đổi hệ thống tập tin (DOS, Linux, OS/2 và v.v...)"
+
+#: fdisk/cfdisk.c:2734
+msgid "Units"
+msgstr "Đơn vị"
+
+#: fdisk/cfdisk.c:2734
+msgid "Change units of the partition size display (MB, sect, cyl)"
+msgstr "Thay đổi đơn vị hiện thị kích thước phân vùng (MB, sect, cyl)"
+
+#: fdisk/cfdisk.c:2735
+msgid "Write"
+msgstr "Ghi"
+
+#: fdisk/cfdisk.c:2735
+msgid "Write partition table to disk (this might destroy data)"
+msgstr "Ghi bảng phân vùng lên đĩa (có thể hủy dữ liệu)"
+
+#: fdisk/cfdisk.c:2781
+msgid "Cannot make this partition bootable"
+msgstr "Không thể làm cho phân vùng có thể khởi động"
+
+#: fdisk/cfdisk.c:2791
+msgid "Cannot delete an empty partition"
+msgstr "Không thể xóa một phân vùng rỗng"
+
+#: fdisk/cfdisk.c:2811 fdisk/cfdisk.c:2813
+msgid "Cannot maximize this partition"
+msgstr "Không thể tăng kích thước lên lớn nhất phân vùng này"
+
+#: fdisk/cfdisk.c:2821
+msgid "This partition is unusable"
+msgstr "Phân vùng không thể sử dụng"
+
+#: fdisk/cfdisk.c:2823
+msgid "This partition is already in use"
+msgstr "Phân vùng đã được sử dụng"
+
+#: fdisk/cfdisk.c:2840
+msgid "Cannot change the type of an empty partition"
+msgstr "Không thể thay đổi loại của một phân vùng rỗng"
+
+#: fdisk/cfdisk.c:2867 fdisk/cfdisk.c:2873
+msgid "No more partitions"
+msgstr "Không có thêm phân vùng nào nữa"
+
+#: fdisk/cfdisk.c:2880
+msgid "Illegal command"
+msgstr "Lệnh không được chấp nhận"
+
+#: fdisk/cfdisk.c:2890
+#, c-format
+msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Bản quyền (C) 1994-2002 Kevin E. Martin & aeb\n"
+
+#: fdisk/cfdisk.c:2897
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+"Print version:\n"
+"        %s -v\n"
+"Print partition table:\n"
+"        %s -P {r|s|t} [options] device\n"
+"Interactive use:\n"
+"        %s [options] device\n"
+"\n"
+"Options:\n"
+"-a: Use arrow instead of highlighting;\n"
+"-z: Start with a zero partition table, instead of reading the pt from disk;\n"
+"-c C -h H -s S: Override the kernel's idea of the number of cylinders,\n"
+"                the number of heads and the number of sectors/track.\n"
+"\n"
+msgstr ""
+"\n"
+"Sử dụng:\n"
+"Hiện số phiên bản:\n"
+"        %s -v\n"
+"Hiện bảng phân vùng:\n"
+"        %s -P {r|s|t} [tùy chọn] thiết bị\n"
+"Interactive use:\n"
+"        %s [tùy chọn] thiết bị\n"
+"\n"
+"Tùy chọn:\n"
+"-a: sử dụng mũi tên thay cho hiện sáng;\n"
+"-z: Khởi động với bảng phân vùng rỗng thay vì đọc từ ổ đĩa;\n"
+"-c C -h H -s S: Viết chèn lên số cylinder, số đầu đọc và số,\n"
+"                sectors/track theo quan niệm của nhân Linux.\n"
+"\n"
+
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tCó một nhãn AIX sai trên đĩa này.\n"
+"\tKhông may là hiện tại Linux không thể điều khiển\n"
+"\tnhững đĩa này.  Tuy nhiên một vài\n"
+"\tlời khuyên:\n"
+"\t1. fdisk sẽ hủy hết nội dung đĩa khi ghi.\n"
+"\t2. Cần đảm bảo là đĩa này KHÔNG phải là phần\n"
+"\t   quan trọng của một nhóm đĩa. (Nói cách khác bạn có\n"
+"\t   thể xóa các đĩa khác, nếu không tạo gương.)\n"
+"\t3. Trước khi xóa bộ đĩa vật lý này, cần phải\n"
+"\t   xóa đĩa một cách lôgíc từ máy AIX.\n"
+"\t   (Nói cách khác bạn trở thành AIXpert)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"Nhãn BSD cho thiết bị: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:129 fdisk/fdisk.c:332 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:369 fdisk/fdisk.c:376 fdisk/fdisk.c:399 fdisk/fdisk.c:417
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:449
+msgid "Command action"
+msgstr "Tác dụng của câu lệnh"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   xóa một phân vùng BSD"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   sửa dữ liệu ổ đĩa"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   cài đặt trình khởi động tự mồi"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   liệt kê loại hệ thống tập tin đã biết"
+
+#: fdisk/fdiskbsdlabel.c:134 fdisk/fdisk.c:338 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:382 fdisk/fdisk.c:407 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:440 fdisk/fdisk.c:457
+msgid "   m   print this menu"
+msgstr "   m   hiển thị trình đơn này"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   thêm một phân vùng BSD mới"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   in ra bảng phân vùng BSD"
+
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:342 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:386 fdisk/fdisk.c:409 fdisk/fdisk.c:426
+#: fdisk/fdisk.c:442 fdisk/fdisk.c:459
+msgid "   q   quit without saving changes"
+msgstr "   q   thoát và không ghi nhớ các thay đổi"
+
+#: fdisk/fdiskbsdlabel.c:138 fdisk/fdisk.c:410 fdisk/fdisk.c:427
+#: fdisk/fdisk.c:443 fdisk/fdisk.c:460
+msgid "   r   return to main menu"
+msgstr "   r   trở lại trình đơn chính"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   hiển thị nhãn đĩa đầy đủ"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   thay đổi id hệ thống tập tin của một phân vùng"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   thay đổi đơn vị (cylinder/sector)"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   ghi nhớ nhãn đĩa lên ổ đĩa"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   liên kết phân vùng BSD tới phân vùng không phải BSD"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Phân vùng %s có một sector 0 bị lỗi.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Đọc nhãn đĩa của %s tại sector %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Không có phân vùng *BSD trên %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "Câu lệnh nhãn đĩa BSD (m để xem trợ giúp): "
+
+#: fdisk/fdiskbsdlabel.c:284 fdisk/fdisk.c:1947 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "%s đầu tiên"
+
+#: fdisk/fdiskbsdlabel.c:291 fdisk/fdisk.c:2007 fdisk/fdisksunlabel.c:574
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "%s cuối hay +size hay +sizeM hay +sizeK"
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "loại: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "loại: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "đĩa: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "nhãn: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+#, c-format
+msgid "flags:"
+msgstr "cờ:"
+
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid " removable"
+msgstr " có thể xóa"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid " badsect"
+msgstr " sector xấu"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "byte/sector: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "sector/track: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "track/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "sector/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "vòng mỗi phút: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "xen kẽ: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "độ nghiêng track: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "Độ nghiêng trụ (cylinder): %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "bật đầu đọc: %ld\t\t# milli giây\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "tìm kiếm từ track tới track: %ld\t# milli giây\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+#, c-format
+msgid "drivedata: "
+msgstr "dữ liệu ổ đĩa: "
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d phân vùng:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+#, c-format
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr ""
+"#       đầu        cuối     kích thước     hệthống   [fsize bsize   cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Viết nhãn đĩa tới %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s không chứa nhãn đĩa.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Bạn có muốn tạo một nhãn đĩa? (y/n) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "byte/sector"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "sector/track"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "track/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:470 fdisk/fdisk.c:593 fdisk/fdisk.c:1262
+#: fdisk/sfdisk.c:935
+msgid "cylinders"
+msgstr "cylinder"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "sector/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:481
+#, c-format
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Phải <= số sector/track * số track/cylinder (mặc định).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "số vòng mỗi phút"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "xen kẽ"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "độ nghiêng track"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "Độ nghiêng trụ (cylinder)"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "bật đầu đọc"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "tìm kiếm từ track tới track"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Trình mồi: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+#, c-format
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Trình mồi đè lên nhau với nhãn đĩa!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Trình mồi được cài trên %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Phân vùng (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:618 fdisk/fdisk.c:2084
+#, c-format
+msgid "The maximum number of partitions has been created\n"
+msgstr "Đã tạo ra số phân vùng lớn nhất cho phép\n"
+
+#: fdisk/fdiskbsdlabel.c:630
+#, c-format
+msgid "This partition already exists.\n"
+msgstr "Phân vùng này đã có.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Cảnh báo: có quá nhiều phân vùng (%d, max là %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+#, c-format
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"Đồng bộ các đĩa.\n"
+
+#: fdisk/fdisk.c:190
+msgid ""
+"Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
+"       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
+"       fdisk -s PARTITION           Give partition size(s) in blocks\n"
+"       fdisk -v                     Give fdisk version\n"
+"Here DISK is something like /dev/hdb or /dev/sda\n"
+"and PARTITION is something like /dev/hda7\n"
+"-u: give Start and End in sector (instead of cylinder) units\n"
+"-b 2048: (for certain MO disks) use 2048-byte sectors\n"
+msgstr ""
+"Sử dụng: fdisk [-b SSZ] [-u] ĐĨA    Thay đổi bảng phân vùng\n"
+"       fdisk -l [-b SSZ] [-u] ĐĨA   Liệt kê bảng phân vùng\n"
+"       fdisk -s PHÂN_VÙNG           Cho biết kích thước phân vùng theo khối\n"
+"       fdisk -v                     Cho biết số phiên bản fdisk\n"
+"Trong đó ĐĨA có dạng /dev/hdb hay /dev/sda\n"
+"còn PHÂN_VÙNG có dạng /dev/hda7\n"
+"-u: cho biết Đầu và Cuối theo đơn vị sector (thay vì cylinder)\n"
+"-b 2048: (cho các đĩa MO) sử dụng các sector 2048 byte\n"
+
+#: fdisk/fdisk.c:202
+msgid ""
+"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
+"E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
+"  or: fdisk /dev/sdc  (for the third SCSI disk)\n"
+"  or: fdisk /dev/eda  (for the first PS/2 ESDI drive)\n"
+"  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
+"  ...\n"
+msgstr ""
+"Sử dụng: fdisk [-l] [-b SSZ] [-u] thiết_bị\n"
+"V.d.: fdisk /dev/hda  (cho đĩa IDE đầu tiên)\n"
+"  hay: fdisk /dev/sdc  (cho đĩa SCSI thứ ba)\n"
+"  hay: fdisk /dev/eda  (cho ổ PS/2 ESDI đầu tiên)\n"
+"  hay: fdisk /dev/rd/c0d0  hay: fdisk /dev/ida/c0d0  (cho các thiết bị "
+"RAID)\n"
+"  ...\n"
+
+#: fdisk/fdisk.c:211
+#, c-format
+msgid "Unable to open %s\n"
+msgstr "Không thể mở %s\n"
+
+#: fdisk/fdisk.c:215
+#, c-format
+msgid "Unable to read %s\n"
+msgstr "Không thể đọc %s\n"
+
+#: fdisk/fdisk.c:219
+#, c-format
+msgid "Unable to seek on %s\n"
+msgstr "Không thể tìm trên %s\n"
+
+#: fdisk/fdisk.c:223
+#, c-format
+msgid "Unable to write %s\n"
+msgstr "Không thể ghi %s\n"
+
+#: fdisk/fdisk.c:227
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr "BLKGETSIZE ioctl không thành công trên %s\n"
+
+#: fdisk/fdisk.c:231
+msgid "Unable to allocate any more memory\n"
+msgstr "Không thể phân phối thêm bộ nhớ\n"
+
+#: fdisk/fdisk.c:234
+msgid "Fatal error\n"
+msgstr "Lỗi nặng\n"
+
+#: fdisk/fdisk.c:333
+msgid "   a   toggle a read only flag"
+msgstr "   a   bật/tắt cờ chỉ đọc"
+
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
+msgid "   b   edit bsd disklabel"
+msgstr "   b   sửa nhãn đĩa bsd"
+
+#: fdisk/fdisk.c:335
+msgid "   c   toggle the mountable flag"
+msgstr "   c   bật cờ có thể gắn"
+
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
+msgid "   d   delete a partition"
+msgstr "   d   xóa một phân vùng"
+
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+msgid "   l   list known partition types"
+msgstr "   l   hiển thị loại phân vùng đã biết"
+
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383
+msgid "   n   add a new partition"
+msgstr "   n   thêm một phân vùng mới"
+
+#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:371 fdisk/fdisk.c:384
+msgid "   o   create a new empty DOS partition table"
+msgstr "   o   tạo một bảng phân vùng DOS rỗng"
+
+#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:385 fdisk/fdisk.c:408
+#: fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458
+msgid "   p   print the partition table"
+msgstr "   p   in ra bảng phân vùng"
+
+#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:373 fdisk/fdisk.c:387
+msgid "   s   create a new empty Sun disklabel"
+msgstr "   s   tạo một nhãn đĩa Sun rỗng"
+
+#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388
+msgid "   t   change a partition's system id"
+msgstr "   t   thay đổi id của phân vùng"
+
+#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389
+msgid "   u   change display/entry units"
+msgstr "   u   thay đổi đơn vị hiển thị"
+
+#: fdisk/fdisk.c:346 fdisk/fdisk.c:365 fdisk/fdisk.c:390 fdisk/fdisk.c:412
+#: fdisk/fdisk.c:429 fdisk/fdisk.c:445 fdisk/fdisk.c:462
+msgid "   v   verify the partition table"
+msgstr "   v   kiểm tra bảng phân vùng"
+
+#: fdisk/fdisk.c:347 fdisk/fdisk.c:366 fdisk/fdisk.c:391 fdisk/fdisk.c:413
+#: fdisk/fdisk.c:430 fdisk/fdisk.c:446 fdisk/fdisk.c:463
+msgid "   w   write table to disk and exit"
+msgstr "   w   ghi bảng phân vùng lên đĩa và thoát"
+
+#: fdisk/fdisk.c:348 fdisk/fdisk.c:392
+msgid "   x   extra functionality (experts only)"
+msgstr "   x   các chức năng mở rộng (chỉ dành cho người có kinh nghiệm)"
+
+#: fdisk/fdisk.c:352
+msgid "   a   select bootable partition"
+msgstr "   a   chọn phân vùng có thể khởi động"
+
+#: fdisk/fdisk.c:353
+msgid "   b   edit bootfile entry"
+msgstr "   b   soạn thảo tập tin khởi động"
+
+#: fdisk/fdisk.c:354
+msgid "   c   select sgi swap partition"
+msgstr "   c   chọn phân vùng swap sgi"
+
+#: fdisk/fdisk.c:377
+msgid "   a   toggle a bootable flag"
+msgstr "   a   bật/tắt cờ có thể khởi động"
+
+#: fdisk/fdisk.c:379
+msgid "   c   toggle the dos compatibility flag"
+msgstr "   c   bật/tắt cờ tương thích với dos"
+
+#: fdisk/fdisk.c:400
+msgid "   a   change number of alternate cylinders"
+msgstr "   a   thay đổi số cylinder xen kẽ"
+
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451
+msgid "   c   change number of cylinders"
+msgstr "   c   thay đổi số cylinder"
+
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:452
+msgid "   d   print the raw data in the partition table"
+msgstr "   d   in ra dữ liệu thô trong bảng phân vùng"
+
+#: fdisk/fdisk.c:403
+msgid "   e   change number of extra sectors per cylinder"
+msgstr "   e   thay đổi số sector dự phòng trong mỗi cylinder"
+
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+msgid "   h   change number of heads"
+msgstr "   h   thay đổi số đầu đọc"
+
+#: fdisk/fdisk.c:405
+msgid "   i   change interleave factor"
+msgstr "   i   thay đổi hệ số xen kẽ"
+
+#: fdisk/fdisk.c:406
+msgid "   o   change rotation speed (rpm)"
+msgstr "   o   thay đổi tốc độ quay (rpm)"
+
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461
+msgid "   s   change number of sectors/track"
+msgstr "   s   thay đổi số sector/track"
+
+#: fdisk/fdisk.c:414
+msgid "   y   change number of physical cylinders"
+msgstr "   y   thay đổi số cylinder vật lý"
+
+#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450
+msgid "   b   move beginning of data in a partition"
+msgstr "   b   di chuyển bắt đầu của dữ liệu trong một phân vùng"
+
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:453
+msgid "   e   list extended partitions"
+msgstr "   e   liệt kê các phân vùng mở rộng"
+
+#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+msgid "   g   create an IRIX (SGI) partition table"
+msgstr "   g   tạo một bảng phân vùng IRIX (SGI)"
+
+#: fdisk/fdisk.c:454
+msgid "   f   fix partition order"
+msgstr "   f   sửa thứ tự phân vùng"
+
+#: fdisk/fdisk.c:572
+#, c-format
+msgid "You must set"
+msgstr "Bạn phải đặt"
+
+#: fdisk/fdisk.c:589
+msgid "heads"
+msgstr "đầu đọc"
+
+#: fdisk/fdisk.c:591 fdisk/fdisk.c:1262 fdisk/sfdisk.c:935
+msgid "sectors"
+msgstr "sector"
+
+#: fdisk/fdisk.c:597
+#, c-format
+msgid ""
+"%s%s.\n"
+"You can do this from the extra functions menu.\n"
+msgstr ""
+"%s%s.\n"
+"Bạn có thể làm việc này từ trình đơn chức năng mở rộng.\n"
+
+#: fdisk/fdisk.c:598
+msgid " and "
+msgstr " và "
+
+#: fdisk/fdisk.c:615
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+"\n"
+"Số cylinder cho đĩa này được đặt thành %d.\n"
+"Không có gì sai, nhưng số này lớn hơn 1024,\n"
+"và có thể tạo vấn đề với:\n"
+"1) phần mềm chạy tại thời điểm khởi động (v.d., phiên bản LILO cũ)\n"
+"2) phần mềm khởi động và phân vùng từ các HĐH khác\n"
+"   (v.d., DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:638
+#, c-format
+msgid "Bad offset in primary extended partition\n"
+msgstr "Offset xấu trong phân vùng mở rộng chính\n"
+
+#: fdisk/fdisk.c:652
+#, c-format
+msgid ""
+"Warning: omitting partitions after #%d.\n"
+"They will be deleted if you save this partition table.\n"
+msgstr ""
+"Cảnh báo: Bỏ sót các phân vùng sau #%d.\n"
+"Chúng sẽ bị xóa nếu bạn ghi nhớ bảng phân vùng này.\n"
+
+#: fdisk/fdisk.c:671
+#, c-format
+msgid "Warning: extra link pointer in partition table %d\n"
+msgstr "Cảnh báo: điểm liên kết dự phòng trong bảng phân vùng %d\n"
+
+#: fdisk/fdisk.c:679
+#, c-format
+msgid "Warning: ignoring extra data in partition table %d\n"
+msgstr "Cảnh báo: bỏ qua dữ liệu dự phòng trong bảng phân vùng %d\n"
+
+#: fdisk/fdisk.c:724
+#, c-format
+msgid ""
+"Building a new DOS disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Tạo một nhãn đĩa DOS mới. Thay đỗi chỉ nằm tạm trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung\n"
+"trước đó sẽ không thể được phục hồi.\n"
+
+#: fdisk/fdisk.c:768
+#, c-format
+msgid "Note: sector size is %d (not %d)\n"
+msgstr "Chú ý: kích thước sector là %d (không %d)\n"
+
+#: fdisk/fdisk.c:925
+#, c-format
+msgid "You will not be able to write the partition table.\n"
+msgstr "Bạn sẽ không thể ghi nhớ bảng phân vùng.\n"
+
+#: fdisk/fdisk.c:954
+#, c-format
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+"Đĩa này có cả DOS và BSD magic.\n"
+"Nhập lệnh 'b' để vào chế độ BSD.\n"
+
+#: fdisk/fdisk.c:964
+#, c-format
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr "Thiết bị chứa một bảng phân vùng DOS, hay Sun, SGI hay OSF bị lỗi\n"
+
+#: fdisk/fdisk.c:981
+#, c-format
+msgid "Internal error\n"
+msgstr "Lỗi nội bộ\n"
+
+#: fdisk/fdisk.c:994
+#, c-format
+msgid "Ignoring extra extended partition %d\n"
+msgstr "Bỏ qua các phân vùng mở rộng dự phòng %d\n"
+
+#: fdisk/fdisk.c:1006
+#, c-format
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Cảnh báo: cờ 0x%04x của bảng phân vùng %d bị lỗi sẽ được sửa bởi w(rite) "
+"(ghi nhớ)\n"
+
+#: fdisk/fdisk.c:1028
+#, c-format
+msgid ""
+"\n"
+"got EOF thrice - exiting..\n"
+msgstr ""
+"\n"
+"nhận được EOF ba lần - đang thoát..\n"
+
+#: fdisk/fdisk.c:1067
+msgid "Hex code (type L to list codes): "
+msgstr "Mã Hex (gõ L để liệt kê mã): "
+
+#: fdisk/fdisk.c:1107
+#, c-format
+msgid "%s (%u-%u, default %u): "
+msgstr "%s (%u-%u, mặc định %u): "
+
+#: fdisk/fdisk.c:1174
+#, c-format
+msgid "Using default value %u\n"
+msgstr "Sử dụng giá trị mặc định %u\n"
+
+#: fdisk/fdisk.c:1178
+#, c-format
+msgid "Value out of range.\n"
+msgstr "Giá trị vượt quá giới hạn.\n"
+
+#: fdisk/fdisk.c:1188
+msgid "Partition number"
+msgstr "Số thứ tự phân vùng"
+
+#: fdisk/fdisk.c:1199
+#, c-format
+msgid "Warning: partition %d has empty type\n"
+msgstr "Cảnh báo: phân vùng %d chưa phân loại\n"
+
+#: fdisk/fdisk.c:1221 fdisk/fdisk.c:1247
+#, c-format
+msgid "Selected partition %d\n"
+msgstr "Phân vùng được chọn %d\n"
+
+#: fdisk/fdisk.c:1224
+#, c-format
+msgid "No partition is defined yet!\n"
+msgstr "Không có phân vùng được xác định!\n"
+
+#: fdisk/fdisk.c:1250
+#, c-format
+msgid "All primary partitions have been defined already!\n"
+msgstr "Tất cả các phân vùng chính phải được xác định!\n"
+
+#: fdisk/fdisk.c:1260
+msgid "cylinder"
+msgstr "cylinder"
+
+#: fdisk/fdisk.c:1260
+msgid "sector"
+msgstr "sector"
+
+#: fdisk/fdisk.c:1269
+#, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr "Thay đổi đơn vị hiển thị thành %s\n"
+
+#: fdisk/fdisk.c:1280
+#, c-format
+msgid "WARNING: Partition %d is an extended partition\n"
+msgstr "CẢNH BÁO: Phân vùng %d là một phân vùng mở rộng\n"
+
+#: fdisk/fdisk.c:1291
+#, c-format
+msgid "DOS Compatibility flag is set\n"
+msgstr "Cờ tương thích với DOS được đặt\n"
+
+#: fdisk/fdisk.c:1295
+#, c-format
+msgid "DOS Compatibility flag is not set\n"
+msgstr "Cờ tương thích DOS không được đặt\n"
+
+#: fdisk/fdisk.c:1395
+#, c-format
+msgid "Partition %d does not exist yet!\n"
+msgstr "Phân vùng %d không tồn tại!\n"
+
+#: fdisk/fdisk.c:1400
+#, c-format
+msgid ""
+"Type 0 means free space to many systems\n"
+"(but not to Linux). Having partitions of\n"
+"type 0 is probably unwise. You can delete\n"
+"a partition using the `d' command.\n"
+msgstr ""
+"Gõ 0 có nghĩa là không gian trống đối với\n"
+"nhiều hệ thống (nhưng với Linux thì không).\n"
+"Không nên có phân vùng với loại 0. Bạn có\n"
+"thể xóa một phân vùng sử dụng câu lệnh `d'.\n"
+
+#: fdisk/fdisk.c:1409
+#, c-format
+msgid ""
+"You cannot change a partition into an extended one or vice versa\n"
+"Delete it first.\n"
+msgstr ""
+"Bạn không thể thay đổi một phân vùng thành mở rộng hoặc thay thế cho versa\n"
+"Xóa nó trước.\n"
+
+#: fdisk/fdisk.c:1418
+#, c-format
+msgid ""
+"Consider leaving partition 3 as Whole disk (5),\n"
+"as SunOS/Solaris expects it and even Linux likes it.\n"
+"\n"
+msgstr ""
+"Nên để phân vùng 3 như Cả một đĩa (5),\n"
+"vì SunOS/Solaris đòi hỏi điều này và thậm chí Linux thích.\n"
+"\n"
+
+#: fdisk/fdisk.c:1424
+#, c-format
+msgid ""
+"Consider leaving partition 9 as volume header (0),\n"
+"and partition 11 as entire volume (6)as IRIX expects it.\n"
+"\n"
+msgstr ""
+"Nên để phân vùng 9 như đầu một bộ (0), và phân\n"
+"vùng 11 như cả một bộ (6) vì IRIX đòi hỏi điều này.\n"
+"\n"
+
+#: fdisk/fdisk.c:1437
+#, c-format
+msgid "Changed system type of partition %d to %x (%s)\n"
+msgstr "Đã thay đổi loại hệ thống của phân vùng %d thành %x (%s)\n"
+
+#: fdisk/fdisk.c:1492
+#, c-format
+msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
+msgstr ""
+"Phân vùng %d có điểm khởi đầu vật lý/lôgíc khác nhay (không phải Linux?):\n"
+
+#: fdisk/fdisk.c:1494 fdisk/fdisk.c:1502 fdisk/fdisk.c:1511 fdisk/fdisk.c:1521
+#, c-format
+msgid "     phys=(%d, %d, %d) "
+msgstr "     vật lý=(%d, %d, %d) "
+
+#: fdisk/fdisk.c:1495 fdisk/fdisk.c:1503
+#, c-format
+msgid "logical=(%d, %d, %d)\n"
+msgstr "lôgíc=(%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1500
+#, c-format
+msgid "Partition %d has different physical/logical endings:\n"
+msgstr "Phân vùng %d có điểm cuối vật lý/lôgíc khác nhau:\n"
+
+#: fdisk/fdisk.c:1509
+#, c-format
+msgid "Partition %i does not start on cylinder boundary:\n"
+msgstr "Phân vùng %i không bắt đầu trên ranh giới cylinder:\n"
+
+#: fdisk/fdisk.c:1512
+#, c-format
+msgid "should be (%d, %d, 1)\n"
+msgstr "phải là (%d, %d, 1)\n"
+
+#: fdisk/fdisk.c:1518
+#, c-format
+msgid "Partition %i does not end on cylinder boundary.\n"
+msgstr "Phân vùng %i không kết thúc trên ranh giới cylinder:\n"
+
+#: fdisk/fdisk.c:1522
+#, c-format
+msgid "should be (%d, %d, %d)\n"
+msgstr "phải là (%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1534
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld MB, %lld bytes\n"
+msgstr ""
+"\n"
+"Đĩa %s: %ld MB, %lld bytes\n"
+
+#: fdisk/fdisk.c:1537
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld.%ld GB, %lld bytes\n"
+msgstr ""
+"\n"
+"Đĩa %s: %ld.%ld GB, %lld bytes\n"
+
+#: fdisk/fdisk.c:1539
+#, c-format
+msgid "%d heads, %d sectors/track, %d cylinders"
+msgstr "%d đầu đọc, %d sectors/track, %d cylinders"
+
+#: fdisk/fdisk.c:1542
+#, c-format
+msgid ", total %llu sectors"
+msgstr ", tổng số %llu sector"
+
+#: fdisk/fdisk.c:1545
+#, c-format
+msgid ""
+"Units = %s of %d * %d = %d bytes\n"
+"\n"
+msgstr ""
+"Đơn vị = %s của %d * %d = %d bytes\n"
+"\n"
+
+#: fdisk/fdisk.c:1653
+#, c-format
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Không cần làm gì. Thứ tự đã đúng sẵn.\n"
+"\n"
+
+#: fdisk/fdisk.c:1709
+#, c-format
+msgid ""
+"This doesn't look like a partition table\n"
+"Probably you selected the wrong device.\n"
+"\n"
+msgstr ""
+"Có vẻ như đây không phải là bảng phân vùng\n"
+"Có thể bạn đã chọn nhầm thiết bị.\n"
+"\n"
+
+#: fdisk/fdisk.c:1723
+#, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s  Khởiđộng    Đầu       Cuối      Khối      Id  Hệ thống tập tin\n"
+
+#: fdisk/fdisk.c:1724 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:678
+msgid "Device"
+msgstr "Thiết bị"
+
+#: fdisk/fdisk.c:1761
+#, c-format
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Các mục trong bảng phân vùng không theo thứ tự như trên đĩa\n"
+
+#: fdisk/fdisk.c:1771
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"\n"
+msgstr ""
+"\n"
+"Đĩa %s: %d đầu đọc, %d sectors, %d cylinders\n"
+"\n"
+
+#: fdisk/fdisk.c:1773
+#, c-format
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Đầu      Kíchthước ID\n"
+
+#: fdisk/fdisk.c:1818
+#, c-format
+msgid "Warning: partition %d contains sector 0\n"
+msgstr "Cảnh báo: phân vùng %d chứa sector 0\n"
+
+#: fdisk/fdisk.c:1821
+#, c-format
+msgid "Partition %d: head %d greater than maximum %d\n"
+msgstr "Phân vùng %d: đầu %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1824
+#, c-format
+msgid "Partition %d: sector %d greater than maximum %d\n"
+msgstr "Phân vùng %d: sector %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1827
+#, c-format
+msgid "Partitions %d: cylinder %d greater than maximum %d\n"
+msgstr "Phân vùng %d: cylinder %d lớn hơn max %d\n"
+
+#: fdisk/fdisk.c:1831
+#, c-format
+msgid "Partition %d: previous sectors %d disagrees with total %d\n"
+msgstr "Phân vùng %d: các sector phía trước %d không hợp với tổng số %d\n"
+
+#: fdisk/fdisk.c:1863
+#, c-format
+msgid "Warning: bad start-of-data in partition %d\n"
+msgstr "Cảnh báo: khởi-đầu-dữ-liệu xấu trong phân vùng %d\n"
+
+#: fdisk/fdisk.c:1871
+#, c-format
+msgid "Warning: partition %d overlaps partition %d.\n"
+msgstr "Cảnh báo: phân vùng %d đè lên phân vùng %d.\n"
+
+#: fdisk/fdisk.c:1891
+#, c-format
+msgid "Warning: partition %d is empty\n"
+msgstr "Cảnh báo: phân vùng %d rỗng\n"
+
+#: fdisk/fdisk.c:1896
+#, c-format
+msgid "Logical partition %d not entirely in partition %d\n"
+msgstr "Phân vùng lôgíc %d không hoàn toàn trong phân vùng %d\n"
+
+#: fdisk/fdisk.c:1902
+#, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
+msgstr "Tổng số sector phân phối %d lớn hơn max %lld\n"
+
+#: fdisk/fdisk.c:1905
+#, c-format
+msgid "%lld unallocated sectors\n"
+msgstr "%lld sector không được phân phối\n"
+
+#: fdisk/fdisk.c:1920 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:502
+#, c-format
+msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
+msgstr ""
+"Phân vùng %d đã được xác định.  Hãy xóa nó trước khi thêm lại lần nữa\n"
+
+#: fdisk/fdisk.c:1962 fdisk/fdisksunlabel.c:563
+#, c-format
+msgid "Sector %d is already allocated\n"
+msgstr "Sector %d đã được phân phối\n"
+
+#: fdisk/fdisk.c:1998
+#, c-format
+msgid "No free sectors available\n"
+msgstr "Không còn sector nào trống\n"
+
+#: fdisk/fdisk.c:2072
+#, c-format
+msgid ""
+"\tSorry - this fdisk cannot handle AIX disk labels.\n"
+"\tIf you want to add DOS-type partitions, create\n"
+"\ta new empty DOS partition table first. (Use o.)\n"
+"\tWARNING: This will destroy the present disk contents.\n"
+msgstr ""
+"\tXin lỗi - fdisk này không thể quản lý nhãn đĩa AIX.\n"
+"\tNếu bạn muốn thêm các phân vùng dạng DOS, hãy tạo\n"
+"\tmột bảng phân vùng DOS rỗng trước. (Sử dụng o.)\n"
+"\tCẢNH BÁO: Nội dung hiện thời của đĩa sẽ bị hủy.\n"
+
+#: fdisk/fdisk.c:2092
+#, c-format
+msgid "You must delete some partition and add an extended partition first\n"
+msgstr "Bạn phải xóa vài phân vùng và thêm một phân vùng mở rộng trước\n"
+
+#: fdisk/fdisk.c:2095
+#, c-format
+msgid "All logical partitions are in use\n"
+msgstr "Tất cả các phân vùng lôgíc được sử dụng\n"
+
+#: fdisk/fdisk.c:2096
+#, c-format
+msgid "Adding a primary partition\n"
+msgstr "Thêm phân vùng chính\n"
+
+#: fdisk/fdisk.c:2101
+#, c-format
+msgid ""
+"Command action\n"
+"   %s\n"
+"   p   primary partition (1-4)\n"
+msgstr ""
+"Tác dụng của câu lệnh\n"
+"   %s\n"
+"   p   phân vùng chính (1-4)\n"
+
+#: fdisk/fdisk.c:2103
+msgid "l   logical (5 or over)"
+msgstr "l   lôgíc (5 hoặc hơn)"
+
+#: fdisk/fdisk.c:2103
+msgid "e   extended"
+msgstr "e   mở rộng"
+
+#: fdisk/fdisk.c:2122
+#, c-format
+msgid "Invalid partition number for type `%c'\n"
+msgstr "Sai số phân vùng cho loại `%c'\n"
+
+#: fdisk/fdisk.c:2158
+#, c-format
+msgid ""
+"The partition table has been altered!\n"
+"\n"
+msgstr ""
+"Bảng phân vùng đã được ghi!\n"
+"\n"
+
+#: fdisk/fdisk.c:2167
+#, c-format
+msgid "Calling ioctl() to re-read partition table.\n"
+msgstr "Gọi ioctl() để đọc lại bảng phân vùng.\n"
+
+#: fdisk/fdisk.c:2183
+#, c-format
+msgid ""
+"\n"
+"WARNING: Re-reading the partition table failed with error %d: %s.\n"
+"The kernel still uses the old table.\n"
+"The new table will be used at the next reboot.\n"
+msgstr ""
+"\n"
+"CẢNH BÁO: Không thể đọc lại bảng phân vùng với lỗi %d: %s.\n"
+"Nhân vẫn đang dùng bảng cũ.\n"
+"Bảng mới sẽ được sử dụng tại lần khởi động tiếp theo.\n"
+
+#: fdisk/fdisk.c:2193
+#, c-format
+msgid ""
+"\n"
+"WARNING: If you have created or modified any DOS 6.x\n"
+"partitions, please see the fdisk manual page for additional\n"
+"information.\n"
+msgstr ""
+"\n"
+"CẢNH BÁO: Nếu bạn đã tạo hoặc sửa đổi bất kỳ phân vùng\n"
+"DOS 6.x nào, xin hãy xem trang hướng dẫn sử dụng man fdisk\n"
+"để biết thêm chi tiết.\n"
+
+#: fdisk/fdisk.c:2199
+#, c-format
+msgid ""
+"\n"
+"Error closing file\n"
+msgstr ""
+"\n"
+"Lỗi đóng tậ p tin\n"
+
+#: fdisk/fdisk.c:2203
+#, c-format
+msgid "Syncing disks.\n"
+msgstr "Đồng bộ đĩa.\n"
+
+#: fdisk/fdisk.c:2250
+#, c-format
+msgid "Partition %d has no data area\n"
+msgstr "Phân vùng %d không có vùng dữ liệu\n"
+
+#: fdisk/fdisk.c:2255
+msgid "New beginning of data"
+msgstr "Điểm bắt đầu dữ liệu mới"
+
+#: fdisk/fdisk.c:2271
+msgid "Expert command (m for help): "
+msgstr "Câu lệnh nâng cao (m để xem trợ giúp): "
+
+#: fdisk/fdisk.c:2284
+msgid "Number of cylinders"
+msgstr "Số cylinder"
+
+#: fdisk/fdisk.c:2311
+msgid "Number of heads"
+msgstr "Số đầu đọc"
+
+#: fdisk/fdisk.c:2336
+msgid "Number of sectors"
+msgstr "Số sector"
+
+#: fdisk/fdisk.c:2339
+#, c-format
+msgid "Warning: setting sector offset for DOS compatiblity\n"
+msgstr "Cảnh báo: thiết lập sector offset cho tương thích DOS\n"
+
+#: fdisk/fdisk.c:2411
+#, c-format
+msgid "Disk %s doesn't contain a valid partition table\n"
+msgstr "Đĩa %s không chứa một bảng phân vùng hợp lệ\n"
+
+#: fdisk/fdisk.c:2422
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "Không thể mở %s\n"
+
+#: fdisk/fdisk.c:2440 fdisk/sfdisk.c:2453
+#, c-format
+msgid "cannot open %s\n"
+msgstr "không thể mở %s\n"
+
+#: fdisk/fdisk.c:2460
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: câu lệnh không biết\n"
+
+#: fdisk/fdisk.c:2528
+#, c-format
+msgid "This kernel finds the sector size itself - -b option ignored\n"
+msgstr "Nhân này tự tìm kích thước sector - tùy chọn -b bị bỏ qua\n"
+
+#: fdisk/fdisk.c:2532
+#, c-format
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Cảnh báo: tùy chọn -b (đặt kích thước sector) cần sử dụng với một thiết bị "
+"xác định\n"
+
+#: fdisk/fdisk.c:2591
+#, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+msgstr "Tìm thấy một nhãn đĩa OSF/1 trên %s, nhập chế độ nhãn đĩa.\n"
+
+#: fdisk/fdisk.c:2601
+msgid "Command (m for help): "
+msgstr "Câu lệnh (m để xem trợ giúp): "
+
+#: fdisk/fdisk.c:2617
+#, c-format
+msgid ""
+"\n"
+"The current boot file is: %s\n"
+msgstr ""
+"\n"
+"Tập tin khởi động hiện thời là: %s\n"
+
+#: fdisk/fdisk.c:2619
+msgid "Please enter the name of the new boot file: "
+msgstr "Xin hãy nhập tên của tập tin khởi động mới: "
+
+#: fdisk/fdisk.c:2621
+#, c-format
+msgid "Boot file unchanged\n"
+msgstr "Tập tin khởi động không thay đổi\n"
+
+#: fdisk/fdisk.c:2694
+#, c-format
+msgid ""
+"\n"
+"\tSorry, no experts menu for SGI partition tables available.\n"
+"\n"
+msgstr ""
+"\n"
+"\tXin lỗi, không có menu nâng cao cho bảng phân vùng SGI.\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:80
+msgid "SGI volhdr"
+msgstr "SGI volhdr"
+
+#: fdisk/fdisksgilabel.c:81
+msgid "SGI trkrepl"
+msgstr "SGI trkrepl"
+
+#: fdisk/fdisksgilabel.c:82
+msgid "SGI secrepl"
+msgstr "SGI secrepl"
+
+#: fdisk/fdisksgilabel.c:83
+msgid "SGI raw"
+msgstr "SGI thô"
+
+#: fdisk/fdisksgilabel.c:84
+msgid "SGI bsd"
+msgstr "SGI bsd"
+
+#: fdisk/fdisksgilabel.c:85
+msgid "SGI sysv"
+msgstr "SGI sysv"
+
+#: fdisk/fdisksgilabel.c:86
+msgid "SGI volume"
+msgstr "SGI volume"
+
+#: fdisk/fdisksgilabel.c:87
+msgid "SGI efs"
+msgstr "SGI efs"
+
+#: fdisk/fdisksgilabel.c:88
+msgid "SGI lvol"
+msgstr "SGI lvol"
+
+#: fdisk/fdisksgilabel.c:89
+msgid "SGI rlvol"
+msgstr "SGI rlvol"
+
+#: fdisk/fdisksgilabel.c:90
+msgid "SGI xfs"
+msgstr "SGI xfs"
+
+#: fdisk/fdisksgilabel.c:91
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:93
+msgid "SGI xvm"
+msgstr "SGI xvm"
+
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:52
+msgid "Linux swap"
+msgstr "Linux swap"
+
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:53
+msgid "Linux native"
+msgstr "Linux native"
+
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:63
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:97
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: fdisk/fdisksgilabel.c:163
+#, c-format
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"The MIPS Computer Systems, Inc thì Nhãn không được chứa nhiều hơn 512 byte\n"
+
+#: fdisk/fdisksgilabel.c:182
+#, c-format
+msgid "Detected sgi disklabel with wrong checksum.\n"
+msgstr "Tìm thấy nhãn đĩa sgi với tổng kiểm tra (checksum) sai.\n"
+
+#: fdisk/fdisksgilabel.c:200
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors\n"
+"%d cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Đĩa %s (nhãn đĩa SGI): %d đầu đọc, %d sector\n"
+"%d cylinder, %d cylinder vật lý\n"
+"%d sects dự phòng/cyl, xen kẽ %d:1\n"
+"%s\n"
+"Đơn vị = %s của %d * %d byte\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:213
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Đĩa %s (nhãn đĩa SGI): %d đầu đọc, %d sector, %d cylinder\n"
+"Đơn vị = %s của %d * %d byte\n"
+
+#: fdisk/fdisksgilabel.c:220
+#, c-format
+msgid ""
+"----- partitions -----\n"
+"Pt# %*s  Info     Start       End   Sectors  Id  System\n"
+msgstr ""
+"----- các phân vùng -----\n"
+"Pv# %*s  Thôngtin     Đầu       Cuối   Sectors  Id  Hệthống\n"
+
+#: fdisk/fdisksgilabel.c:242
+#, c-format
+msgid ""
+"----- Bootinfo -----\n"
+"Bootfile: %s\n"
+"----- Directory Entries -----\n"
+msgstr ""
+"----- Thông tin khởi động -----\n"
+"Tập tin khởi động: %s\n"
+"----- Thư mục -----\n"
+
+#: fdisk/fdisksgilabel.c:250
+#, c-format
+msgid "%2d: %-10s sector%5u size%8u\n"
+msgstr "%2d: %-10s sector%5u size%8u\n"
+
+#: fdisk/fdisksgilabel.c:304
+#, c-format
+msgid ""
+"\n"
+"Invalid Bootfile!\n"
+"\tThe bootfile must be an absolute non-zero pathname,\n"
+"\te.g. \"/unix\" or \"/unix.save\".\n"
+msgstr ""
+"\n"
+"Tập tin khởi động bị lỗi!\n"
+"\tTập tin khởi động phải là một tên đường dẫn không rỗng,\n"
+"\tv.d. \"/unix\" hay \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:310
+#, c-format
+msgid ""
+"\n"
+"\tName of Bootfile too long:  16 bytes maximum.\n"
+msgstr ""
+"\n"
+"\tTên của Tập tin khởi động quá dài:  max là 16 byte.\n"
+
+#: fdisk/fdisksgilabel.c:315
+#, c-format
+msgid ""
+"\n"
+"\tBootfile must have a fully qualified pathname.\n"
+msgstr ""
+"\n"
+"\tTập tin khởi động phải có đường dẫn đầy đủ.\n"
+
+#: fdisk/fdisksgilabel.c:322
+#, c-format
+msgid ""
+"\n"
+"\tBe aware, that the bootfile is not checked for existence.\n"
+"\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
+msgstr ""
+"\n"
+"\tCần biết rằng tập tin khởi động không được kiểm tra tồn tại.\n"
+"\tMặc định SGI là \"/unix\" và sao lưu là \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:348
+#, c-format
+msgid ""
+"\n"
+"\tBootfile is changed to \"%s\".\n"
+msgstr ""
+"\n"
+"\tTập tin khởi động được thay đổi thành \"%s\".\n"
+
+#: fdisk/fdisksgilabel.c:438
+#, c-format
+msgid "More than one entire disk entry present.\n"
+msgstr "Có nhiều hơn một mục đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:445 fdisk/fdisksunlabel.c:478
+#, c-format
+msgid "No partitions defined\n"
+msgstr "Không có phân vùng nào được định nghĩa\n"
+
+#: fdisk/fdisksgilabel.c:451
+#, c-format
+msgid "IRIX likes when Partition 11 covers the entire disk.\n"
+msgstr "IRIX \"thích\" Phân vùng 11 bao bọc cả một đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:453
+#, c-format
+msgid ""
+"The entire disk partition should start at block 0,\n"
+"not at diskblock %d.\n"
+msgstr ""
+"Phân vùng chứa cả một đĩa phải bắt đầu tại khối 0,\n"
+"chứ không phải tại khối %d.\n"
+
+#: fdisk/fdisksgilabel.c:459
+#, c-format
+msgid ""
+"The entire disk partition is only %d diskblock large,\n"
+"but the disk is %d diskblocks long.\n"
+msgstr ""
+"Phân vùng chứa cả một đĩa chỉ gồm %d khối,\n"
+"trong khi đĩa chứa %d khối.\n"
+
+#: fdisk/fdisksgilabel.c:465
+#, c-format
+msgid "One Partition (#11) should cover the entire disk.\n"
+msgstr "Một phân vùng (#11) cần chứa cả ổ đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:475
+#, c-format
+msgid "Partition %d does not start on cylinder boundary.\n"
+msgstr "Phân vùng %d không bắt đầu trên ranh giới cylinder.\n"
+
+#: fdisk/fdisksgilabel.c:481
+#, c-format
+msgid "Partition %d does not end on cylinder boundary.\n"
+msgstr "Phân vùng %d không kết thúc trên rang giới cylinder.\n"
+
+#: fdisk/fdisksgilabel.c:488
+#, c-format
+msgid "The Partition %d and %d overlap by %d sectors.\n"
+msgstr "Phân vùng %d và %d chèn lên nhau %d sector.\n"
+
+#: fdisk/fdisksgilabel.c:496 fdisk/fdisksgilabel.c:514
+#, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
+msgstr "Khoảng trống không sử dụng %8u sector - sector %8u-%u\n"
+
+#: fdisk/fdisksgilabel.c:525
+#, c-format
+msgid ""
+"\n"
+"The boot partition does not exist.\n"
+msgstr ""
+"\n"
+"Phân vùng khởi động không tồn tại.\n"
+
+#: fdisk/fdisksgilabel.c:528
+#, c-format
+msgid ""
+"\n"
+"The swap partition does not exist.\n"
+msgstr ""
+"\n"
+"Phân vùng swap không tồn tại.\n"
+
+#: fdisk/fdisksgilabel.c:532
+#, c-format
+msgid ""
+"\n"
+"The swap partition has no swap type.\n"
+msgstr ""
+"\n"
+"Phân vùng swap có hệ thống tập tin không phải swap.\n"
+
+#: fdisk/fdisksgilabel.c:535
+#, c-format
+msgid "\tYou have chosen an unusual boot file name.\n"
+msgstr "\tBạn đã chọn một tên tập tin khởi động lạ.\n"
+
+#: fdisk/fdisksgilabel.c:544
+#, c-format
+msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgstr "Xin lỗi có thể Bạn thay đổi Tag của phân vùng không rỗng.\n"
+
+#: fdisk/fdisksgilabel.c:550
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is of type \"SGI volhdr\", the IRIX system will rely on it to\n"
+"retrieve from its directory standalone tools like sash and fx.\n"
+"Only the \"SGI volume\" entire disk section may violate this.\n"
+"Type YES if you are sure about tagging this partition differently.\n"
+msgstr ""
+"Rất khuyên dùng là phân vùng tại offset 0 có loại là\n"
+"\"SGI volhdr\", hệ thống IRIX sẽ dựa trên đó để nhận từ đó thư\n"
+"mục các công cụ đơn lẻ như sash và fx. Chỉ có các \"bộ đĩa SGI\"\n"
+"chứa cả một đĩa mới nằm ngoại lệ. Gõ YES (đồng ý) nếu bạn chắc chắn muốn "
+"đặt\n"
+"tag cho phân vùng này khác đi.\n"
+
+#: fdisk/fdisksgilabel.c:555 fdisk/fdisksunlabel.c:632
+msgid "YES\n"
+msgstr "YES\n"
+
+#: fdisk/fdisksgilabel.c:579
+#, c-format
+msgid "Do You know, You got a partition overlap on the disk?\n"
+msgstr "Bạn Có biết, rằng bạn có một phân vùng đè lên nhau trên đĩa?\n"
+
+#: fdisk/fdisksgilabel.c:637
+#, c-format
+msgid "Attempting to generate entire disk entry automatically.\n"
+msgstr "Thử tự động phân vùng cả đĩa.\n"
+
+#: fdisk/fdisksgilabel.c:642
+#, c-format
+msgid "The entire disk is already covered with partitions.\n"
+msgstr "Ổ đĩa đã chứa các phân vùng.\n"
+
+#: fdisk/fdisksgilabel.c:646
+#, c-format
+msgid "You got a partition overlap on the disk. Fix it first!\n"
+msgstr "Bạn có một phân vùng đè lên nhau trên ổ đĩa. Hãy sửa trước!\n"
+
+#: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
+#, c-format
+msgid ""
+"It is highly recommended that eleventh partition\n"
+"covers the entire disk and is of type `SGI volume'\n"
+msgstr ""
+"Rất khuyên dùng khi phân vùng số mười một chứa\n"
+"cả ổ đĩa và có loại `SGI volume'\n"
+
+#: fdisk/fdisksgilabel.c:671
+#, c-format
+msgid "You will get a partition overlap on the disk. Fix it first!\n"
+msgstr "Bạn sẽ có một phân vùng đè lên nhau trên ổ đĩa. Hãy sửa trước!\n"
+
+#: fdisk/fdisksgilabel.c:676
+#, c-format
+msgid " Last %s"
+msgstr " %s cuối"
+
+#: fdisk/fdisksgilabel.c:706
+#, c-format
+msgid ""
+"Building a new SGI disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content will be unrecoverably lost.\n"
+"\n"
+msgstr ""
+"Xây dựng một nhãn đĩa SGI mới. Thay đổi sẽ chỉ ghi trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung cũ\n"
+"sẽ mất và không thể phục hồi.\n"
+
+#: fdisk/fdisksgilabel.c:728
+#, c-format
+msgid ""
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
+"This value may be truncated for devices > 33.8 GB.\n"
+msgstr ""
+"Cảnh báo: BLKGETSIZE ioctl lỗi trên %s. Sử dụng giá trị cấu trúc cylinder của"
+"%d.\n"
+
+#: fdisk/fdisksgilabel.c:741
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr "Đang cố giữ lại các tham số của phân vùng %d.\n"
+
+#: fdisk/fdisksgilabel.c:743
+#, c-format
+msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr "ID=%02x\tĐẦU=%d\tĐỘ DÀI=%d\n"
+
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
+msgid "Empty"
+msgstr "Rỗng"
+
+#: fdisk/fdisksunlabel.c:45
+msgid "SunOS root"
+msgstr "Gốc SunOS"
+
+#: fdisk/fdisksunlabel.c:46
+msgid "SunOS swap"
+msgstr "SunOS swap"
+
+#: fdisk/fdisksunlabel.c:47
+msgid "SunOS usr"
+msgstr "SunOS usr"
+
+#: fdisk/fdisksunlabel.c:48
+msgid "Whole disk"
+msgstr "Cả đĩa"
+
+#: fdisk/fdisksunlabel.c:49
+msgid "SunOS stand"
+msgstr "SunOS stand"
+
+#: fdisk/fdisksunlabel.c:50
+msgid "SunOS var"
+msgstr "SunOS var"
+
+#: fdisk/fdisksunlabel.c:51
+msgid "SunOS home"
+msgstr "SunOS home"
+
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:100
+msgid "Linux raid autodetect"
+msgstr "Tự động nhận ra Linux raid"
+
+#: fdisk/fdisksunlabel.c:132
+#, c-format
+msgid ""
+"Detected sun disklabel with wrong checksum.\n"
+"Probably you'll have to set all the values,\n"
+"e.g. heads, sectors, cylinders and partitions\n"
+"or force a fresh label (s command in main menu)\n"
+msgstr ""
+"Đã nhận ra nhãn đĩa sun với tổng kiểm tra checksum\n"
+"lỗi. Có thể bạn phải đặt lại tất cả các giá trị,\n"
+"v.d. đầu đọc, sector, cylinder và phân vùng hoặc\n"
+"bắt buộc một nhãn mới (câu lệnh s trong trình đơn chính)\n"
+
+#: fdisk/fdisksunlabel.c:231
+#, c-format
+msgid "Autoconfigure found a %s%s%s\n"
+msgstr "Trình tự động cấu hình tìm thấy một %s%s%s\n"
+
+#: fdisk/fdisksunlabel.c:258
+#, c-format
+msgid ""
+"Building a new sun disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Xây dựng một nhãn đĩa sun mới. Thay đổi sẽ chỉ ghi trong bộ nhớ,\n"
+"cho đến khi bạn quyết định ghi chúng. Sau đó, tất nhiên, nội dung cũ\n"
+"sẽ mất và không thể phục hồi.\n"
+
+#: fdisk/fdisksunlabel.c:269
+msgid ""
+"Drive type\n"
+"   ?   auto configure\n"
+"   0   custom (with hardware detected defaults)"
+msgstr ""
+"Loại ổ\n"
+"\t?\ttự động cấu hình\n"
+"\t0\tngười dùng chọn (với các mặc định xác định phần cứng)"
+
+#: fdisk/fdisksunlabel.c:279
+msgid "Select type (? for auto, 0 for custom): "
+msgstr "Chọn loại (? để tự động, 0 người dùng chọn): "
+
+#: fdisk/fdisksunlabel.c:291
+#, c-format
+msgid "Autoconfigure failed.\n"
+msgstr "Tự động cấu hình không thành công.\n"
+
+#: fdisk/fdisksunlabel.c:315
+msgid "Sectors/track"
+msgstr "Sector/track"
+
+#: fdisk/fdisksunlabel.c:322
+msgid "Alternate cylinders"
+msgstr "Cylinder xen kẽ"
+
+#: fdisk/fdisksunlabel.c:325
+msgid "Physical cylinders"
+msgstr "Cylinder vật lý"
+
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:728
+msgid "Rotation speed (rpm)"
+msgstr "Tốc độ quay (rpm)"
+
+#: fdisk/fdisksunlabel.c:330 fdisk/fdisksunlabel.c:721
+msgid "Interleave factor"
+msgstr "Hệ số xen kẽ"
+
+#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:714
+msgid "Extra sectors per cylinder"
+msgstr "Số sector dự phòng mỗi cylinder"
+
+#: fdisk/fdisksunlabel.c:347
+msgid "You may change all the disk params from the x menu"
+msgstr "Bạn có thể thay đổi tất cả các tham số đĩa từ trình đơn x"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "3,5\" floppy"
+msgstr "Đĩa mềm 3,5"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "Linux custom"
+msgstr "Linux tùy chỉnh"
+
+#: fdisk/fdisksunlabel.c:441
+#, c-format
+msgid "Partition %d doesn't end on cylinder boundary\n"
+msgstr "Phân vùng %d không kết thúc trên ranh giới cylinder\n"
+
+#: fdisk/fdisksunlabel.c:461
+#, c-format
+msgid "Partition %d overlaps with others in sectors %d-%d\n"
+msgstr "Phân vùng %d đè lên nhau với các phân vùng khác trên sector %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:483
+#, c-format
+msgid "Unused gap - sectors 0-%d\n"
+msgstr "Khoảng trống không sử dụng - sector 0-%d\n"
+
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#, c-format
+msgid "Unused gap - sectors %d-%d\n"
+msgstr "Khoảng trống không sử dụng - sector %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:512
+#, c-format
+msgid ""
+"Other partitions already cover the whole disk.\n"
+"Delete some/shrink them before retry.\n"
+msgstr ""
+"Các phân vùng khác đã chứa cả đĩa.\n"
+"Hãy xóa hay thu nhỏ chúng trước khi thử lại.\n"
+
+#: fdisk/fdisksunlabel.c:593
+#, c-format
+msgid ""
+"You haven't covered the whole disk with the 3rd partition, but your value\n"
+"%d %s covers some other partition. Your entry has been changed\n"
+"to %d %s\n"
+msgstr ""
+"Phân vùng thứ 3 không chứa cả ổ đĩa, nhưng các giá trị %d %s đè lên\n"
+"một số phân vùng khác. Các mục đã thay đổi thành %d %s\n"
+
+#: fdisk/fdisksunlabel.c:615
+#, c-format
+msgid ""
+"If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
+"partition as Whole disk (5), starting at 0, with %u sectors\n"
+msgstr ""
+"Nếu bạn muốn duy trì một đĩa tương thích với SunOS/Solaris, thì cần để phân\n"
+"vùng này là cả đĩa (5), bắt đầu từ 0, và với %u sectors\n"
+
+#: fdisk/fdisksunlabel.c:627
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
+"there may destroy your partition table and bootblock.\n"
+"Type YES if you're very sure you would like that partition\n"
+"tagged with 82 (Linux swap): "
+msgstr ""
+"Rất khuyên dùng phân vùng tại offset 0 có hệ thống tập tin\n"
+"UFS, EXT2FS hay swap SunOS. Nếu đặt thành swap của Linux thì\n"
+"có thể hủy bảng phân vùng của bạn và khối khởi động.\n"
+"Gõ CO (CÓ) nếu bạn chắc chắn muốn phân vùng được đặt thành\n"
+"82 (swap của Linux): "
+
+#: fdisk/fdisksunlabel.c:658
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
+"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Đĩa %s (nhãn đĩa Sun): %d đầu đọc, %d sector, %d rpm\n"
+"%d cylinder, %d cylinder xen kẽ, %d cylinder vật lý\n"
+"%d sector dự phòng/cyl, độ xen kẽ %d:1\n"
+"%s\n"
+"Đơn vị = %s của %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:672
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Đĩa %s (nhãn đĩa Sun): %d đầu đọc, %d sector, %d cylinder\n"
+"Đơn vị = %s của %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:677
+#, c-format
+msgid "%*s Flag    Start       End    Blocks   Id  System\n"
+msgstr "%*s Cờ    Đầu       Cuối    Khối   Id  Hệ thống\n"
+
+#: fdisk/fdisksunlabel.c:702
+msgid "Number of alternate cylinders"
+msgstr "Số cylinder xen kẽ"
+
+#: fdisk/fdisksunlabel.c:735
+msgid "Number of physical cylinders"
+msgstr "Số cylinder vật lý"
+
+#: fdisk/i386_sys_types.c:7
+msgid "FAT12"
+msgstr "FAT12"
+
+#: fdisk/i386_sys_types.c:8
+msgid "XENIX root"
+msgstr "XENIX root"
+
+#: fdisk/i386_sys_types.c:9
+msgid "XENIX usr"
+msgstr "XENIX usr"
+
+#: fdisk/i386_sys_types.c:10
+msgid "FAT16 <32M"
+msgstr "FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:11
+msgid "Extended"
+msgstr "Mở rộng"
+
+#: fdisk/i386_sys_types.c:12
+msgid "FAT16"
+msgstr "FAT16"
+
+#: fdisk/i386_sys_types.c:13
+msgid "HPFS/NTFS"
+msgstr "HPFS/NTFS"
+
+#: fdisk/i386_sys_types.c:14
+msgid "AIX"
+msgstr "AIX"
+
+#: fdisk/i386_sys_types.c:15
+msgid "AIX bootable"
+msgstr "ATX có thể khởi động"
+
+#: fdisk/i386_sys_types.c:16
+msgid "OS/2 Boot Manager"
+msgstr "OS/2 Quản lý khởi động"
+
+#: fdisk/i386_sys_types.c:17
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
+
+#: fdisk/i386_sys_types.c:18
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:19
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:20
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
+
+#: fdisk/i386_sys_types.c:21
+msgid "OPUS"
+msgstr "OPUS"
+
+#: fdisk/i386_sys_types.c:22
+msgid "Hidden FAT12"
+msgstr "FAT12 ẩn"
+
+#: fdisk/i386_sys_types.c:23
+msgid "Compaq diagnostics"
+msgstr "Chuẩn đoán Compaq"
+
+#: fdisk/i386_sys_types.c:24
+msgid "Hidden FAT16 <32M"
+msgstr "FAT16 ẩn <32M"
+
+#: fdisk/i386_sys_types.c:25
+msgid "Hidden FAT16"
+msgstr "FAT16 ẩn"
+
+#: fdisk/i386_sys_types.c:26
+msgid "Hidden HPFS/NTFS"
+msgstr "HPFS/NTFS ẩn"
+
+#: fdisk/i386_sys_types.c:27
+msgid "AST SmartSleep"
+msgstr "AST SmartSleep"
+
+#: fdisk/i386_sys_types.c:28
+msgid "Hidden W95 FAT32"
+msgstr "W95 FAT32 ẩn"
+
+#: fdisk/i386_sys_types.c:29
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "W95 FAT32 ẩn (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA) ẩn"
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr "NEC DOS"
+
+#: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
+msgid "PartitionMagic recovery"
+msgstr "Khôi phục PartitionMagic"
+
+#: fdisk/i386_sys_types.c:34
+msgid "Venix 80286"
+msgstr "Venix 80286"
+
+#: fdisk/i386_sys_types.c:35
+msgid "PPC PReP Boot"
+msgstr "Khởi động PPC PReP"
+
+#: fdisk/i386_sys_types.c:36
+msgid "SFS"
+msgstr "SFS"
+
+#: fdisk/i386_sys_types.c:37
+msgid "QNX4.x"
+msgstr "QNX4.x"
+
+#: fdisk/i386_sys_types.c:38
+msgid "QNX4.x 2nd part"
+msgstr "QNX4.x phần 2"
+
+#: fdisk/i386_sys_types.c:39
+msgid "QNX4.x 3rd part"
+msgstr "QNX4.x phần 3"
+
+#: fdisk/i386_sys_types.c:40
+msgid "OnTrack DM"
+msgstr "OnTrack DM"
+
+#: fdisk/i386_sys_types.c:41
+msgid "OnTrack DM6 Aux1"
+msgstr "OnTrack DM6 Aux1"
+
+#: fdisk/i386_sys_types.c:42
+msgid "CP/M"
+msgstr "CP/M"
+
+#: fdisk/i386_sys_types.c:43
+msgid "OnTrack DM6 Aux3"
+msgstr "OnTrack DM6 Aux3"
+
+#: fdisk/i386_sys_types.c:44
+msgid "OnTrackDM6"
+msgstr "OnTrackDM6"
+
+#: fdisk/i386_sys_types.c:45
+msgid "EZ-Drive"
+msgstr "EZ-Drive"
+
+#: fdisk/i386_sys_types.c:46
+msgid "Golden Bow"
+msgstr "Golden Bow"
+
+#: fdisk/i386_sys_types.c:47
+msgid "Priam Edisk"
+msgstr "Priam Edisk"
+
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:91
+#: fdisk/i386_sys_types.c:97 fdisk/i386_sys_types.c:98
+msgid "SpeedStor"
+msgstr "SpeedStor"
+
+#: fdisk/i386_sys_types.c:49
+msgid "GNU HURD or SysV"
+msgstr "GNU HURD hay SysV"
+
+#: fdisk/i386_sys_types.c:50
+msgid "Novell Netware 286"
+msgstr "Novell Netware 286"
+
+#: fdisk/i386_sys_types.c:51
+msgid "Novell Netware 386"
+msgstr "Novell Netware 386"
+
+#: fdisk/i386_sys_types.c:52
+msgid "DiskSecure Multi-Boot"
+msgstr "Bảomậtđĩa Đa-khởi-động"
+
+#: fdisk/i386_sys_types.c:53
+msgid "PC/IX"
+msgstr "PC/IX"
+
+#: fdisk/i386_sys_types.c:54
+msgid "Old Minix"
+msgstr "Minix cũ"
+
+#: fdisk/i386_sys_types.c:55
+msgid "Minix / old Linux"
+msgstr "Minux / Linux cũ"
+
+#: fdisk/i386_sys_types.c:56
+msgid "Linux swap / Solaris"
+msgstr "Linux swap / Solaris"
+
+#: fdisk/i386_sys_types.c:58
+msgid "OS/2 hidden C: drive"
+msgstr "OS/2 ổ đĩa C: ẩn"
+
+#: fdisk/i386_sys_types.c:59
+msgid "Linux extended"
+msgstr "Mở rộng Linux"
+
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
+msgid "NTFS volume set"
+msgstr "Bộ khối (volume) NTFS"
+
+#: fdisk/i386_sys_types.c:62
+msgid "Linux plaintext"
+msgstr "Văn bản đơn giản Linux"
+
+#: fdisk/i386_sys_types.c:64
+msgid "Amoeba"
+msgstr "Amoeba"
+
+#: fdisk/i386_sys_types.c:65
+msgid "Amoeba BBT"
+msgstr "Amoeba BBT"
+
+#: fdisk/i386_sys_types.c:66
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#: fdisk/i386_sys_types.c:67
+msgid "IBM Thinkpad hibernation"
+msgstr "Hibernation của IBM Thinkpad"
+
+#: fdisk/i386_sys_types.c:68
+msgid "FreeBSD"
+msgstr "FreeBSD"
+
+#: fdisk/i386_sys_types.c:69
+msgid "OpenBSD"
+msgstr "OpenBSD"
+
+#: fdisk/i386_sys_types.c:70
+msgid "NeXTSTEP"
+msgstr "NeXTSTEP"
+
+#: fdisk/i386_sys_types.c:71
+msgid "Darwin UFS"
+msgstr "Darwin UFS"
+
+#: fdisk/i386_sys_types.c:72
+msgid "NetBSD"
+msgstr "NetBSD"
+
+#: fdisk/i386_sys_types.c:73
+msgid "Darwin boot"
+msgstr "Khởi động Darwin"
+
+#: fdisk/i386_sys_types.c:74
+msgid "BSDI fs"
+msgstr "BSDI fs"
+
+#: fdisk/i386_sys_types.c:75
+msgid "BSDI swap"
+msgstr "BSDI swap"
+
+#: fdisk/i386_sys_types.c:76
+msgid "Boot Wizard hidden"
+msgstr "Thuật sĩ khởi động ẩn"
+
+#: fdisk/i386_sys_types.c:77
+msgid "Solaris boot"
+msgstr "Khởi động Solaris"
+
+#: fdisk/i386_sys_types.c:78
+msgid "Solaris"
+msgstr "Solaris"
+
+#: fdisk/i386_sys_types.c:79
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DRDOS/sec (FAT-12)"
+
+#: fdisk/i386_sys_types.c:80
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr "DRDOS/sec (FAT-16 < 32M)"
+
+#: fdisk/i386_sys_types.c:81
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DRDOS/sec (FAT-16)"
+
+#: fdisk/i386_sys_types.c:82
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:83
+msgid "Non-FS data"
+msgstr "Dữ liệu không phải FS"
+
+#: fdisk/i386_sys_types.c:84
+msgid "CP/M / CTOS / ..."
+msgstr "CP/M / CTOS / ..."
+
+#: fdisk/i386_sys_types.c:86
+msgid "Dell Utility"
+msgstr "Công cụ Dell"
+
+#: fdisk/i386_sys_types.c:87
+msgid "BootIt"
+msgstr "BootIt (khởi động nó)"
+
+#: fdisk/i386_sys_types.c:88
+msgid "DOS access"
+msgstr "Truy cập DOS"
+
+#: fdisk/i386_sys_types.c:90
+msgid "DOS R/O"
+msgstr "DOS R/O (chỉ đọc)"
+
+#: fdisk/i386_sys_types.c:93
+msgid "BeOS fs"
+msgstr "Hệ thống tập tin BeOS"
+
+#: fdisk/i386_sys_types.c:94
+msgid "EFI GPT"
+msgstr "EFI GPT"
+
+#: fdisk/i386_sys_types.c:95
+msgid "EFI (FAT-12/16/32)"
+msgstr "EFI (FAT-12/16/32)"
+
+#: fdisk/i386_sys_types.c:96
+msgid "Linux/PA-RISC boot"
+msgstr "Khởi động Linux/PA-RISC"
+
+#: fdisk/i386_sys_types.c:99
+msgid "DOS secondary"
+msgstr "DOS phụ"
+
+#: fdisk/i386_sys_types.c:103
+msgid "LANstep"
+msgstr "LANstep (bước LAN)"
+
+#: fdisk/i386_sys_types.c:104
+msgid "BBT"
+msgstr "BBT"
+
+#: fdisk/sfdisk.c:195
+#, c-format
+msgid "seek error on %s - cannot seek to %lu\n"
+msgstr "lỗi tìm kiếm trên %s - không thể tìm tới %lu\n"
+
+#: fdisk/sfdisk.c:200
+#, c-format
+msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
+msgstr "lỗi tìm kiếm: cần 0x%08x%08x, nhận được 0x%08x%08x\n"
+
+#: fdisk/sfdisk.c:246
+msgid "out of memory - giving up\n"
+msgstr "tràn bộ nhớ - không thể tiếp tục\n"
+
+#: fdisk/sfdisk.c:251 fdisk/sfdisk.c:334
+#, c-format
+msgid "read error on %s - cannot read sector %lu\n"
+msgstr "lỗi đọc trên %s - không thể đọc sector %lu\n"
+
+#: fdisk/sfdisk.c:269
+#, c-format
+msgid "ERROR: sector %lu does not have an msdos signature\n"
+msgstr "LỖI: sector %lu không có dấu hiệu của msdos\n"
+
+#: fdisk/sfdisk.c:284
+#, c-format
+msgid "write error on %s - cannot write sector %lu\n"
+msgstr "lỗi ghi trên %s - không thể ghi sector %lu\n"
+
+#: fdisk/sfdisk.c:322
+#, c-format
+msgid "cannot open partition sector save file (%s)\n"
+msgstr "không thể mở phân vùng sector ghi tập tin (%s)\n"
+
+#: fdisk/sfdisk.c:340
+#, c-format
+msgid "write error on %s\n"
+msgstr "lỗi ghi trên %s\n"
+
+#: fdisk/sfdisk.c:358
+#, c-format
+msgid "cannot stat partition restore file (%s)\n"
+msgstr "không thể xác định tập tin phục hồi phân vùng (%s)\n"
+
+#: fdisk/sfdisk.c:363
+msgid "partition restore file has wrong size - not restoring\n"
+msgstr "tập tin phục hồi phân vùng có kích thước sai - không phục hồi\n"
+
+#: fdisk/sfdisk.c:367
+msgid "out of memory?\n"
+msgstr "tràn bộ nhớ?\n"
+
+#: fdisk/sfdisk.c:373
+#, c-format
+msgid "cannot open partition restore file (%s)\n"
+msgstr "không thể mở tập tin phục hồi phân vùng (%s)\n"
+
+#: fdisk/sfdisk.c:379
+#, c-format
+msgid "error reading %s\n"
+msgstr "lỗi đọc %s\n"
+
+#: fdisk/sfdisk.c:386
+#, c-format
+msgid "cannot open device %s for writing\n"
+msgstr "không thể mở thiết bị %s để ghi\n"
+
+#: fdisk/sfdisk.c:398
+#, c-format
+msgid "error writing sector %lu on %s\n"
+msgstr "lỗi ghi sector %lu trên %s\n"
+
+#: fdisk/sfdisk.c:451
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Đĩa %s: không thể lấy cấu trúc\n"
+
+#: fdisk/sfdisk.c:468
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Đĩa %s: không thể lấy kích thước\n"
+
+#: fdisk/sfdisk.c:501
+#, c-format
+msgid ""
+"Warning: start=%lu - this looks like a partition rather than\n"
+"the entire disk. Using fdisk on it is probably meaningless.\n"
+"[Use the --force option if you really want this]\n"
+msgstr ""
+"Cảnh báo: đầu=%lu - giống một phân vùng hơn là cả một đĩa.\n"
+"Sử dụng fdisk có thể không có ý nghĩa gì.\n"
+"[Sử dụng tùy chọn --force nếu bạn thực sự muốn]\n"
+
+#: fdisk/sfdisk.c:508
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr "Cảnh báo: HDIO_GETGEO nói có %lu đầu đọc\n"
+
+#: fdisk/sfdisk.c:511
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr "Cảnh báo: HDIO_GETGEO nói có %lu sector\n"
+
+#: fdisk/sfdisk.c:515
+#, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr "Cảnh báo: BLKGETSIZE/HDIO_GETGEO nói có %lu cylinder\n"
+
+#: fdisk/sfdisk.c:520
+#, c-format
+msgid ""
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
+"This will give problems with all software that uses C/H/S addressing.\n"
+msgstr ""
+"Cảnh báo: không giống số sector (%lu) - thường là 63\n"
+"Sẽ nảy sinh vấn đề với tất cả phần mềm sử dụng việc đánh địa chỉ C/H/S.\n"
+
+#: fdisk/sfdisk.c:524
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr ""
+"\n"
+"Đĩa %s: %lu cylinder, %lu đầu đọc, %lu sector/track\n"
+
+#: fdisk/sfdisk.c:606
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:611
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số sector không thể có: %lu (phải trong khoảng 1-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:616
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s của phân vùng %s có số cylinder không thể có: %lu (phải trong khoảng 1-%"
+"lu)\n"
+
+#: fdisk/sfdisk.c:656
+#, c-format
+msgid ""
+"Id  Name\n"
+"\n"
+msgstr ""
+"Tên Id\n"
+"\n"
+
+#: fdisk/sfdisk.c:812
+#, c-format
+msgid "Re-reading the partition table ...\n"
+msgstr "Đang đọc lại bảng phân vùng ...\n"
+
+#: fdisk/sfdisk.c:818
+msgid ""
+"The command to re-read the partition table failed\n"
+"Reboot your system now, before using mkfs\n"
+msgstr ""
+"Lỗi chạy lệnh đọc lại bảng phân vùng\n"
+"Khởi động lại hệ thống ngay bây giờ trước khi sử dụng mkfs\n"
+
+#: fdisk/sfdisk.c:823
+#, c-format
+msgid "Error closing %s\n"
+msgstr "Lỗi đóng %s\n"
+
+#: fdisk/sfdisk.c:861
+#, c-format
+msgid "%s: no such partition\n"
+msgstr "%s: không có phân vùng như vậy\n"
+
+#: fdisk/sfdisk.c:884
+msgid "unrecognized format - using sectors\n"
+msgstr "định dạng không nhận ra - sử dụng sector\n"
+
+#: fdisk/sfdisk.c:923
+#, c-format
+msgid "# partition table of %s\n"
+msgstr "# bảng phân vùng của %s\n"
+
+#: fdisk/sfdisk.c:934
+#, c-format
+msgid "unimplemented format - using %s\n"
+msgstr "định dạng chưa hỗ trợ - sử dụng %s\n"
+
+#: fdisk/sfdisk.c:938
+#, c-format
+msgid ""
+"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Đơn vị = cylinder %lu byte, khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:941
+#, c-format
+msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động Đầu     Cuối   #cyl    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:946
+#, c-format
+msgid ""
+"Units = sectors of 512 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Đơn vị = sector 512 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:948
+#, c-format
+msgid "   Device Boot    Start       End   #sectors  Id  System\n"
+msgstr "   Thiết bị Khởi động Đầu     Cuối   #sector  Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:951
+#, c-format
+msgid ""
+"Units = blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Đơn vị = khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:953
+#, c-format
+msgid "   Device Boot   Start       End    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động Đầu     Cuối    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:956
+#, c-format
+msgid ""
+"Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Đơn vị = mebibyte 1048576 byte, khối 1024 byte, đếm từ %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:958
+#, c-format
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "   Thiết bị Khởi động Đầu     MiB    #Khối   Id  Hệ thống\n"
+
+#: fdisk/sfdisk.c:1118
+#, c-format
+msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tđầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1125
+#, c-format
+msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tcuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1128
+#, c-format
+msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "phân vùng kết thúc trên cylinder %ld, vượt quá điểm cuối của đĩa\n"
+
+#: fdisk/sfdisk.c:1138
+msgid "No partitions found\n"
+msgstr "Không tìm thấy phân vùng nào\n"
+
+#: fdisk/sfdisk.c:1142
+#, c-format
+msgid ""
+"Warning: The partition table looks like it was made\n"
+"  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
+"For this listing I'll assume that geometry.\n"
+msgstr ""
+"Cảnh báo: Bảng phân vùng có vẻ như được tạo ra\n"
+"với C/H/S=*/%ld/%ld (thay vì %ld/%ld/%ld).\n"
+"Tôi sẽ thừa nhận cấu trúc đó cho danh sách này.\n"
+
+#: fdisk/sfdisk.c:1191
+msgid "no partition table present.\n"
+msgstr "không có bảng phân vùng nào.\n"
+
+#: fdisk/sfdisk.c:1193
+#, c-format
+msgid "strange, only %d partitions defined.\n"
+msgstr "kỳ lạ, chỉ có %d phân vùng xác định.\n"
+
+#: fdisk/sfdisk.c:1202
+#, c-format
+msgid "Warning: partition %s has size 0 but is not marked Empty\n"
+msgstr ""
+"Cảnh báo: phân vùng %s có kích thước 0 nhưng không được đánh dấu rỗng\n"
+
+#: fdisk/sfdisk.c:1205
+#, c-format
+msgid "Warning: partition %s has size 0 and is bootable\n"
+msgstr "Cảnh báo: phân vùng %s có kích thước 0 và có thể khởi động\n"
+
+#: fdisk/sfdisk.c:1208
+#, c-format
+msgid "Warning: partition %s has size 0 and nonzero start\n"
+msgstr "Cảnh báo: phân vùng %s có kích thước 0 và điểm đầu khác 0\n"
+
+#: fdisk/sfdisk.c:1219
+#, c-format
+msgid "Warning: partition %s "
+msgstr "Cảnh báo: phân vùng %s "
+
+#: fdisk/sfdisk.c:1220
+#, c-format
+msgid "is not contained in partition %s\n"
+msgstr "không chứa trong phân vùng %s\n"
+
+#: fdisk/sfdisk.c:1231
+#, c-format
+msgid "Warning: partitions %s "
+msgstr "Cảnh báo: các phân vùng %s "
+
+#: fdisk/sfdisk.c:1232
+#, c-format
+msgid "and %s overlap\n"
+msgstr "và %s đè lên nhau\n"
+
+#: fdisk/sfdisk.c:1243
+#, c-format
+msgid ""
+"Warning: partition %s contains part of the partition table (sector %lu),\n"
+"and will destroy it when filled\n"
+msgstr ""
+"Cảnh báo: phân vùng %s chứa một phần của bảng phân vùng (sector %lu),\n"
+"và sẽ hủy nó khi đầy\n"
+
+#: fdisk/sfdisk.c:1255
+#, c-format
+msgid "Warning: partition %s starts at sector 0\n"
+msgstr "Cảnh báo: phân vùng %s bắt đầu tại sector 0\n"
+
+#: fdisk/sfdisk.c:1259
+#, c-format
+msgid "Warning: partition %s extends past end of disk\n"
+msgstr "Cảnh báo: phân vùng %s kéo dài quá điểm cuối đĩa\n"
+
+#: fdisk/sfdisk.c:1274
+msgid ""
+"Among the primary partitions, at most one can be extended\n"
+" (although this is not a problem under Linux)\n"
+msgstr ""
+"Trong số các phân vùng chính, nhiều nhất chỉ có một là mở rộng\n"
+" (mặc dù đây không phải là vấn đề dưới Linux)\n"
+
+#: fdisk/sfdisk.c:1292
+#, c-format
+msgid "Warning: partition %s does not start at a cylinder boundary\n"
+msgstr "Cảnh báo: phân vùng %s không bắt đầu trên ranh giới cylinder\n"
+
+#: fdisk/sfdisk.c:1298
+#, c-format
+msgid "Warning: partition %s does not end at a cylinder boundary\n"
+msgstr "Cảnh báo: phân vùng %s không kết thúc trên ranh giới cylinder\n"
+
+#: fdisk/sfdisk.c:1316
+msgid ""
+"Warning: more than one primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Cảnh báo: có nhiều hơn một phân vùng chính được đánh dấu có thể khởi\n"
+"động. Đây không phải là vấn đề đối với LILO, nhưng MBR của DOS sẽ không\n"
+"khởi động đĩa này.\n"
+
+#: fdisk/sfdisk.c:1323
+msgid ""
+"Warning: usually one can boot from primary partitions only\n"
+"LILO disregards the `bootable' flag.\n"
+msgstr ""
+"Cảnh báo: thông thường người dùng chỉ có thể khởi động từ phân vùng\n"
+"chính. LILO không quan tâm đến cờ `có thể khởi động'.\n"
+
+#: fdisk/sfdisk.c:1329
+msgid ""
+"Warning: no primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Cảnh báo: không có phân vùng chính nào được đánh dấu có thể khởi\n"
+"động. Đây không phải là vấn đề đối với LILO, nhưng MBR của DOS sẽ không\n"
+"khởi động đĩa này.\n"
+
+#: fdisk/sfdisk.c:1343
+msgid "start"
+msgstr "đầu"
+
+#: fdisk/sfdisk.c:1346
+#, c-format
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1352
+msgid "end"
+msgstr "cuối"
+
+#: fdisk/sfdisk.c:1355
+#, c-format
+msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1358
+#, c-format
+msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "phân vùng %s kết thúc trên cylinder %ld, vượt quá điểm cuối của đĩa\n"
+
+#: fdisk/sfdisk.c:1383
+#, c-format
+msgid ""
+"Warning: shifted start of the extd partition from %ld to %ld\n"
+"(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+"Cảnh báo: dịch chuyển đầu của phân vùng mởi rộng từ %ld tới %ld\n"
+" (Chỉ với mục đích liệt kê. Không thay đổi nội dung.)\n"
+
+#: fdisk/sfdisk.c:1389
+msgid ""
+"Warning: extended partition does not start at a cylinder boundary.\n"
+"DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+"Cảnh báo: phân vùng mở rộng không bắt đầu trên ranh giới cylinder.\n"
+"DOS và Linux sẽ biên dịch nội dung khác nhau.\n"
+
+#: fdisk/sfdisk.c:1407 fdisk/sfdisk.c:1484
+#, c-format
+msgid "too many partitions - ignoring those past nr (%d)\n"
+msgstr "quá nhiều phân vùng - bỏ qua những phân vùng sau nr (%d)\n"
+
+#: fdisk/sfdisk.c:1422
+msgid "tree of partitions?\n"
+msgstr "cây phân vùng?\n"
+
+#: fdisk/sfdisk.c:1543
+msgid "detected Disk Manager - unable to handle that\n"
+msgstr "tìm thấy Trình Quản Lý Đĩa - không thể điều khiển nó\n"
+
+#: fdisk/sfdisk.c:1550
+msgid "DM6 signature found - giving up\n"
+msgstr "Không tìm thấy dấu hiệu DM6 - dừng lại\n"
+
+#: fdisk/sfdisk.c:1570
+msgid "strange..., an extended partition of size 0?\n"
+msgstr "kỳ lạ..., một phân vùng mở rộng với kích thước 0?\n"
+
+#: fdisk/sfdisk.c:1577 fdisk/sfdisk.c:1588
+msgid "strange..., a BSD partition of size 0?\n"
+msgstr "kỳ lại..., một phân vùng BSD với kích thước 0?\n"
+
+#: fdisk/sfdisk.c:1622
+#, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr " %s: loại bảng phân vùng không nhận ra\n"
+
+#: fdisk/sfdisk.c:1634
+msgid "-n flag was given: Nothing changed\n"
+msgstr "đã đưa ra cờ -n: Không có gì thay đổi\n"
+
+#: fdisk/sfdisk.c:1650
+msgid "Failed saving the old sectors - aborting\n"
+msgstr "Lỗi ghi sector cũ - đang dừng lại\n"
+
+#: fdisk/sfdisk.c:1655
+#, c-format
+msgid "Failed writing the partition on %s\n"
+msgstr "Lỗi ghi phân vùng trên %s\n"
+
+#: fdisk/sfdisk.c:1732
+msgid "long or incomplete input line - quitting\n"
+msgstr "dòng nhập vào dài hay không đầy đủ - đang thoát\n"
+
+#: fdisk/sfdisk.c:1768
+#, c-format
+msgid "input error: `=' expected after %s field\n"
+msgstr "lỗi nhập: mong đợi `=' sau vùng %s\n"
+
+#: fdisk/sfdisk.c:1775
+#, c-format
+msgid "input error: unexpected character %c after %s field\n"
+msgstr "lỗi nhập: mong đợi ký tự %c sau vùng %s\n"
+
+#: fdisk/sfdisk.c:1781
+#, c-format
+msgid "unrecognized input: %s\n"
+msgstr "dữ liệu vào không nhận ra: %s\n"
+
+#: fdisk/sfdisk.c:1823
+msgid "number too big\n"
+msgstr "số quá lớn\n"
+
+#: fdisk/sfdisk.c:1827
+msgid "trailing junk after number\n"
+msgstr "đuôi bỏ đi sau một số\n"
+
+#: fdisk/sfdisk.c:1950
+msgid "no room for partition descriptor\n"
+msgstr "không có chỗ cho mô tả phân vùng\n"
+
+#: fdisk/sfdisk.c:1983
+msgid "cannot build surrounding extended partition\n"
+msgstr "không thể tạo phân vùng mở rộng bao quanh\n"
+
+#: fdisk/sfdisk.c:2034
+msgid "too many input fields\n"
+msgstr "quá nhiều vùng nhập vào\n"
+
+#: fdisk/sfdisk.c:2068
+msgid "No room for more\n"
+msgstr "Không còn chỗ trống\n"
+
+#: fdisk/sfdisk.c:2087
+msgid "Illegal type\n"
+msgstr "Loại không cho phép\n"
+
+#: fdisk/sfdisk.c:2119
+#, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr ""
+"Cảnh báo: kích thước đưa ra (%lu) vượt quá kích thước max cho phép (%lu)\n"
+
+#: fdisk/sfdisk.c:2125
+msgid "Warning: empty partition\n"
+msgstr "Cảnh báo: phân vùng rỗng\n"
+
+#: fdisk/sfdisk.c:2139
+#, c-format
+msgid "Warning: bad partition start (earliest %lu)\n"
+msgstr "Cảnh báo: điểm đầu phân vùng xấu (trước %lu)\n"
+
+#: fdisk/sfdisk.c:2152
+msgid "unrecognized bootable flag - choose - or *\n"
+msgstr "cờ có thể khởi động không nhận ra - chọn - hay *\n"
+
+#: fdisk/sfdisk.c:2169 fdisk/sfdisk.c:2182
+msgid "partial c,h,s specification?\n"
+msgstr "Đặc điểm phân vùng c,h,s?\n"
+
+#: fdisk/sfdisk.c:2193
+msgid "Extended partition not where expected\n"
+msgstr "Phân vùng mở rộng không ở chỗ mong đợi\n"
+
+#: fdisk/sfdisk.c:2225
+msgid "bad input\n"
+msgstr "dữ liệu vào xấu\n"
+
+#: fdisk/sfdisk.c:2247
+msgid "too many partitions\n"
+msgstr "quá nhiều phân vùng\n"
+
+#: fdisk/sfdisk.c:2280
+msgid ""
+"Input in the following format; absent fields get a default value.\n"
+"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
+"Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
+msgstr ""
+"Dữ liệu vào trong định dạng sau; dùng giá trị mặc định cho chỗ thiếu\n"
+"<đầu> <kíchthước> <loại [E,S,L,X,hex]> <khởiđộng [-,*]> <c,h,s> <c,h,s>\n"
+"Thông thường bạn chỉ cần chỉ rõ <đầu> và <kíchthước> (và có thể <loại>).\n"
+
+#: fdisk/sfdisk.c:2306
+#, c-format
+msgid "Usage: %s [options] device ...\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+
+#: fdisk/sfdisk.c:2307
+msgid "device: something like /dev/hda or /dev/sda"
+msgstr "thiết bị: có dạng /dev/hda hay /dev/sda"
+
+#: fdisk/sfdisk.c:2308
+msgid "useful options:"
+msgstr "tùy chọn có ích:"
+
+#: fdisk/sfdisk.c:2309
+msgid "    -s [or --show-size]: list size of a partition"
+msgstr "    -s [hay --show-size]: liệt kê kích thước phân vùng"
+
+#: fdisk/sfdisk.c:2310
+msgid "    -c [or --id]:        print or change partition Id"
+msgstr "    -c [hay --id]:        in ra hay thay đổi Id phân vùng"
+
+#: fdisk/sfdisk.c:2311
+msgid "    -l [or --list]:      list partitions of each device"
+msgstr "    -l [hay --list]:      liệt kê phân vùng của mỗi thiết bị"
+
+#: fdisk/sfdisk.c:2312
+msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
+msgstr ""
+"    -d [hay --dump]:      cũng như trên nhưng ở dạng có thể dùng cho nhập vào"
+
+#: fdisk/sfdisk.c:2313
+msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
+msgstr "    -i [hay --increment]: số cylinders v.v... từ 1 thay vì từ 0"
+
+#: fdisk/sfdisk.c:2314
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:  chấp nhận/báo cáo với đơn vị sector/khối/cylinder/MB"
+
+#: fdisk/sfdisk.c:2315
+msgid "    -T [or --list-types]:list the known partition types"
+msgstr "    -T [hay --list-types]:liệt kê các loại phân vùng đã biết"
+
+#: fdisk/sfdisk.c:2316
+msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
+msgstr ""
+"    -D [hay --DOS]:       để tương thích với DOS: lãng phí một chút khoảng "
+"trống"
+
+#: fdisk/sfdisk.c:2317
+msgid "    -R [or --re-read]:   make kernel reread partition table"
+msgstr "    -R [hay --re-read]:   khiến nhân đọc lại bảng phân vùng"
+
+#: fdisk/sfdisk.c:2318
+msgid "    -N# :                change only the partition with number #"
+msgstr "    -N# :                chỉ thay đổi phân vùng với số #"
+
+#: fdisk/sfdisk.c:2319
+msgid "    -n :                 do not actually write to disk"
+msgstr "    -n :                 không thực sự viết lên đĩa"
+
+#: fdisk/sfdisk.c:2320
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr "    -O tập tin :            ghi các sector sẽ bị ghi chèn vào tập tin"
+
+#: fdisk/sfdisk.c:2321
+msgid "    -I file :            restore these sectors again"
+msgstr "    -I tập tin :            phục hồi lại những sector này"
+
+#: fdisk/sfdisk.c:2322
+msgid "    -v [or --version]:   print version"
+msgstr "    -v [hay --version]:   in ra số phiên bản"
+
+#: fdisk/sfdisk.c:2323
+msgid "    -? [or --help]:      print this message"
+msgstr "    -? [hay --help]:      in trợ giúp này"
+
+#: fdisk/sfdisk.c:2324
+msgid "dangerous options:"
+msgstr "tùy chọn nguy hiểm:"
+
+#: fdisk/sfdisk.c:2325
+msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
+msgstr ""
+"    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
+
+#: fdisk/sfdisk.c:2326
+msgid ""
+"    -G [or --show-pt-geometry]: print geometry guessed from the partition "
+"table"
+msgstr ""
+"    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
+
+#: fdisk/sfdisk.c:2327
+msgid ""
+"    -x [or --show-extended]: also list extended partitions on output\n"
+"                             or expect descriptors for them on input"
+msgstr ""
+"    -x [hay --show-extended]: đồng thời liệt kê các phân vùng mở rộng\n"
+"                             trong đầu ra hay các mô tả mong đợi cho chúng\n"
+"                             trong đầu vào"
+
+#: fdisk/sfdisk.c:2329
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr ""
+"    -L  [hay --Linux]:     không than phiền về những gì không thích hợp với "
+"Linux"
+
+#: fdisk/sfdisk.c:2330
+msgid "    -q  [or --quiet]:      suppress warning messages"
+msgstr "    -q  [hay --quiet]:      bỏ các cảnh báo"
+
+#: fdisk/sfdisk.c:2331
+msgid "    You can override the detected geometry using:"
+msgstr "    Bạn có thể viết đè lên cấu trúc nhận ra sử dụng:"
+
+#: fdisk/sfdisk.c:2332
+msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
+msgstr "    -C# [hay --cylinders #]:đặt số cylinder sử dụng"
+
+#: fdisk/sfdisk.c:2333
+msgid "    -H# [or --heads #]:    set the number of heads to use"
+msgstr "    -H# [or --heads #]:    đặt số đầu đọc sử dụng"
+
+#: fdisk/sfdisk.c:2334
+msgid "    -S# [or --sectors #]:  set the number of sectors to use"
+msgstr "    -S# [or --sectors #]:  đặt số sector sử dụng"
+
+#: fdisk/sfdisk.c:2335
+msgid "You can disable all consistency checking with:"
+msgstr "Bạn có thể tắt tất cả các kiểm tra cố định với:"
+
+#: fdisk/sfdisk.c:2336
+msgid "    -f  [or --force]:      do what I say, even if it is stupid"
+msgstr "    -f  [hay --force]:      làm bất theo lời bạn, thậm chí là ngu ngốc"
+
+#: fdisk/sfdisk.c:2342
+msgid "Usage:"
+msgstr "Sử dụng:"
+
+#: fdisk/sfdisk.c:2343
+#, c-format
+msgid "%s device\t\t list active partitions on device\n"
+msgstr "%s thiết bị\t\t liệt kê phân vùng kích hoạt trên thiết bị\n"
+
+#: fdisk/sfdisk.c:2344
+#, c-format
+msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
+msgstr ""
+"%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
+
+#: fdisk/sfdisk.c:2345
+#, c-format
+msgid "%s -An device\t activate partition n, inactivate the other ones\n"
+msgstr "%s -An thiết bị\t kích hoạt phân vùng n, bỏ kích hoạt những cái khác\n"
+
+#: fdisk/sfdisk.c:2512
+msgid "no command?\n"
+msgstr "không lệnh?\n"
+
+#: fdisk/sfdisk.c:2635
+#, c-format
+msgid "total: %llu blocks\n"
+msgstr "tổng sô: %llu khối\n"
+
+#: fdisk/sfdisk.c:2674
+msgid "usage: sfdisk --print-id device partition-number\n"
+msgstr "sử dụng: sfdisk --print-id thiết-bị số-phân-vùng\n"
+
+#: fdisk/sfdisk.c:2676
+msgid "usage: sfdisk --change-id device partition-number Id\n"
+msgstr "sử dụng: sfdisk --change-id thiết-bị số-phân-vùng Id\n"
+
+#: fdisk/sfdisk.c:2678
+msgid "usage: sfdisk --id device partition-number [Id]\n"
+msgstr "sử dụng: sfdisk --id thiết-bị số-phân-vùng [Id]\n"
+
+#: fdisk/sfdisk.c:2685
+msgid "can specify only one device (except with -l or -s)\n"
+msgstr "chỉ có thể chỉ ra một thiết bị (ngoại trừ với -l hay -s)\n"
+
+#: fdisk/sfdisk.c:2711
+#, c-format
+msgid "cannot open %s read-write\n"
+msgstr "không thể mở %s đọc-viết\n"
+
+#: fdisk/sfdisk.c:2713
+#, c-format
+msgid "cannot open %s for reading\n"
+msgstr "không mở được %s để đọc\n"
+
+#: fdisk/sfdisk.c:2738
+#, c-format
+msgid "%s: OK\n"
+msgstr "%s: OK\n"
+
+#: fdisk/sfdisk.c:2755 fdisk/sfdisk.c:2786
+#, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: %ld cylinder, %ld đầu đọc, %ld sector/trac\n"
+
+#: fdisk/sfdisk.c:2803
+#, c-format
+msgid "Cannot get size of %s\n"
+msgstr "Không thể lấy kích thước của %s\n"
+
+#: fdisk/sfdisk.c:2881
+#, c-format
+msgid "bad active byte: 0x%x instead of 0x80\n"
+msgstr "byte kích hoạt xấu: 0x%x thay vì 0x80\n"
+
+#: fdisk/sfdisk.c:2899 fdisk/sfdisk.c:2952 fdisk/sfdisk.c:2983
+msgid ""
+"Done\n"
+"\n"
+msgstr ""
+"Hoàn thành\n"
+"\n"
+
+#: fdisk/sfdisk.c:2908
+#, c-format
+msgid ""
+"You have %d active primary partitions. This does not matter for LILO,\n"
+"but the DOS MBR will only boot a disk with 1 active partition.\n"
+msgstr ""
+"Bạn có %d phân vùng chính kích hoạt. Đây không phải là vấn đề cho LILO,\n"
+"nhưng MBR của DOS sẽ chỉ khởi động một đĩa với 1 phân vùng kích hoạt.\n"
+
+#: fdisk/sfdisk.c:2922
+#, c-format
+msgid "partition %s has id %x and is not hidden\n"
+msgstr "phân vùng %s có id %x và không phải là ẩn\n"
+
+#: fdisk/sfdisk.c:2979
+#, c-format
+msgid "Bad Id %lx\n"
+msgstr "Id xấu %lx\n"
+
+#: fdisk/sfdisk.c:2994
+msgid "This disk is currently in use.\n"
+msgstr "Đĩa này hiện đang được sử dụng.\n"
+
+#: fdisk/sfdisk.c:3011
+#, c-format
+msgid "Fatal error: cannot find %s\n"
+msgstr "Lỗi nặng: không thể tìm %s\n"
+
+#: fdisk/sfdisk.c:3014
+#, c-format
+msgid "Warning: %s is not a block device\n"
+msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
+
+#: fdisk/sfdisk.c:3020
+msgid "Checking that no-one is using this disk right now ...\n"
+msgstr "Đang kiểm tra xem có ai đó đang sử dụng đĩa này không...\n"
+
+#: fdisk/sfdisk.c:3022
+msgid ""
+"\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
+msgstr ""
+"\n"
+"Đĩa này hiện thời đang được sử dụng - phân vùng lại không phải là ý muốn\n"
+"tốt. Bỏ gắn tất cả các hệ thống tập tin, và tắt các phân vùng swap trên\n"
+"đĩa này. Sử dụng --no-reread để bỏ kiểm tra này.\n"
+
+#: fdisk/sfdisk.c:3026
+msgid "Use the --force flag to overrule all checks.\n"
+msgstr "Sử dụng --force để bãi bỏ mọi kiểm tra.\n"
+
+#: fdisk/sfdisk.c:3030
+msgid "OK\n"
+msgstr "OK\n"
+
+#: fdisk/sfdisk.c:3039
+#, c-format
+msgid "Old situation:\n"
+msgstr "Tình huống cũ:\n"
+
+#: fdisk/sfdisk.c:3043
+#, c-format
+msgid "Partition %d does not exist, cannot change it\n"
+msgstr "Phân vùng %d không tồn tại, không thể thay đổi nó\n"
+
+#: fdisk/sfdisk.c:3051
+#, c-format
+msgid "New situation:\n"
+msgstr "Tình huống mới:\n"
+
+#: fdisk/sfdisk.c:3056
+msgid ""
+"I don't like these partitions - nothing changed.\n"
+"(If you really want this, use the --force option.)\n"
+msgstr ""
+"Tôi không thích những phân vùng này - không có gì thay đổi.\n"
+"(Nếu bạn thực sự muốn điều này, sử dụng tùy chọn --force.)\n"
+
+#: fdisk/sfdisk.c:3059
+msgid "I don't like this - probably you should answer No\n"
+msgstr "Tôi không thích điều này - bạn nên trả lời No\n"
+
+#: fdisk/sfdisk.c:3064
+#, c-format
+msgid "Are you satisfied with this? [ynq] "
+msgstr "Bạn có hài lòng với điều này? [ynq] "
+
+#: fdisk/sfdisk.c:3066
+#, c-format
+msgid "Do you want to write this to disk? [ynq] "
+msgstr "Bạn có muốn ghi lên đĩa? [ynq] "
+
+#: fdisk/sfdisk.c:3071
+#, c-format
+msgid ""
+"\n"
+"sfdisk: premature end of input\n"
+msgstr ""
+"\n"
+"sfdisk: dữ liệu vào kết thúc sớm\n"
+
+#: fdisk/sfdisk.c:3073
+msgid "Quitting - nothing changed\n"
+msgstr "Đang thoát - không có gì thay đổi\n"
+
+#: fdisk/sfdisk.c:3079
+#, c-format
+msgid "Please answer one of y,n,q\n"
+msgstr "Xin hãy trả lời một trng y,n,q\n"
+
+#: fdisk/sfdisk.c:3087
+#, c-format
+msgid ""
+"Successfully wrote the new partition table\n"
+"\n"
+msgstr ""
+"Viết thành công bảng phân vùng mới\n"
+"\n"
+
+#: fdisk/sfdisk.c:3093
+msgid ""
+"If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
+"to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(See fdisk(8).)\n"
+msgstr ""
+"Nếu bạn tạo hay thay đổi một phân vùng DOS, ví dụ /dev/foo7, thì hãy dùng\n"
+"dd(1) để làm rỗng 512 byte đầu: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(Xem fdisk(8).)\n"
+
+#: getopt/getopt.c:233
+msgid "Try `getopt --help' for more information.\n"
+msgstr "Hãy thử `getopt --help' để biết thêm thông tin.\n"
+
+#: getopt/getopt.c:299
+msgid "empty long option after -l or --long argument"
+msgstr "tùy chọn dài rỗng sau -l hay tham số --long"
+
+#: getopt/getopt.c:319
+msgid "unknown shell after -s or --shell argument"
+msgstr "shell không rõ sau -s hay tham số --shell"
+
+#: getopt/getopt.c:324
+msgid "Usage: getopt optstring parameters\n"
+msgstr "Sử dụng: getopt optstring thamsố\n"
+
+#: getopt/getopt.c:325
+msgid "       getopt [options] [--] optstring parameters\n"
+msgstr "       getopt [tùychọn] [--] optstring thamsố\n"
+
+#: getopt/getopt.c:326
+msgid "       getopt [options] -o|--options optstring [options] [--]\n"
+msgstr "       getopt [tùychọn] -o|--options optstring [tùychọn] [--]\n"
+
+#: getopt/getopt.c:327
+msgid "              parameters\n"
+msgstr "              tham số\n"
+
+#: getopt/getopt.c:328
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
+
+#: getopt/getopt.c:329
+msgid "  -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Hướng dẫn sử dụng nhỏ này\n"
+
+#: getopt/getopt.c:330
+msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
+msgstr "  -l, --longoptions=tùychọndài   Tùy chọn dài cần nhận ra\n"
+
+#: getopt/getopt.c:331
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=tênchươngtrình          Báo cáo lỗi dưới tên chương trình\n"
+
+#: getopt/getopt.c:332
+msgid "  -o, --options=optstring      Short options to be recognized\n"
+msgstr "  -o, --options=optstring      Tùy chọn ngắn cần nhận ra\n"
+
+#: getopt/getopt.c:333
+msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Tắt bỏ báo cáo lỗi bằng getopt(3)\n"
+
+#: getopt/getopt.c:334
+msgid "  -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Không có kết quả ra thông thường\n"
+
+#: getopt/getopt.c:335
+msgid "  -s, --shell=shell            Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            Đặt quy ước trích dẫn shell\n"
+
+#: getopt/getopt.c:336
+msgid "  -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Thử phiên bản getopt(1)\n"
+
+#: getopt/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 Không trích dẫn kết quả ra\n"
+
+#: getopt/getopt.c:338
+msgid "  -V, --version                Output version information\n"
+msgstr "  -V, --version                In ra thông tin phiên bản\n"
+
+#: getopt/getopt.c:395 getopt/getopt.c:456
+msgid "missing optstring argument"
+msgstr "thiếu tham số optstring"
+
+#: getopt/getopt.c:444
+#, c-format
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (đã nâng cao) 1.1.3\n"
+
+#: getopt/getopt.c:450
+msgid "internal error, contact the author."
+msgstr "lỗi nội bộ, hãy liên hệ với tác giả."
+
+#: hwclock/cmos.c:176
+#, c-format
+msgid "booted from MILO\n"
+msgstr "khởi động từ MILO\n"
+
+#: hwclock/cmos.c:185
+#, c-format
+msgid "Ruffian BCD clock\n"
+msgstr "Đồng hồ Ruffian BCD\n"
+
+#: hwclock/cmos.c:201
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "clockport (cổng đồng hồ) điều chỉnh thành 0x%x\n"
+
+#: hwclock/cmos.c:213
+#, c-format
+msgid "funky TOY!\n"
+msgstr "ĐỒ CHƠI nhút nhát!\n"
+
+#: hwclock/cmos.c:267
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: %s nguyên tử lỗi sau1000 vòng quay!"
+
+#: hwclock/cmos.c:591
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Không mở được /dev/port: %s"
+
+#: hwclock/cmos.c:598
+#, c-format
+msgid "I failed to get permission because I didn't try.\n"
+msgstr "Tôi lấy thông tin quyền hạn không thành công vì đã không cố thử.\n"
+
+#: hwclock/cmos.c:601
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr ""
+"không thể dùng %s để lấy truy cập cổng I/O:  gọi iopl(3) không thành công.\n"
+
+#: hwclock/cmos.c:604
+#, c-format
+msgid "Probably you need root privileges.\n"
+msgstr "Rất có thể bạn cần quyền người dùng root.\n"
+
+#: hwclock/hwclock.c:223
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr "Coi như đồng hồ phần cứng được giữ tại %s.\n"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
+msgid "UTC"
+msgstr "UTC"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
+msgid "local"
+msgstr "nội bộ"
+
+#: hwclock/hwclock.c:303
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr ""
+"%s: Cảnh báo: không nhận ra dòng thứ ba trong tập tin điều chỉnh thời gian\n"
+
+#: hwclock/hwclock.c:305
+#, c-format
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Mong đợi: `UTC' hay `LOCAL' hay không gì cả.)\n"
+
+#: hwclock/hwclock.c:312
+#, c-format
+msgid "Last drift adjustment done at %ld seconds after 1969\n"
+msgstr "Điều chỉnh độ lệch lần cuối tại %ld giây sau 1969\n"
+
+#: hwclock/hwclock.c:314
+#, c-format
+msgid "Last calibration done at %ld seconds after 1969\n"
+msgstr "Sự định khuôn cuối cùng thực hiện lần cuối tại %ld giây sau 1969\n"
+
+#: hwclock/hwclock.c:316
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "Đồng hồ phần cứng là trên %s\n"
+
+#: hwclock/hwclock.c:318
+msgid "unknown"
+msgstr "không rõ"
+
+#: hwclock/hwclock.c:342
+#, c-format
+msgid "Waiting for clock tick...\n"
+msgstr "Chờ tiếng tíc tắc của đồng hồ...\n"
+
+#: hwclock/hwclock.c:346
+#, c-format
+msgid "...got clock tick\n"
+msgstr "...đã nghe thấy tiếng tíc tắc\n"
+
+#: hwclock/hwclock.c:399
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Giá trị không đúng trong đồng hồ phần cứng: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+
+#: hwclock/hwclock.c:407
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Thời gian đồng hồ phần cứng : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld giây kể từ "
+"1969\n"
+
+#: hwclock/hwclock.c:435
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Thời gian đọc từ Đồng hồ Phần cứng: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: hwclock/hwclock.c:462
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "Đặt Đồng hồ Phần cứng thành %.2d:%.2d:%.2d = %ld giây kể từ 1969\n"
+
+#: hwclock/hwclock.c:468
+#, c-format
+msgid "Clock not changed - testing only.\n"
+msgstr "Đồng hồ không thay đổi - chỉ thử nghiệm mà thôi.\n"
+
+#: hwclock/hwclock.c:516
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+"Thời gian trôi qua kể từ khi chỉnh thời gian là %.6f giây.\n"
+"Trì hoãn thêm để đi tới giây đầy đủ tiếp theo.\n"
+
+#: hwclock/hwclock.c:545
+#, c-format
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"Đồng hồ Phần cứng chứa các giá trị hoặc không đúng (v.d. ngày thứ 50 của "
+"tháng) hoặc vượt quá phạm vi chúng ta có thể điều khiển (v.d. Năm 2095).\n"
+
+#: hwclock/hwclock.c:555
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f giây\n"
+
+#: hwclock/hwclock.c:589
+#, c-format
+msgid "No --date option specified.\n"
+msgstr "Không chỉ ra tùy chọn --date.\n"
+
+#: hwclock/hwclock.c:595
+#, c-format
+msgid "--date argument too long\n"
+msgstr "Tham số --date quá dài\n"
+
+#: hwclock/hwclock.c:602
+#, c-format
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+"Giá trị của tùy chọn --date không phải là một ngày thích hợp.\n"
+"Trong trường hợp này, nó chứa các dấu trích dẫn.\n"
+
+#: hwclock/hwclock.c:610
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "Đưa ra câu lệnh date (ngày tháng): %s\n"
+
+#: hwclock/hwclock.c:614
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr "Không chạy được chương trình 'date' trong shell /bin/sh. popen()"
+
+#: hwclock/hwclock.c:622
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "trả lời không thành công từ câu lệnh date = %s\n"
+
+#: hwclock/hwclock.c:624
+#, c-format
+msgid ""
+"The date command issued by %s returned unexpected results.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+"  %s\n"
+msgstr ""
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không mong đợi.\n"
+"Câu lệnh là:\n"
+"  %s\n"
+"Kết quả là:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:636
+#, c-format
+msgid ""
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+"Câu lệnh date (ngày tháng) đưa ra bởi %s trả lại kết quả không phải là một "
+"số nguyên, trong khi mong đợi giá trị thời gian đã chuyển đổi.\n"
+"Câu lệnh là:\n"
+"  %s\n"
+"Kết quả là:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:647
+#, c-format
+msgid "date string %s equates to %ld seconds since 1969.\n"
+msgstr "chuỗi ngày tháng %s bằng %ld giây kể từ 1969.\n"
+
+#: hwclock/hwclock.c:679
+#, c-format
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"Đồng hồ Phần cứng không chứa thời gian thích hợp, vì thế chúng ta không thể "
+"đặt Thời gian của Hệ thống từ đó.\n"
+
+#: hwclock/hwclock.c:701
+#, c-format
+msgid "Calling settimeofday:\n"
+msgstr "Đang gọi settimeofday:\n"
+
+#: hwclock/hwclock.c:702
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: hwclock/hwclock.c:704
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: hwclock/hwclock.c:707
+#, c-format
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+"Không thiết lập đồng hồ hệ thống bở vì đang chạy trong chế độ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:716
+#, c-format
+msgid "Must be superuser to set system clock.\n"
+msgstr "Cần phải là người dùng root để đặt đồng hồ hệ thống.\n"
+
+#: hwclock/hwclock.c:719
+msgid "settimeofday() failed"
+msgstr "settimeofday() không thành công"
+
+#: hwclock/hwclock.c:749
+#, c-format
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr "Không chỉnh độ lệnh thời gian vì Đồng hồ phần cứng chứa rác.\n"
+
+#: hwclock/hwclock.c:754
+#, c-format
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Không chỉnh độ lệnh thời gian vì lần định thời gian cuối cùng bằng 0,\n"
+"vì thế lịch sử xấu, và cần khởi động lại việc định thời gian.\n"
+
+#: hwclock/hwclock.c:760
+#, c-format
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Không chỉnh độ lệnh thời gian vì nó nhỏ hơn một ngày kể từ lần định thời "
+"gian cuối cùng.\n"
+
+#: hwclock/hwclock.c:808
+#, c-format
+msgid ""
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
+"Adjusting drift factor by %f seconds/day\n"
+msgstr ""
+"Đồng hồ chạy sai lệch %.1f giây trong số %d giây đã qua, và đi ngược lạiđộ "
+"sai lệch %f giây/ngày.\n"
+"Chỉnh lại độ sai lệch %f giây/ngày\n"
+
+#: hwclock/hwclock.c:859
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "Thời gian kể từ lần chỉnh cuối cùng là %d giây\n"
+
+#: hwclock/hwclock.c:861
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr "Cần thêm %d giây và chuyển thời gian ngược lại %.6f giây\n"
+
+#: hwclock/hwclock.c:890
+#, c-format
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "Không cập nhật thời gian chỉnh vì chế độ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:891
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Ghi nhớ cái sau tới %s:\n"
+"%s"
+
+#: hwclock/hwclock.c:915
+#, c-format
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Không cập nhật các tham số chỉnh sai lệch.\n"
+
+#: hwclock/hwclock.c:956
+#, c-format
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"Đồng hồ Phần cứng không có thời gian thích hợp, vì thế chúng ta không thể "
+"chỉnh.\n"
+
+#: hwclock/hwclock.c:988
+#, c-format
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "Cần chỉnh ít hơn một giây, vì thế không đặt đồng hồ.\n"
+
+#: hwclock/hwclock.c:1014
+#, c-format
+msgid "Using %s.\n"
+msgstr "Sử dụng %s.\n"
+
+#: hwclock/hwclock.c:1016
+#, c-format
+msgid "No usable clock interface found.\n"
+msgstr "Không tìm thấy giao diện đồng hồ có thể sử dụng nào.\n"
+
+#: hwclock/hwclock.c:1112
+#, c-format
+msgid "Unable to set system clock.\n"
+msgstr "Không đặt được đồng hồ hệ thống.\n"
+
+#: hwclock/hwclock.c:1142
+#, c-format
+msgid ""
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
+"This copy of hwclock was built for a machine other than Alpha\n"
+"(and thus is presumably not running on an Alpha now).  No action taken.\n"
+msgstr ""
+"Nhân chỉ giữ giá trị khởi đầu cho Đồng hồ Phần cứng trên một máy Alpha.\n"
+"Bản sao này của hwclock được biên dịch cho một máy khác Alpha\n"
+"(và vì thế đoán rằng không chạy trên một máy Alpha).  Không thực hiện gì.\n"
+
+#: hwclock/hwclock.c:1151
+#, c-format
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "Không lấy được giá trị khởi đầu từ nhân.\n"
+
+#: hwclock/hwclock.c:1153
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "Nhân đang giữ giá trị khởi đầu là %lu\n"
+
+#: hwclock/hwclock.c:1156
+#, c-format
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"Để đặt giá trị khởi đầu, bạn cần sử dụng tùy chọn 'epoch' để thông báo giá "
+"trị muốn đặt.\n"
+
+#: hwclock/hwclock.c:1159
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Không đặt khởi đầu thành %d - chỉ thử nghiệm.\n"
+
+#: hwclock/hwclock.c:1162
+#, c-format
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Không đặt được giá trị khởi đầu trong nhân.\n"
+
+#: hwclock/hwclock.c:1175
+#, fuzzy, c-format
+msgid "%s from util-linux-%s\n"
+msgstr "%s từ %s\n"
+
+#: hwclock/hwclock.c:1196
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+"  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
+"                either --utc or --localtime\n"
+msgstr ""
+"hwclock - hỏi giờ và đặt đồng hồ phần cứng (theo RTC)\n"
+"\n"
+"Sử dụng: hwclock [hàm số] [các tùy chọn...]\n"
+"\n"
+"Hàm số:\n"
+"  --help        hiển thị trợ giúp này\n"
+"  --show        đọc thời gian rồi in ra kết quả\n"
+"  --set         đặt rtc tới thời gian đưa ra với --date\n"
+"  --hctosys     đặt thời gian hệ thống từ đồng hồ phần cứng\n"
+"  --systohc     đặt thời gian hệ thống hiện thời vào cho đồng hồ phần cứng\n"
+"  --adjust      chỉnh rtc để tính độ sai lệch có hệ thống kể từ\n"
+"                lần đặt hay chỉnh đồng hồ cuối cùng\n"
+"  --getepoch    in ra giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
+"  --setepoch    đặt giá trị khởi đầu (trong nhân) của đồng hồ phần cứng\n"
+"                thành giá trị đưa bằng --epoch\n"
+"  --version     in ra phiên bản của hwclock tới stdout (màn hình)\n"
+"\n"
+"Các tùy chọn: \n"
+"  --utc         đồng hồ phần cứng chỉ thời gian utc (đối với kinh tuyến 0)\n"
+"  --localtime   đồng hồ phần cứng chỉ thời gian nội bộ\n"
+"  --directisa   truy cập thằng tới ISA thay vì %s\n"
+"  --badyear     lờ đi các năm rtc bởi vì bios bị hỏng\n"
+"  --date        chỉ ra thời gian để đặt cho đồng hồ phần cứng\n"
+"  --epoch=year  chỉ ra năm đầu tiên của giá trị thời gian khởi đầu\n"
+"                đồng hồ phần cứng\n"
+"  --noadjfile   không truy cập /etc/adjtime. Cần sử dụng\n"
+"                hoặc --utc hoặc --localtime\n"
+
+#: hwclock/hwclock.c:1223
+#, c-format
+msgid ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                tell hwclock the type of alpha you have (see hwclock(8))\n"
+msgstr ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                thông báo cho hwclock loại alpha bạn có (hãy xem hwclock"
+"(8))\n"
+
+#: hwclock/hwclock.c:1397
+#, c-format
+msgid "%s takes no non-option arguments.  You supplied %d.\n"
+msgstr "%s lấy các tham số không tùy chọn.  Bạn đã cung cấp %d.\n"
+
+#: hwclock/hwclock.c:1403
+#, c-format
+msgid ""
+"You have specified multiple functions.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Bạn phải chỉ ra nhiều hàm.\n"
+"Bạn chỉ có thể thực hiện một hàm mỗi lần.\n"
+
+#: hwclock/hwclock.c:1410
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: Các tùy chọn --utc và --localtime loại trừ lẫn nhau.  Bạn lại đưa ra cả "
+"hai.\n"
+
+#: hwclock/hwclock.c:1417
+#, c-format
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: Các tùy chọn --adjust và --noadjust loại trừ lẫn nhau.  Bạn lại đưara cả "
+"hai.\n"
+
+#: hwclock/hwclock.c:1424
+#, c-format
+msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
+msgstr "%s: Với --noadjfile, bạn phải chỉ ra --utc hoặc --localtime\n"
+
+#: hwclock/hwclock.c:1438
+#, c-format
+msgid "No usable set-to time.  Cannot set clock.\n"
+msgstr "Không có thời gian set-to nào có thể sử dụng.  Không thể đặt đồng hồ\n"
+
+#: hwclock/hwclock.c:1454
+#, c-format
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
+
+#: hwclock/hwclock.c:1459
+#, c-format
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
+
+#: hwclock/hwclock.c:1464
+#, c-format
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ "
+"Phần cứng trong nhân.\n"
+
+#: hwclock/hwclock.c:1484
+#, c-format
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+"Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
+
+#: hwclock/hwclock.c:1488
+#, c-format
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Sử dụng tùy chọn --debug để xem chi tiết về quá trình tìm kiếm phương pháp "
+"truy cập của chúng ta.\n"
+
+#: hwclock/kd.c:55
+#, c-format
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "Đang chờ thời gian từ KDGHWCLK thay đổi\n"
+
+#: hwclock/kd.c:58
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "KDGHWCLK ioctl đọc thời gian không thành công"
+
+#: hwclock/kd.c:79 hwclock/rtc.c:188
+#, c-format
+msgid "Timed out waiting for time change.\n"
+msgstr "Quá thời gian chờ thay đổi.\n"
+
+#: hwclock/kd.c:83
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "KDGHWCLK ioctl đọc thời gian không thành công trong vòng tròn (loop)"
+
+#: hwclock/kd.c:105
+#, c-format
+msgid "ioctl() failed to read time from %s"
+msgstr "ioctl() đọc thời gian không thàh công từ %s"
+
+#: hwclock/kd.c:141
+msgid "ioctl KDSHWCLK failed"
+msgstr "ioctl KDSHWCLK không thành công"
+
+#: hwclock/kd.c:177
+msgid "Can't open /dev/tty1 or /dev/vc/1"
+msgstr "Không thể mở /dev/tty1 hay /dev/vc/1"
+
+#: hwclock/kd.c:181
+msgid "KDGHWCLK ioctl failed"
+msgstr "KDGHWCLK ioctl không thành công"
+
+#: hwclock/rtc.c:116 hwclock/rtc.c:209
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() cho %s không thành công"
+
+#: hwclock/rtc.c:150
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() tới %s để đọc thời gian không thành công.\n"
+
+#: hwclock/rtc.c:172
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Chờ cho thời gian từ %s thay đổi\n"
+
+#: hwclock/rtc.c:227
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s không có hàm gián đoạn (interrupt) nào. "
+
+#: hwclock/rtc.c:238
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "read() tới %s để chờ tiếng tíc tắc không thành công"
+
+#: hwclock/rtc.c:256
+#, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "select() tới %s để chờ tiếng tíc tắc không thành công"
+
+#: hwclock/rtc.c:259
+#, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "select() tới %s để chờ tiếng tíc tắc bị quá thời gian\n"
+
+#: hwclock/rtc.c:268
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "ioctl() tới %s để tắt việc gián đoạn cập nhật không thành công"
+
+#: hwclock/rtc.c:271
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "ioctl() tới %s để bật việc gián đoạn cập nhật không thành công"
+
+#: hwclock/rtc.c:330
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "ioctl() tới %s để đặt thời gian không thành công.\n"
+
+#: hwclock/rtc.c:336
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "ioctl(%s) đã thành công.\n"
+
+#: hwclock/rtc.c:365
+#, c-format
+msgid "Open of %s failed"
+msgstr "Mở %s không thành công"
+
+#: hwclock/rtc.c:383 hwclock/rtc.c:429
+#, c-format
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"Để điều khiển giá trị khởi đầu (epoch) trong nhân, chúng ta cần truy cập tới "
+"driver thiết bị 'rtc' qua tập tin thiết bị đặc biệt %s.  Tập tin này không "
+"tồn tại trên hệ thống.\n"
+
+#: hwclock/rtc.c:388 hwclock/rtc.c:434
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không mở được %s"
+
+#: hwclock/rtc.c:395
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) tới %s không thành công"
+
+#: hwclock/rtc.c:401
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "chúng ta đọc khởi đầu (epoch) %ld từ %s bằng RTC_EPOCH_READ ioctl.\n"
+
+#: hwclock/rtc.c:421
+#, c-format
+msgid "The epoch value may not be less than 1900.  You requested %ld\n"
+msgstr ""
+"Giá trị khởi đầu (epoch) không được nhỏ hơn 1900.  Bạn đã yêu cầu %ld\n"
+
+#: hwclock/rtc.c:439
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr ""
+"thiết lập khởi đầu (epoch) thành %ld bằng RTC_EPOCH_SET ioctl tới %s.\n"
+
+#: hwclock/rtc.c:444
+#, c-format
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "Driver thiết bị của nhân cho %s không có RTC_EPOCH_SET ioctl.\n"
+
+#: hwclock/rtc.c:447
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) tới %s không thành công"
+
+#: login-utils/agetty.c:312
+msgid "calling open_tty\n"
+msgstr "đang gọi open_tty\n"
+
+#: login-utils/agetty.c:325
+msgid "calling termio_init\n"
+msgstr "đang gọi termio_init\n"
+
+#: login-utils/agetty.c:330
+msgid "writing init string\n"
+msgstr "đang ghi chuỗi khởi đầu (init)\n"
+
+#: login-utils/agetty.c:340
+msgid "before autobaud\n"
+msgstr "trước autobaud\n"
+
+#: login-utils/agetty.c:352
+msgid "waiting for cr-lf\n"
+msgstr "chờ cr-lf\n"
+
+#: login-utils/agetty.c:356
+#, c-format
+msgid "read %c\n"
+msgstr "đọc %c\n"
+
+#: login-utils/agetty.c:365
+msgid "reading login name\n"
+msgstr "đọc tên đăng nhập\n"
+
+#: login-utils/agetty.c:386
+#, c-format
+msgid "%s: can't exec %s: %m"
+msgstr "%s: không exec (thực hiện) được %s: %m"
+
+#: login-utils/agetty.c:406
+msgid "can't malloc initstring"
+msgstr "không mailloc được chuỗi khởi đầu (init)"
+
+#: login-utils/agetty.c:471
+#, c-format
+msgid "bad timeout value: %s"
+msgstr "giá trị thời gian chờ xấu: %s"
+
+#: login-utils/agetty.c:480
+msgid "after getopt loop\n"
+msgstr "sau khi getopt vòng lặp\n"
+
+#: login-utils/agetty.c:530
+msgid "exiting parseargs\n"
+msgstr "đang thoát parseargs (phân tích tham số)\n"
+
+#: login-utils/agetty.c:542
+msgid "entered parse_speeds\n"
+msgstr "đang nhập parse_speeds (tốc độ phân tích)\n"
+
+#: login-utils/agetty.c:545
+#, c-format
+msgid "bad speed: %s"
+msgstr "tốc độ xấu: %s"
+
+#: login-utils/agetty.c:547
+msgid "too many alternate speeds"
+msgstr "quá nhiều tốc độ luân phiên"
+
+#: login-utils/agetty.c:549
+msgid "exiting parsespeeds\n"
+msgstr "đang thoát parseargs (phân tích tham số)\n"
+
+#: login-utils/agetty.c:649
+#, c-format
+msgid "/dev: chdir() failed: %m"
+msgstr "/dev: chdir() không thành công: %m"
+
+#: login-utils/agetty.c:653
+#, c-format
+msgid "/dev/%s: not a character device"
+msgstr "/dev/%s: không phải thiết bị ký tự (character)"
+
+#: login-utils/agetty.c:660
+msgid "open(2)\n"
+msgstr "open(2) (mở)\n"
+
+#: login-utils/agetty.c:662
+#, c-format
+msgid "/dev/%s: cannot open as standard input: %m"
+msgstr "không mở được /dev/%s như một đầu vào tiêu chuẩn (stdin): %m"
+
+#: login-utils/agetty.c:672
+#, c-format
+msgid "%s: not open for read/write"
+msgstr "%s: không mở được đọc/viết"
+
+#: login-utils/agetty.c:676
+msgid "duping\n"
+msgstr "đang dup (nhân đôi)\n"
+
+#: login-utils/agetty.c:678
+#, c-format
+msgid "%s: dup problem: %m"
+msgstr "%s: vấn đề khi dup: %m"
+
+#: login-utils/agetty.c:752
+msgid "term_io 2\n"
+msgstr "term_io 2\n"
+
+#: login-utils/agetty.c:937
+#, c-format
+msgid "user"
+msgstr "người dùng"
+
+#: login-utils/agetty.c:937
+#, c-format
+msgid "users"
+msgstr "người dùng"
+
+#: login-utils/agetty.c:1025
+#, c-format
+msgid "%s: read: %m"
+msgstr "%s: đọc: %m"
+
+#: login-utils/agetty.c:1071
+#, c-format
+msgid "%s: input overrun"
+msgstr "%s: thừa dữ liệu vào"
+
+#: login-utils/agetty.c:1195
+#, c-format
+msgid ""
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
+msgstr ""
+"Sử dụng: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"hoặc\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] line baud_rate,... [termtype]\n"
+
+#: login-utils/checktty.c:84 login-utils/checktty.c:105
+#, c-format
+msgid "login: memory low, login may fail\n"
+msgstr "login: ít bộ nhớ, có thể không đăng nhập thành công\n"
+
+#: login-utils/checktty.c:85
+msgid "can't malloc for ttyclass"
+msgstr "không malloc được cho ttyclass (lớp tty)"
+
+#: login-utils/checktty.c:106
+msgid "can't malloc for grplist"
+msgstr "không malloc được cho grplist"
+
+#: login-utils/checktty.c:396
+#, c-format
+msgid "Login on %s from %s denied by default.\n"
+msgstr "Đăng nhập trên %s từ %s bị cấm theo mặc định.\n"
+
+#: login-utils/checktty.c:407
+#, c-format
+msgid "Login on %s from %s denied.\n"
+msgstr "Đăng nhập trên %s từ %s bị cấm.\n"
+
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
+#, c-format
+msgid "%s: you (user %d) don't exist.\n"
+msgstr "%s: bạn (người dùng %d) không tồn tại.\n"
+
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
+#, c-format
+msgid "%s: user \"%s\" does not exist.\n"
+msgstr "%s: người dùng \"%s\" không tồn tại.\n"
+
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
+#, c-format
+msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr "%s: chỉ thay đổi được các phần tử nội bộ, hãy dùng yp%s để thay thế.\n"
+
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr "Không rõ ngữ cảnh người dùng"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr "%s: %s chưa được xác thực để thay đổi thông tin finger của %s\n"
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr "%s: Không đặt được văn cảnh cho /etc/passwd"
+
+#: login-utils/chfn.c:173
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr "Thay đổi thông tin finger cho %s.\n"
+
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
+msgid "Password error."
+msgstr "Lỗi mật khẩu."
+
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:711
+#: login-utils/newgrp.c:49 login-utils/simpleinit.c:340 mount/lomount.c:297
+#: mount/lomount.c:300
+msgid "Password: "
+msgstr "Mật khẩu: "
+
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
+msgid "Incorrect password."
+msgstr "Mật khẩu không đúng."
+
+#: login-utils/chfn.c:217
+#, c-format
+msgid "Finger information not changed.\n"
+msgstr "Thông tin finger chưa thay đổi.\n"
+
+#: login-utils/chfn.c:319
+#, c-format
+msgid "Usage: %s [ -f full-name ] [ -o office ] "
+msgstr "Sử dụng: %s [ -f tên-đầy-đủ ] [ -o văn-phòng ] "
+
+#: login-utils/chfn.c:320
+#, c-format
+msgid ""
+"[ -p office-phone ]\n"
+"\t[ -h home-phone ] "
+msgstr ""
+"[ -p số-điện-thoại-văn-phòng ]\n"
+"\t[ -h số-điện-thoại-nhà ] "
+
+#: login-utils/chfn.c:321
+#, c-format
+msgid "[ --help ] [ --version ]\n"
+msgstr "[ --help ] [ --version ]\n"
+
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
+#, c-format
+msgid ""
+"\n"
+"Aborted.\n"
+msgstr ""
+"\n"
+"Bị gián đoạn.\n"
+
+#: login-utils/chfn.c:425
+#, c-format
+msgid "field is too long.\n"
+msgstr "vùng quá dài.\n"
+
+#: login-utils/chfn.c:433
+#, c-format
+msgid "'%c' is not allowed.\n"
+msgstr "'%c' không được phép.\n"
+
+#: login-utils/chfn.c:438
+#, c-format
+msgid "Control characters are not allowed.\n"
+msgstr "Các ký tự điều khiển không được cho phép.\n"
+
+#: login-utils/chfn.c:503
+#, c-format
+msgid "Finger information *NOT* changed.  Try again later.\n"
+msgstr "Thông tin finger *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#: login-utils/chfn.c:506
+#, c-format
+msgid "Finger information changed.\n"
+msgstr "Thông tin finger đã thay đổi.\n"
+
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:322
+msgid "malloc failed"
+msgstr "malloc không thành công"
+
+#: login-utils/chsh.c:137
+#, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: %s chưa được xác thực để thay đổi shell của %s\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+"%s: UID đang hoạt động không tương ứng với UID của người dùng chúng ta đang "
+"nhập, không được phép thay đổi shell\n"
+
+#: login-utils/chsh.c:163
+#, c-format
+msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
+msgstr ""
+"%s: Shell của bạn không có strong /etc/shells, không cho phép thay đổi "
+"shell\n"
+
+#: login-utils/chsh.c:170
+#, c-format
+msgid "Changing shell for %s.\n"
+msgstr "Đang thay đổi shell cho %s.\n"
+
+#: login-utils/chsh.c:211
+msgid "New shell"
+msgstr "Shell mới"
+
+#: login-utils/chsh.c:218
+#, c-format
+msgid "Shell not changed.\n"
+msgstr "Shell chưa thay đổi.\n"
+
+#: login-utils/chsh.c:225
+#, c-format
+msgid "Shell *NOT* changed.  Try again later.\n"
+msgstr "Shell *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#: login-utils/chsh.c:228
+#, c-format
+msgid "Shell changed.\n"
+msgstr "Shell đã thay đổi.\n"
+
+#: login-utils/chsh.c:293
+#, c-format
+msgid ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ username ]\n"
+msgstr ""
+"Sử dụng: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ tên-người-dùng ]\n"
+
+#: login-utils/chsh.c:336
+#, c-format
+msgid "%s: shell must be a full path name.\n"
+msgstr "%s: shell phải là một tên đường dẫn đầy đủ.\n"
+
+#: login-utils/chsh.c:340
+#, c-format
+msgid "%s: \"%s\" does not exist.\n"
+msgstr "%s: \"%s\" không tồn tại.\n"
+
+#: login-utils/chsh.c:344
+#, c-format
+msgid "%s: \"%s\" is not executable.\n"
+msgstr "%s: \"%s\" là không thể thực hiện.\n"
+
+#: login-utils/chsh.c:351
+#, c-format
+msgid "%s: '%c' is not allowed.\n"
+msgstr "%s: '%c' không cho phép.\n"
+
+#: login-utils/chsh.c:355
+#, c-format
+msgid "%s: Control characters are not allowed.\n"
+msgstr "%s: Các ký tự điều khiển không được cho phép.\n"
+
+#: login-utils/chsh.c:362
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells\n"
+msgstr "Cảnh báo: \"%s\" không có trong /etc/shells\n"
+
+#: login-utils/chsh.c:364
+#, c-format
+msgid "%s: \"%s\" is not listed in /etc/shells.\n"
+msgstr "%s: \"%s\" không liệt kê trong /etc/shells.\n"
+
+#: login-utils/chsh.c:366
+#, c-format
+msgid "%s: use -l option to see list\n"
+msgstr "%s: hãy dùng tùy chọn -l để xem danh sách\n"
+
+#: login-utils/chsh.c:372
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
+msgstr "Cảnh báo: \"%s\" không có trong /etc/shells\n"
+
+#: login-utils/chsh.c:373
+#, c-format
+msgid "Use %s -l to see list.\n"
+msgstr "Hãy dùng %s -l để xem danh sách.\n"
+
+#: login-utils/chsh.c:393
+#, c-format
+msgid "No known shells.\n"
+msgstr "Không có shell biết đến.\n"
+
+#: login-utils/islocal.c:38
+#, c-format
+msgid "Can't read %s, exiting."
+msgstr "Không đọc được %s, đang thoát."
+
+#: login-utils/last.c:148
+msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
+msgstr ""
+"sử dụng: last [-#] [-f tập-tin] [-t tty] [-h hostname] [người-dùng ...]\n"
+
+#: login-utils/last.c:284
+msgid "  still logged in"
+msgstr "  vẫn còn đăng nhập"
+
+#: login-utils/last.c:306
+#, c-format
+msgid ""
+"\n"
+"wtmp begins %s"
+msgstr ""
+"\n"
+"wtmp bắt đầu %s"
+
+#: login-utils/last.c:362 login-utils/last.c:380 login-utils/last.c:431
+msgid "last: malloc failure.\n"
+msgstr "last: malloc thất bại.\n"
+
+#: login-utils/last.c:407
+msgid "last: gethostname"
+msgstr "last: gethostname (lấy tên máy)"
+
+#: login-utils/last.c:456
+#, c-format
+msgid ""
+"\n"
+"interrupted %10.10s %5.5s \n"
+msgstr ""
+"\n"
+"đã gián đoạn %10.10s %5.5s \n"
+
+#: login-utils/login.c:196
+#, c-format
+msgid "FATAL: can't reopen tty: %s"
+msgstr "LỖI NẶNG: không thể mở lại (reopen) tty: %s"
+
+#: login-utils/login.c:227
+msgid "FATAL: bad tty"
+msgstr "LỖI NẶNG: tty xấu"
+
+#: login-utils/login.c:355
+#, c-format
+msgid "login: -h for super-user only.\n"
+msgstr "login: -h chỉ dành cho super-user (root).\n"
+
+#: login-utils/login.c:382
+#, c-format
+msgid "usage: login [-fp] [username]\n"
+msgstr "sử dụng: login [-fp] [tên-người-dùng]\n"
+
+#: login-utils/login.c:475
+#, c-format
+msgid "login: PAM Failure, aborting: %s\n"
+msgstr "login: PAM Thất bại, đang thoát: %s\n"
+
+#: login-utils/login.c:477
+#, c-format
+msgid "Couldn't initialize PAM: %s"
+msgstr "Không thể bắt đầu PAM: %s"
+
+#: login-utils/login.c:494
+msgid "login: "
+msgstr "đăng nhập: "
+
+#: login-utils/login.c:534
+#, c-format
+msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
+msgstr "ĐĂNG NHẬP KHÔNG THÀNH CÔNG %d TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:538
+#, c-format
+msgid ""
+"Login incorrect\n"
+"\n"
+msgstr ""
+"Sai tên người dùng hoặc mật khẩu\n"
+"\n"
+
+#: login-utils/login.c:547
+#, c-format
+msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
+msgstr "QUÁ NHIỀU LẦN THỬ ĐĂNG NHẬP (%d) TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:551
+#, c-format
+msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
+msgstr "ĐĂNG NHẬP KHÔNG THÀNH CÔNG TỪ %s CHO %s, %s"
+
+#: login-utils/login.c:555
+#, c-format
+msgid ""
+"\n"
+"Login incorrect\n"
+msgstr ""
+"\n"
+"Sai tên người dùng hoặc mật khẩu\n"
+
+#: login-utils/login.c:577 login-utils/login.c:584 login-utils/login.c:618
+#, c-format
+msgid ""
+"\n"
+"Session setup problem, abort.\n"
+msgstr ""
+"\n"
+"Có vấn đề cấu hình buổi làm việc, thoát.\n"
+
+#: login-utils/login.c:578
+#, c-format
+msgid "NULL user name in %s:%d. Abort."
+msgstr "Tên người dùng bằng KHÔNG (NULL) trong %s:%d. Thoát."
+
+#: login-utils/login.c:585
+#, c-format
+msgid "Invalid user name \"%s\" in %s:%d. Abort."
+msgstr "Tên người dùng sai \"%s\" trong %s:%d. Thoát."
+
+#: login-utils/login.c:604
+#, c-format
+msgid "login: Out of memory\n"
+msgstr "login: Không đủ bộ nhớ\n"
+
+#: login-utils/login.c:646
+msgid "Illegal username"
+msgstr "Tên người dùng không hợp pháp"
+
+#: login-utils/login.c:689
+#, c-format
+msgid "%s login refused on this terminal.\n"
+msgstr "%s đăng nhập từ chối trên terminal này.\n"
+
+#: login-utils/login.c:694
+#, c-format
+msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
+msgstr "ĐĂNG NHẬP %s TỪ CHỐI TỪ %s TRÊN TTY %s"
+
+#: login-utils/login.c:698
+#, c-format
+msgid "LOGIN %s REFUSED ON TTY %s"
+msgstr "ĐĂNG NHẬP %s TỪ CHỐI TRÊN TTY %s"
+
+#: login-utils/login.c:751
+#, c-format
+msgid "Login incorrect\n"
+msgstr ""
+"Sai tên người dùng hoặc mật khẩu\n"
+"\n"
+
+#: login-utils/login.c:972
+#, c-format
+msgid "DIALUP AT %s BY %s"
+msgstr "QUAY SỐ TẠI %s BỞI %s"
+
+#: login-utils/login.c:979
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "ĐĂNG NHẬP CỦA ROOT TRÊN %s TỪ %s"
+
+#: login-utils/login.c:982
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ĐĂNG NHẬP CỦA ROOT TRÊN %s"
+
+#: login-utils/login.c:985
+#, c-format
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "ĐĂNG NHẬP TRÊN %s BỞI %s TỪ %s"
+
+#: login-utils/login.c:988
+#, c-format
+msgid "LOGIN ON %s BY %s"
+msgstr "ĐĂNG NHẬP TRÊN %s BỞI %s"
+
+#: login-utils/login.c:1009
+#, c-format
+msgid "You have new mail.\n"
+msgstr "Bạn có thư mới.\n"
+
+#: login-utils/login.c:1011
+#, c-format
+msgid "You have mail.\n"
+msgstr "Bạn có thư.\n"
+
+#: login-utils/login.c:1031
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: phân nhánh (fork) thất bại: %s"
+
+#: login-utils/login.c:1068
+#, c-format
+msgid "TIOCSCTTY failed: %m"
+msgstr "TIOCSCTTY không thành công: %m"
+
+#: login-utils/login.c:1074
+msgid "setuid() failed"
+msgstr "setuid() thất bại"
+
+#: login-utils/login.c:1080
+#, c-format
+msgid "No directory %s!\n"
+msgstr "Không có thư mục %s!\n"
+
+#: login-utils/login.c:1084
+#, c-format
+msgid "Logging in with home = \"/\".\n"
+msgstr "Đang đăng nhập với thư mục cá nhân = \"/\".\n"
+
+#: login-utils/login.c:1092
+#, c-format
+msgid "login: no memory for shell script.\n"
+msgstr "login: không có bộ nhớ cho script của shell.\n"
+
+#: login-utils/login.c:1119
+#, c-format
+msgid "login: couldn't exec shell script: %s.\n"
+msgstr "login: không thực hiện được shell script: %s.\n"
+
+#: login-utils/login.c:1122
+#, c-format
+msgid "login: no shell: %s.\n"
+msgstr "login: không có shell: %s.\n"
+
+#: login-utils/login.c:1137
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+"\n"
+"%s đăng nhập: "
+
+#: login-utils/login.c:1148
+#, c-format
+msgid "login name much too long.\n"
+msgstr "tên đăng nhập quá dài.\n"
+
+#: login-utils/login.c:1149
+msgid "NAME too long"
+msgstr "TÊN quá dài"
+
+#: login-utils/login.c:1156
+#, c-format
+msgid "login names may not start with '-'.\n"
+msgstr "tên đăng nhập không được bắt đầu với '-'.\n"
+
+#: login-utils/login.c:1166
+#, c-format
+msgid "too many bare linefeeds.\n"
+msgstr "quá nhiều dòng nhập vào trống\n"
+
+#: login-utils/login.c:1167
+msgid "EXCESSIVE linefeeds"
+msgstr "dòng nhập vào THỪA"
+
+#: login-utils/login.c:1199
+#, c-format
+msgid "Login timed out after %d seconds\n"
+msgstr "Hết thời gian chờ đăng nhập sau %d giây\n"
+
+#: login-utils/login.c:1287
+#, c-format
+msgid "Last login: %.*s "
+msgstr "Đăng nhập lần cuối: %.*s "
+
+#: login-utils/login.c:1291
+#, c-format
+msgid "from %.*s\n"
+msgstr "từ %.*s\n"
+
+#: login-utils/login.c:1294
+#, c-format
+msgid "on %.*s\n"
+msgstr "trên %.*s\n"
+
+#: login-utils/login.c:1314
+#, c-format
+msgid "LOGIN FAILURE FROM %s, %s"
+msgstr "ĐĂNG NHẬP THẤT BẠI TỪ %s, %s"
+
+#: login-utils/login.c:1317
+#, c-format
+msgid "LOGIN FAILURE ON %s, %s"
+msgstr "ĐĂNG NHẬP THẤT BẠI TRÊN %s, %s"
+
+#: login-utils/login.c:1321
+#, c-format
+msgid "%d LOGIN FAILURES FROM %s, %s"
+msgstr "%d ĐĂNG NHẬP THẤT BẠI TỪ %s, %s"
+
+#: login-utils/login.c:1324
+#, c-format
+msgid "%d LOGIN FAILURES ON %s, %s"
+msgstr "%d ĐĂNG NHẬP THẤT BẠI TRÊN %s, %s"
+
+#: login-utils/mesg.c:89
+#, c-format
+msgid "is y\n"
+msgstr "là y (có)\n"
+
+#: login-utils/mesg.c:92
+#, c-format
+msgid "is n\n"
+msgstr "là n (không)\n"
+
+#: login-utils/mesg.c:112
+#, c-format
+msgid "usage: mesg [y | n]\n"
+msgstr "sử dụng: mesg [y | n]\n"
+
+#: login-utils/newgrp.c:69
+msgid "newgrp: Who are you?"
+msgstr "newgrp: Bạn là ai?"
+
+#: login-utils/newgrp.c:77 login-utils/newgrp.c:87
+msgid "newgrp: setgid"
+msgstr "newgrp: setgid"
+
+#: login-utils/newgrp.c:82
+msgid "newgrp: No such group."
+msgstr "newgrp: Không có nhóm như vậy."
+
+#: login-utils/newgrp.c:91
+msgid "newgrp: Permission denied"
+msgstr "newgrp: Không đủ quyền hạn"
+
+#: login-utils/newgrp.c:98
+msgid "newgrp: setuid"
+msgstr "newgrp: setuid"
+
+#: login-utils/newgrp.c:104
+msgid "No shell"
+msgstr "Không có shell"
+
+#: login-utils/shutdown.c:113
+#, c-format
+msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Sử dụng: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+
+#: login-utils/shutdown.c:131
+msgid "Shutdown process aborted"
+msgstr "Dừng việc tắt máy"
+
+#: login-utils/shutdown.c:162
+#, c-format
+msgid "%s: Only root can shut a system down.\n"
+msgstr "%s: Chỉ root có thể tắt máy.\n"
+
+#: login-utils/shutdown.c:256
+#, c-format
+msgid "That must be tomorrow, can't you wait till then?\n"
+msgstr "Là ngày mai, có thể chờ đến lúc đó?\n"
+
+#: login-utils/shutdown.c:307
+msgid "for maintenance; bounce, bounce"
+msgstr "cho bảo dưỡng;"
+
+#: login-utils/shutdown.c:311
+#, c-format
+msgid "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr "thời gian chờ = %d, im lặng = %d, khởi động lại = %d\n"
+
+#: login-utils/shutdown.c:336
+msgid "The system is being shut down within 5 minutes"
+msgstr "Sẽ tắt máy sau 5 phút"
+
+#: login-utils/shutdown.c:340
+msgid "Login is therefore prohibited."
+msgstr "Do đó đăng nhập là không thể."
+
+#: login-utils/shutdown.c:362
+#, c-format
+msgid "rebooted by %s: %s"
+msgstr "khởi động lại bởi %s: %s"
+
+#: login-utils/shutdown.c:365
+#, c-format
+msgid "halted by %s: %s"
+msgstr "dừng bởi %s: %s"
+
+#: login-utils/shutdown.c:429
+msgid ""
+"\n"
+"Why am I still alive after reboot?"
+msgstr ""
+"\n"
+"Tại sao tôi vẫn còn sống sau khi khởi động lại?"
+
+#: login-utils/shutdown.c:431
+msgid ""
+"\n"
+"Now you can turn off the power..."
+msgstr ""
+"\n"
+"Bây giờ có thể tắt nguồn điện..."
+
+#: login-utils/shutdown.c:447
+#, c-format
+msgid "Calling kernel power-off facility...\n"
+msgstr "Đang gọi phương tiện tắt máy của nhân...\n"
+
+#: login-utils/shutdown.c:450
+#, c-format
+msgid "Error powering off\t%s\n"
+msgstr "Lỗi tắt máy \t%s\n"
+
+#: login-utils/shutdown.c:458
+#, c-format
+msgid "Executing the program \"%s\" ...\n"
+msgstr "Đang thực hiện chương trình \"%s\"...\n"
+
+#: login-utils/shutdown.c:461
+#, c-format
+msgid "Error executing\t%s\n"
+msgstr "Lỗi thực hiện \t%s\n"
+
+#: login-utils/shutdown.c:488
+#, c-format
+msgid "URGENT: broadcast message from %s:"
+msgstr "URGENT: thông báo toàn thể từ %s:"
+
+#: login-utils/shutdown.c:494
+#, c-format
+msgid "System going down in %d hours %d minutes"
+msgstr "Hệ thống sẽ tắt sau %d giờ %d phút"
+
+#: login-utils/shutdown.c:497
+#, c-format
+msgid "System going down in 1 hour %d minutes"
+msgstr "Hệ thống sẽ tắt sau 1 giờ %d phút"
+
+#: login-utils/shutdown.c:500
+#, c-format
+msgid "System going down in %d minutes\n"
+msgstr "Hệ thống sẽ tắt sau %d phút\n"
+
+#: login-utils/shutdown.c:503
+#, c-format
+msgid "System going down in 1 minute\n"
+msgstr "Hệ thống sẽ tắt sau 1 phút\n"
+
+#: login-utils/shutdown.c:505
+#, c-format
+msgid "System going down IMMEDIATELY!\n"
+msgstr "Hệ thống sẽ tắt sau NGAY LẬP TỨC!\n"
+
+#: login-utils/shutdown.c:510
+#, c-format
+msgid "\t... %s ...\n"
+msgstr "\t... %s ...\n"
+
+#: login-utils/shutdown.c:567
+msgid "Cannot fork for swapoff. Shrug!"
+msgstr "Không thể phân nhánh cho swapoff. Bỏ đi!"
+
+#: login-utils/shutdown.c:575
+msgid "Cannot exec swapoff, hoping umount will do the trick."
+msgstr "Không thực hiện được swapoff, hy vọng umount sẽ làm thay."
+
+#: login-utils/shutdown.c:594
+msgid "Cannot fork for umount, trying manually."
+msgstr "Không phân nhánh được cho umount, đang thử một cách thủ công."
+
+#: login-utils/shutdown.c:603
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
+msgstr "Không chạy được %s, đang thử umount.\n"
+
+#: login-utils/shutdown.c:607
+msgid "Cannot exec umount, giving up on umount."
+msgstr "Không chạy được umount, bỏ trên umount."
+
+#: login-utils/shutdown.c:612
+msgid "Unmounting any remaining filesystems..."
+msgstr "Đang bỏ gắn mọi hệ thống tập tin nói đến..."
+
+#: login-utils/shutdown.c:659
+#, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: Không umount được %s: %s\n"
+
+#: login-utils/simpleinit.c:132
+msgid "Booting to single user mode.\n"
+msgstr "Khởi động vào chế độ một người dùng.\n"
+
+#: login-utils/simpleinit.c:136
+msgid "exec of single user shell failed\n"
+msgstr "không chạy thành công shell cho người dùng đơn\n"
+
+#: login-utils/simpleinit.c:140
+msgid "fork of single user shell failed\n"
+msgstr "không phân nhánh thành công shell cho người dùng đơn\n"
+
+#: login-utils/simpleinit.c:208
+msgid "error opening fifo\n"
+msgstr "lỗi mở kênh fifo\n"
+
+#: login-utils/simpleinit.c:212
+msgid "error setting close-on-exec on /dev/initctl"
+msgstr "lỗi thiết lập close-on-exec trên /dev/initctl"
+
+#: login-utils/simpleinit.c:259
+msgid "error running finalprog\n"
+msgstr "lỗi chạy finalprog (kết thúc chương trình)\n"
+
+#: login-utils/simpleinit.c:263
+msgid "error forking finalprog\n"
+msgstr "lỗi phân nhánh finalprog (kết thúc chương trình)\n"
+
+#: login-utils/simpleinit.c:345
+msgid ""
+"\n"
+"Wrong password.\n"
+msgstr ""
+"\n"
+"Mật khẩu không đúng.\n"
+
+#: login-utils/simpleinit.c:418
+msgid "lstat of path failed\n"
+msgstr "lstat đường dẫn không thành công\n"
+
+#: login-utils/simpleinit.c:426
+msgid "stat of path failed\n"
+msgstr "stat đường dẫn không thành công\n"
+
+#: login-utils/simpleinit.c:434
+msgid "open of directory failed\n"
+msgstr "mở thư mục không thành công\n"
+
+#: login-utils/simpleinit.c:508
+msgid "fork failed\n"
+msgstr "phân nhánh không thành công\n"
+
+#: login-utils/simpleinit.c:539 text-utils/more.c:1576
+msgid "exec failed\n"
+msgstr "thực hiện (exec) không thành công\n"
+
+#: login-utils/simpleinit.c:563
+msgid "cannot open inittab\n"
+msgstr "không mở được inittab\n"
+
+#: login-utils/simpleinit.c:630
+msgid "no TERM or cannot stat tty\n"
+msgstr "không có TERM hoặc không thể stat (lấy trạng thái) tty\n"
+
+#: login-utils/simpleinit.c:936
+#, c-format
+msgid "error stopping service: \"%s\""
+msgstr "lỗi dừng dịch vụ: \"%s\""
+
+#: login-utils/ttymsg.c:75
+msgid "too many iov's (change code in wall/ttymsg.c)"
+msgstr "quá nhiều iov (thay đổi mã trong wall/ttymsg.c)"
+
+#: login-utils/ttymsg.c:85
+#, c-format
+msgid "excessively long line arg"
+msgstr "arg dài quá mức"
+
+#: login-utils/ttymsg.c:139
+#, c-format
+msgid "cannot fork"
+msgstr "không phân nhánh được"
+
+#: login-utils/ttymsg.c:143
+#, c-format
+msgid "fork: %s"
+msgstr "fork: %s"
+
+#: login-utils/ttymsg.c:171
+#, c-format
+msgid "%s: BAD ERROR"
+msgstr "%s: LỖI XẤU"
+
+#: login-utils/vipw.c:143
+#, c-format
+msgid "%s: the password file is busy.\n"
+msgstr "%s: tập tin mật khẩu đang bận.\n"
+
+#: login-utils/vipw.c:146
+#, c-format
+msgid "%s: the group file is busy.\n"
+msgstr "%s: tập tin nhóm đang bận.\n"
+
+#: login-utils/vipw.c:162
+#, c-format
+msgid "%s: the %s file is busy (%s present)\n"
+msgstr "%s: tập tin %s đang bận (%s hiện thời)\n"
+
+#: login-utils/vipw.c:168
+#, c-format
+msgid "%s: can't link %s: %s\n"
+msgstr "%s: không liên kết (link) được %s: %s\n"
+
+#: login-utils/vipw.c:202
+#, c-format
+msgid "%s: Can't get context for %s"
+msgstr "%s: Không lấy được văn cảnh cho %s"
+
+#: login-utils/vipw.c:208
+#, c-format
+msgid "%s: Can't set context for %s"
+msgstr "%s: Không đặt được văn cảnh cho %s"
+
+#: login-utils/vipw.c:217
+#, c-format
+msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
+msgstr "%s: không mở khóa được %s: %s (mọi thay đổi vẫn còn trong %s)\n"
+
+#: login-utils/vipw.c:240
+#, c-format
+msgid "%s: Cannot fork\n"
+msgstr "%s: Không thể phân nhánh\n"
+
+#: login-utils/vipw.c:276
+#, c-format
+msgid "%s: %s unchanged\n"
+msgstr "%s: %s không thay đổi\n"
+
+#: login-utils/vipw.c:297
+#, c-format
+msgid "%s: no changes made\n"
+msgstr "%s: không có thay đổi nào\n"
+
+#: login-utils/vipw.c:352
+#, c-format
+msgid "You are using shadow groups on this system.\n"
+msgstr "Bạn đang dùng shadow group (bóng nhóm) trên hệ thống này.\n"
+
+#: login-utils/vipw.c:353
+#, c-format
+msgid "You are using shadow passwords on this system.\n"
+msgstr "Bạn đang dùng shadow (bóng) mật khẩu trên hệ thống này.\n"
+
+#: login-utils/vipw.c:354
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr "Soạn thảo %s bây giờ [y/n]? "
+
+#: login-utils/wall.c:104
+#, c-format
+msgid "usage: %s [file]\n"
+msgstr "sử dụng: %s [ tập tin ]\n"
+
+#: login-utils/wall.c:159
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "%s: không mở được tập tin tạm thời.\n"
+
+#: login-utils/wall.c:186
+#, c-format
+msgid "Broadcast Message from %s@%s"
+msgstr "Thông báo Toàn thể từ %s@%s"
+
+#: login-utils/wall.c:204
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: sẽ không đọc %s - sử dụng stdin.\n"
+
+#: login-utils/wall.c:209
+#, c-format
+msgid "%s: can't read %s.\n"
+msgstr "%s: không đọc được %s.\n"
+
+#: login-utils/wall.c:231
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr "%s: không lấy được trạng thái (stat) tập tin tạm thời.\n"
+
+#: login-utils/wall.c:241
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr "%s: không đọc được tập tin tạm thời.\n"
+
+#: misc-utils/cal.c:327
+msgid "illegal month value: use 1-12"
+msgstr "giá trị tháng bị sai: hãy dùng từ 1 đến 12"
+
+#: misc-utils/cal.c:331
+msgid "illegal year value: use 1-9999"
+msgstr "giá trị năm không thích hợp: hãy dùng 1-9999"
+
+#: misc-utils/cal.c:439
+#, c-format
+msgid "%s %d"
+msgstr "%s %d"
+
+#: misc-utils/cal.c:780
+#, c-format
+msgid "usage: cal [-13smjyV] [[month] year]\n"
+msgstr "sử dụng: cal [-13smjyV] [[tháng] năm]\n"
+
+#: misc-utils/ddate.c:203
+#, c-format
+msgid "usage: %s [+format] [day month year]\n"
+msgstr "sử dụng: %s [+địnhdạng] [ngày tháng năm]\n"
+
+#: misc-utils/ddate.c:250
+msgid "St. Tib's Day"
+msgstr "Ngày thánh Tib"
+
+#: misc-utils/kill.c:207
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr "%s: tín hiệu không rõ %s\n"
+
+#: misc-utils/kill.c:270
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr "%s: không thể tìm thấy tiến trình \"%s\"\n"
+
+#: misc-utils/kill.c:314
+#, c-format
+msgid "%s: unknown signal %s; valid signals:\n"
+msgstr "%s: tín hiệu không rõ %s; tín hiệu có thể dùng:\n"
+
+#: misc-utils/kill.c:354
+#, c-format
+msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "sử dụng: %s [ -s tín hiệu | -p ] [ -a ] pid ...\n"
+
+#: misc-utils/kill.c:355
+#, c-format
+msgid "       %s -l [ signal ]\n"
+msgstr "       %s -l [ tínhiệu ]\n"
+
+#: misc-utils/logger.c:141
+#, c-format
+msgid "logger: %s: %s.\n"
+msgstr "logger: %s: %s.\n"
+
+#: misc-utils/logger.c:248
+#, c-format
+msgid "logger: unknown facility name: %s.\n"
+msgstr "logger: không rõ tên phương tiện: %s.\n"
+
+#: misc-utils/logger.c:260
+#, c-format
+msgid "logger: unknown priority name: %s.\n"
+msgstr "logger: không rõ tên quyền ưu tiên: %s.\n"
+
+#: misc-utils/logger.c:287
+#, c-format
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"Sử dụng: logger [-is] [-f tậptin] [-p pri] [-t tag] [-u socket] "
+"[ thôngbáo ... ]\n"
+
+#: misc-utils/look.c:349
+#, c-format
+msgid "usage: look [-dfa] [-t char] string [file]\n"
+msgstr "sử dụng: look [-dfa] [-t char] string [file]\n"
+
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, c-format
+msgid "Could not open %s\n"
+msgstr "Không mở được %s\n"
+
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
+#, c-format
+msgid "Got %d bytes from %s\n"
+msgstr "Nhận %d byte từ %s\n"
+
+#: misc-utils/namei.c:103
+#, c-format
+msgid "namei: unable to get current directory - %s\n"
+msgstr "namei: không lấy được thư mục hiện thời - %s\n"
+
+#: misc-utils/namei.c:116
+#, c-format
+msgid "namei: unable to chdir to %s - %s (%d)\n"
+msgstr "namei: không chdir (thay đổi thư mục) được tới %s - %s (%d)\n"
+
+#: misc-utils/namei.c:126
+#, c-format
+msgid "usage: namei [-mx] pathname [pathname ...]\n"
+msgstr "sử dụng: namei [-mx] tênđườngdẫn [tênđườngdẫn ...]\n"
+
+#: misc-utils/namei.c:151
+#, c-format
+msgid "namei: could not chdir to root!\n"
+msgstr "namei: không thể chdir (thay đổi thư mục) tới root (gốc)!\n"
+
+#: misc-utils/namei.c:158
+#, c-format
+msgid "namei: could not stat root!\n"
+msgstr "namei: không thể lấy được trạng thái (stat) root!\n"
+
+#: misc-utils/namei.c:172
+#, c-format
+msgid "namei: buf overflow\n"
+msgstr "namei: tràn bộ đệm\n"
+
+#: misc-utils/namei.c:218
+#, c-format
+msgid " ? could not chdir into %s - %s (%d)\n"
+msgstr " ? không thể chdir (thay đổi thư mục) và %s - %s (%d)\n"
+
+#: misc-utils/namei.c:247
+#, c-format
+msgid " ? problems reading symlink %s - %s (%d)\n"
+msgstr " ? vấn đề đọc liên kết mềm %s - %s (%d)\n"
+
+#: misc-utils/namei.c:257
+#, c-format
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+msgstr "  *** VƯỢT QUÁ GIỚI HẠN LIÊN KẾT MỀM CỦA UNIX ***\n"
+
+#: misc-utils/namei.c:294
+#, c-format
+msgid "namei: unknown file type 0%06o on file %s\n"
+msgstr "namei: không rõ loại tập tin 0%06o tên tập tin %s\n"
+
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: không đủ bộ nhớ\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: thay đổi tên %s thành %s không thành công: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "call: %s sang các tập tin...\n"
+
+#: misc-utils/script.c:106
+#, c-format
+msgid ""
+"Warning: `%s' is a link.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+"Cảnh báo: `%s' là một liên kết.\n"
+"Hãy dùng `%s [tùy chọn] %s' nếu thực sự muốn sử dụng nó.\n"
+"Script chưa chạy.\n"
+
+#: misc-utils/script.c:168
+#, c-format
+msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgstr "sử dụng: script [-a] [-f] [-q] [-t] [tập tin]\n"
+
+#: misc-utils/script.c:191
+#, c-format
+msgid "Script started, file is %s\n"
+msgstr "Script đã chạy, tập tin là %s\n"
+
+#: misc-utils/script.c:277
+#, c-format
+msgid "Script started on %s"
+msgstr "Script đã chạy trên %s"
+
+#: misc-utils/script.c:361
+#, c-format
+msgid ""
+"\n"
+"Script done on %s"
+msgstr ""
+"\n"
+"Script hoàn thành trên %s"
+
+#: misc-utils/script.c:368
+#, c-format
+msgid "Script done, file is %s\n"
+msgstr "Script hoàn thành, tập tin là %s\n"
+
+#: misc-utils/script.c:379
+#, c-format
+msgid "openpty failed\n"
+msgstr "openpty không thành công\n"
+
+#: misc-utils/script.c:413
+#, c-format
+msgid "Out of pty's\n"
+msgstr "Ngoài pty\n"
+
+#: misc-utils/setterm.c:746
+#, c-format
+msgid "%s: Argument error, usage\n"
+msgstr "%s: Lỗi tham số, sử dụng\n"
+
+#: misc-utils/setterm.c:749
+#, c-format
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term tên_terminal ]\n"
+
+#: misc-utils/setterm.c:750
+#, c-format
+msgid "  [ -reset ]\n"
+msgstr "  [ -reset ]\n"
+
+#: misc-utils/setterm.c:751
+#, c-format
+msgid "  [ -initialize ]\n"
+msgstr "  [ -initialize ]\n"
+
+#: misc-utils/setterm.c:752
+#, c-format
+msgid "  [ -cursor [on|off] ]\n"
+msgstr "  [ -cursor [on|off] ]\n"
+
+#: misc-utils/setterm.c:754
+#, c-format
+msgid "  [ -snow [on|off] ]\n"
+msgstr "  [ -snow [on|off] ]\n"
+
+#: misc-utils/setterm.c:755
+#, c-format
+msgid "  [ -softscroll [on|off] ]\n"
+msgstr "  [ -softscroll [on|off] ]\n"
+
+#: misc-utils/setterm.c:757
+#, c-format
+msgid "  [ -repeat [on|off] ]\n"
+msgstr "  [ -repeat [on|off] ]\n"
+
+#: misc-utils/setterm.c:758
+#, c-format
+msgid "  [ -appcursorkeys [on|off] ]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\n"
+
+#: misc-utils/setterm.c:759
+#, c-format
+msgid "  [ -linewrap [on|off] ]\n"
+msgstr "  [ -linewrap [on|off] ]\n"
+
+#: misc-utils/setterm.c:760
+#, c-format
+msgid "  [ -default ]\n"
+msgstr "  [ -default ]\n"
+
+#: misc-utils/setterm.c:761
+#, c-format
+msgid "  [ -foreground black|blue|green|cyan"
+msgstr "  [ -foreground black|blue|green|cyan"
+
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#, c-format
+msgid "|red|magenta|yellow|white|default ]\n"
+msgstr "|red|magenta|yellow|white|default ]\n"
+
+#: misc-utils/setterm.c:763
+#, c-format
+msgid "  [ -background black|blue|green|cyan"
+msgstr "  [ -background black|blue|green|cyan"
+
+#: misc-utils/setterm.c:765
+#, c-format
+msgid "  [ -ulcolor black|grey|blue|green|cyan"
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
+#, c-format
+msgid "|red|magenta|yellow|white ]\n"
+msgstr "|red|magenta|yellow|white ]\n"
+
+#: misc-utils/setterm.c:767
+#, c-format
+msgid "  [ -ulcolor bright blue|green|cyan"
+msgstr "  [ -ulcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:769
+#, c-format
+msgid "  [ -hbcolor black|grey|blue|green|cyan"
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:771
+#, c-format
+msgid "  [ -hbcolor bright blue|green|cyan"
+msgstr "  [ -hbcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:774
+#, c-format
+msgid "  [ -standout [ attr ] ]\n"
+msgstr "  [ -standout [ thuộc tính ] ]\n"
+
+#: misc-utils/setterm.c:776
+#, c-format
+msgid "  [ -inversescreen [on|off] ]\n"
+msgstr "  [ -inversescreen [on|off] ]\n"
+
+#: misc-utils/setterm.c:777
+#, c-format
+msgid "  [ -bold [on|off] ]\n"
+msgstr "  [ -bold [on|off] ]\n"
+
+#: misc-utils/setterm.c:778
+#, c-format
+msgid "  [ -half-bright [on|off] ]\n"
+msgstr "  [ -half-bright [on|off] ]\n"
+
+#: misc-utils/setterm.c:779
+#, c-format
+msgid "  [ -blink [on|off] ]\n"
+msgstr "  [ -blink [on|off] ]\n"
+
+#: misc-utils/setterm.c:780
+#, c-format
+msgid "  [ -reverse [on|off] ]\n"
+msgstr "  [ -reverse [on|off] ]\n"
+
+#: misc-utils/setterm.c:781
+#, c-format
+msgid "  [ -underline [on|off] ]\n"
+msgstr "  [ -underline [on|off] ]\n"
+
+#: misc-utils/setterm.c:782
+#, c-format
+msgid "  [ -store ]\n"
+msgstr "  [ -store ]\n"
+
+#: misc-utils/setterm.c:783
+#, c-format
+msgid "  [ -clear [all|rest] ]\n"
+msgstr "  [ -clear [all|rest] ]\n"
+
+#: misc-utils/setterm.c:784
+#, c-format
+msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:785
+#, c-format
+msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:786
+#, c-format
+msgid "  [ -regtabs [1-160] ]\n"
+msgstr "  [ -regtabs [1-160] ]\n"
+
+#: misc-utils/setterm.c:787
+#, c-format
+msgid "  [ -blank [0-60] ]\n"
+msgstr "  [ -blank [0-60] ]\n"
+
+#: misc-utils/setterm.c:788
+#, c-format
+msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
+msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:789
+#, c-format
+msgid "  [ -append [1-NR_CONSOLES] ]\n"
+msgstr "  [ -append [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:790
+#, c-format
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file têntậptindump ]\n"
+
+#: misc-utils/setterm.c:791
+#, c-format
+msgid "  [ -msg [on|off] ]\n"
+msgstr "  [ -msg [on|off] ]\n"
+
+#: misc-utils/setterm.c:792
+#, c-format
+msgid "  [ -msglevel [0-8] ]\n"
+msgstr "  [ -msglevel [0-8] ]\n"
+
+#: misc-utils/setterm.c:793
+#, c-format
+msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+
+#: misc-utils/setterm.c:794
+#, c-format
+msgid "  [ -powerdown [0-60] ]\n"
+msgstr "  [ -powerdown [0-60] ]\n"
+
+#: misc-utils/setterm.c:795
+#, c-format
+msgid "  [ -blength [0-2000] ]\n"
+msgstr "  [ -blength [0-2000] ]\n"
+
+#: misc-utils/setterm.c:796
+#, c-format
+msgid "  [ -bfreq freqnumber ]\n"
+msgstr "  [ -bfreq tầnsố ]\n"
+
+#: misc-utils/setterm.c:1051
+#, c-format
+msgid "cannot (un)set powersave mode\n"
+msgstr "không (bỏ) đặt được chế độ tiết kiệm nguồn điện\n"
+
+#: misc-utils/setterm.c:1090 misc-utils/setterm.c:1098
+#, c-format
+msgid "klogctl error: %s\n"
+msgstr "lỗi klogctl: %s\n"
+
+#: misc-utils/setterm.c:1151
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Lỗi đọc %s\n"
+
+#: misc-utils/setterm.c:1166
+#, c-format
+msgid "Error writing screendump\n"
+msgstr "Lỗi ghi screendump (dump màn hình)\n"
+
+#: misc-utils/setterm.c:1180
+#, c-format
+msgid "couldn't read %s, and cannot ioctl dump\n"
+msgstr "không đọc được %s, và không thể ioctl dump\n"
+
+#: misc-utils/setterm.c:1246
+#, c-format
+msgid "%s: $TERM is not defined.\n"
+msgstr "%s: $TERM chưa định nghĩa.\n"
+
+#: misc-utils/whereis.c:157
+#, c-format
+msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
+msgstr "whereis [ -sbmu ] [ -SBM thưmục ... -f ] tên...\n"
+
+#: misc-utils/write.c:99
+#, c-format
+msgid "write: can't find your tty's name\n"
+msgstr "write: không tìm thấy tên tty của bạn\n"
+
+#: misc-utils/write.c:110
+#, c-format
+msgid "write: you have write permission turned off.\n"
+msgstr "write: quyền ghi nhớ của bạn đã tắt.\n"
+
+#: misc-utils/write.c:131
+#, c-format
+msgid "write: %s is not logged in on %s.\n"
+msgstr "write: %s chưa đăng nhập vào trên %s.\n"
+
+#: misc-utils/write.c:139
+#, c-format
+msgid "write: %s has messages disabled on %s\n"
+msgstr "write: %s tắt thông báo trên %s\n"
+
+#: misc-utils/write.c:146
+#, c-format
+msgid "usage: write user [tty]\n"
+msgstr "sử dụng: write người-dùng [tty]\n"
+
+#: misc-utils/write.c:234
+#, c-format
+msgid "write: %s is not logged in\n"
+msgstr "write: %s chưa đăng nhập vào\n"
+
+#: misc-utils/write.c:243
+#, c-format
+msgid "write: %s has messages disabled\n"
+msgstr "write: %s tắt không dùng thông báo\n"
+
+#: misc-utils/write.c:247
+#, c-format
+msgid "write: %s is logged in more than once; writing to %s\n"
+msgstr "write: %s đăng nhập nhiều hơn một lần, đang ghi nhớ vào %s\n"
+
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Tin nhắn từ %s@%s (như %s) trên %s lúc %s ..."
+
+#: misc-utils/write.c:316
+#, c-format
+msgid "Message from %s@%s on %s at %s ..."
+msgstr "Tin nhắn %s@%s tên %s lúc %s ..."
+
+#: mount/fstab.c:136
+#, c-format
+msgid "warning: error reading %s: %s"
+msgstr "cảnh báo: lỗi đọc %s: %s"
+
+#: mount/fstab.c:164 mount/fstab.c:189
+#, c-format
+msgid "warning: can't open %s: %s"
+msgstr "cảnh báo: không mở được %s: %s"
+
+#: mount/fstab.c:169
+#, c-format
+msgid "mount: could not open %s - using %s instead\n"
+msgstr "mount: không mở được %s - sử dụng %s để thay thế\n"
+
+#: mount/fstab.c:484
+#, c-format
+msgid "can't create lock file %s: %s (use -n flag to override)"
+msgstr "không tạo được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
+
+#: mount/fstab.c:499
+#, c-format
+msgid "can't link lock file %s: %s (use -n flag to override)"
+msgstr "không liên kết được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
+
+#: mount/fstab.c:511
+#, c-format
+msgid "can't open lock file %s: %s (use -n flag to override)"
+msgstr "không mở được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
+
+#: mount/fstab.c:526
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "Không khóa được tập tin khóa (lock file) %s: %s\n"
+
+#: mount/fstab.c:538
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr "không khóa được tập tin khóa (lock file) %s: %s"
+
+#: mount/fstab.c:540
+msgid "timed out"
+msgstr "hết thời gian"
+
+#: mount/fstab.c:547
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+"Không tạo được liên kết %s\n"
+"Có thể đây là tập tin khóa bền vững?\n"
+
+#: mount/fstab.c:587 mount/fstab.c:625
+#, c-format
+msgid "cannot open %s (%s) - mtab not updated"
+msgstr "không mở được %s (%s) - mtab chưa cập nhật"
+
+#: mount/fstab.c:633
+#, c-format
+msgid "error writing %s: %s"
+msgstr "lỗi ghi nhớ %s: %s"
+
+#: mount/fstab.c:643
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr "lỗi thay đổi chế độ (mode) của %s: %s\n"
+
+#: mount/fstab.c:661
+#, c-format
+msgid "can't rename %s to %s: %s\n"
+msgstr "không đổi tên được %s thành %s: %s\n"
+
+#: mount/lomount.c:73
+#, c-format
+msgid "loop: can't open device %s: %s\n"
+msgstr "loop: không mở được thiết bị %s: %s\n"
+
+#: mount/lomount.c:89
+#, c-format
+msgid ", offset %lld"
+msgstr ", bộ %lld"
+
+#: mount/lomount.c:92
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", giớihạnkíchthước %lld"
+
+#: mount/lomount.c:100
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", mã hóa %s (dạng %d)"
+
+#: mount/lomount.c:114
+#, c-format
+msgid ", offset %d"
+msgstr ", bộ %d"
+
+#: mount/lomount.c:117
+#, c-format
+msgid ", encryption type %d\n"
+msgstr ", dạng mã hóa %d\n"
+
+#: mount/lomount.c:126
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
+
+#: mount/lomount.c:179
+#, c-format
+msgid "%s: could not find any device /dev/loop#"
+msgstr "%s: không tìm thấy bất kỳ thiết bị /dev/loop# nào"
+
+#: mount/lomount.c:181
+#, c-format
+msgid "%s: no permission to look at /dev/loop#"
+msgstr "%s: không có quyền xem /dev/loop#"
+
+#: mount/lomount.c:184
+#, c-format
+msgid ""
+"%s: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
+msgstr ""
+"%s: Không tìm thấy bất kỳ thiết bị loop nào. Có thể nhân này không biết\n"
+"       về thiết bị loop? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
+"loop'.)"
+
+#: mount/lomount.c:189
+#, c-format
+msgid "%s: could not find any free loop device"
+msgstr "%s: không tìm thấy thiết bị loop nào còn trống"
+
+#: mount/lomount.c:287
+#, c-format
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
+
+#: mount/lomount.c:340
+#, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%llu): thành công\n"
+
+#: mount/lomount.c:351
+#, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: không xóa được thiết bị %s: %s\n"
+
+#: mount/lomount.c:361
+#, c-format
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): thành công\n"
+
+#: mount/lomount.c:369
+#, c-format
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Phiên bản mout biên dịch không hỗ trợ loop. Xin hãy biên dịch lại.\n"
+
+#: mount/lomount.c:406
+#, c-format
+msgid ""
+"usage:\n"
+"  %s loop_device                                       # give info\n"
+"  %s -d loop_device                                    # delete\n"
+"  %s -f                                                # find unused\n"
+"  %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"
+msgstr ""
+"sử dụng:\n"
+"  %s thiết_bị_loop                                       # đưa thông tin\n"
+"  %s -d thiết_bị_loop                                    # xóa\n"
+"  %s -f                                                # tìm chưa sử dụng\n"
+"  %s [-e mã_hóa] [-o offset] {-f|thiết_bị_loop} tập-tin # cấu hình\n"
+
+#: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29
+#, c-format
+msgid "not enough memory"
+msgstr "không đủ bộ nhớ"
+
+#: mount/lomount.c:540
+#, c-format
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Biên dịch không hỗ trợ loop. Xin hãy biên dịch lại.\n"
+
+#: mount/mntent.c:166
+#, c-format
+msgid "[mntent]: warning: no final newline at the end of %s\n"
+msgstr "[mntent]: cảnh báo: không có dòng mới đặt ở cuối %s\n"
+
+#: mount/mntent.c:217
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr "[mntent]: dòng %d trong %s xấu%s\n"
+
+#: mount/mntent.c:220
+msgid "; rest of file ignored"
+msgstr "; bỏ qua phần còn lại của tập tin"
+
+#: mount/mount_blkid.c:87
+#, c-format
+msgid "%s: error: the label %s occurs on both %s and %s\n"
+msgstr "%s: lỗi: ghi nhãn %s xuất hiện trên cả %s và %s\n"
+
+#: mount/mount_blkid.c:99
+#, c-format
+msgid "mount: going to mount %s by UUID\n"
+msgstr "mount: chuẩn bị gắn %s theo UUID\n"
+
+#: mount/mount_blkid.c:103
+#, c-format
+msgid "mount: going to mount %s by label\n"
+msgstr "mount: chuẩn bị gắn %s theo nhãn\n"
+
+#: mount/mount_by_label.c:192
+#, c-format
+msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"%s: không mở được %s, vì thế không thực hiện được phép chuyển UUID và NHÃN.\n"
+
+#: mount/mount_by_label.c:315
+#, c-format
+msgid "%s: bad UUID"
+msgstr "%s: UUID xấu"
+
+#: mount/mount.c:382
+#, c-format
+msgid "mount: according to mtab, %s is already mounted on %s"
+msgstr "mount: theo như mtab thì %s đã gắn vào %s"
+
+#: mount/mount.c:387
+#, c-format
+msgid "mount: according to mtab, %s is mounted on %s"
+msgstr "mount: theo như mtab thì %s đã gắn vào %s"
+
+#: mount/mount.c:407
+#, c-format
+msgid "mount: can't open %s for writing: %s"
+msgstr "mount: không mở được %s để ghi nhớ: %s"
+
+#: mount/mount.c:424 mount/mount.c:677
+#, c-format
+msgid "mount: error writing %s: %s"
+msgstr "mount: lỗi ghi nhớ %s: %s"
+
+#: mount/mount.c:432
+#, c-format
+msgid "mount: error changing mode of %s: %s"
+msgstr "mount: lỗi thay đổi chế độ của %s: %s"
+
+#: mount/mount.c:483
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr "%s có vẻ là không gian swap - không gắn"
+
+#: mount/mount.c:570
+msgid "mount failed"
+msgstr "mount (gắn) không thành công"
+
+#: mount/mount.c:572
+#, c-format
+msgid "mount: only root can mount %s on %s"
+msgstr "mount: chỉ người dùng root có quyền gắn %s vào %s"
+
+#: mount/mount.c:600
+msgid "mount: loop device specified twice"
+msgstr "mount: chỉ ra thiết bị loop hai lần"
+
+#: mount/mount.c:605
+msgid "mount: type specified twice"
+msgstr "mount: chỉ ra loại hệ thống tập tin hai lần"
+
+#: mount/mount.c:617
+#, c-format
+msgid "mount: skipping the setup of a loop device\n"
+msgstr "mount: bỏ qua việc cấu hình thiết bị loop\n"
+
+#: mount/mount.c:626
+#, c-format
+msgid "mount: going to use the loop device %s\n"
+msgstr "mount: sẽ sử dụng thiết bị loop %s\n"
+
+#: mount/mount.c:631
+#, c-format
+msgid "mount: failed setting up loop device\n"
+msgstr "mount: thiết lập thiết bị loop không thành công\n"
+
+#: mount/mount.c:635
+#, c-format
+msgid "mount: setup loop device successfully\n"
+msgstr "mount: thiết lập thiết bị loop thành công\n"
+
+#: mount/mount.c:672
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: không mở được %s: %s"
+
+#: mount/mount.c:693
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: tham số cho -p hoặc --pass-fd phải là một số"
+
+#: mount/mount.c:706
+#, c-format
+msgid "mount: cannot open %s for setting speed"
+msgstr "mount: không mở được %s để đặt tốc độ"
+
+#: mount/mount.c:709
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: không đặt được tốc độ: %s"
+
+#: mount/mount.c:763 mount/mount.c:1339
+#, c-format
+msgid "mount: cannot fork: %s"
+msgstr "mount: không thể phân nhánh %s"
+
+#: mount/mount.c:885
+#, c-format
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: gắn nfs phiên bản 4 không thành công, đang thử 3..\n"
+
+#: mount/mount.c:895
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: không thể nhận ra loại hệ thống tập tin, và người dùng không chỉ ra "
+"loại nào"
+
+#: mount/mount.c:898
+msgid "mount: you must specify the filesystem type"
+msgstr "mount: cần chỉ rõ loại hệ thống tập tin"
+
+#: mount/mount.c:901
+msgid "mount: mount failed"
+msgstr "mount: gắn không thành công"
+
+#: mount/mount.c:907 mount/mount.c:942
+#, c-format
+msgid "mount: mount point %s is not a directory"
+msgstr "mount: điểm gắn %s không phải là một thư mục"
+
+#: mount/mount.c:909
+msgid "mount: permission denied"
+msgstr "mount: không đủ quyền hạn"
+
+#: mount/mount.c:911
+msgid "mount: must be superuser to use mount"
+msgstr "mount: cần phải là người dùng root để sử dụng mount"
+
+#: mount/mount.c:915 mount/mount.c:919
+#, c-format
+msgid "mount: %s is busy"
+msgstr "mount: %s đang bận"
+
+#: mount/mount.c:921
+msgid "mount: proc already mounted"
+msgstr "mount: đã gắn proc"
+
+#: mount/mount.c:923
+#, c-format
+msgid "mount: %s already mounted or %s busy"
+msgstr "mount: đã gắn %s hoặc %s đang bận"
+
+#: mount/mount.c:929
+#, c-format
+msgid "mount: mount point %s does not exist"
+msgstr "mount: điểm gắn %s không tồn tại"
+
+#: mount/mount.c:931
+#, c-format
+msgid "mount: mount point %s is a symbolic link to nowhere"
+msgstr "mount: điểm gắn %s là một liên kết mềm không chỉ tới đâu"
+
+#: mount/mount.c:934
+#, c-format
+msgid "mount: special device %s does not exist"
+msgstr "mount: thiết bị %s không tồn tại"
+
+#: mount/mount.c:944
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+"       (a path prefix is not a directory)\n"
+msgstr ""
+"mount: thiết bị %s không tồn tại\n"
+"       (tiền tố của đường dẫn không phải là một thư mục)\n"
+
+#: mount/mount.c:957
+#, c-format
+msgid "mount: %s not mounted already, or bad option"
+msgstr "mount: %s chưa gắn, hoặc tùy chọn xấu"
+
+#: mount/mount.c:959
+#, c-format
+msgid ""
+"mount: wrong fs type, bad option, bad superblock on %s,\n"
+"       missing codepage or other error"
+msgstr ""
+"mount: sai dạng hệ thống tập tin, tùy chọn xấu, siêu khối (superblock) xấu "
+"trên %s,\n"
+"       thiếu bảng mã hoặc lỗi khác"
+
+#: mount/mount.c:969
+msgid ""
+"       (could this be the IDE device where you in fact use\n"
+"       ide-scsi so that sr0 or sda or so is needed?)"
+msgstr ""
+"      (có thể đây là thiết bị IDE mà trên thực tế sử dụng\n"
+"      ide-scsi vì thế cần sr0 hoặc sda hoặc tương tự?)"
+
+#: mount/mount.c:975
+msgid ""
+"       (aren't you trying to mount an extended partition,\n"
+"       instead of some logical partition inside?)"
+msgstr ""
+"       (có phải bạn đang cố gắn một phân vùng mở rộng,\n"
+"       chứ không phải một phân vùng lôgíc bên trong nó?)"
+
+#: mount/mount.c:992
+msgid ""
+"       In some cases useful info is found in syslog - try\n"
+"       dmesg | tail  or so\n"
+msgstr ""
+"      Trong một số trường hợp có thể tìm thấy thông tin có\n"
+"      ích trong syslog - hãy thử dmesg | tail hoặc tương tự\n"
+
+#: mount/mount.c:998
+msgid "mount table full"
+msgstr "đầy bảng gắn"
+
+#: mount/mount.c:1000
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s không đọc được siêu khối superblock"
+
+#: mount/mount.c:1004
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: không rõ thiết bị này"
+
+#: mount/mount.c:1009
+#, c-format
+msgid "mount: unknown filesystem type '%s'"
+msgstr "mount: không rõ loại hệ thống tập tin '%s'"
+
+#: mount/mount.c:1021
+#, c-format
+msgid "mount: probably you meant %s"
+msgstr "mount: có thể muốn đặt %s"
+
+#: mount/mount.c:1023
+msgid "mount: maybe you meant 'iso9660'?"
+msgstr "mount: có thể muốn đặt 'iso9660'?"
+
+#: mount/mount.c:1025
+msgid "mount: maybe you meant 'vfat'?"
+msgstr "mount: có thể muốn đặt 'vfat'?"
+
+#: mount/mount.c:1028
+#, c-format
+msgid "mount: %s has wrong device number or fs type %s not supported"
+msgstr "mount: %s có số thiết bị sai hoặc chưa hỗ trợ loại fs %s"
+
+#: mount/mount.c:1034
+#, c-format
+msgid "mount: %s is not a block device, and stat fails?"
+msgstr "mount: %s không phải là một thiết bị khối, và stat không thành công?"
+
+#: mount/mount.c:1036
+#, c-format
+msgid ""
+"mount: the kernel does not recognize %s as a block device\n"
+"       (maybe `insmod driver'?)"
+msgstr ""
+"mount: nhân không nhận ra thiết bị khối %s\n"
+"       (có thể thử `insmod driver'?)"
+
+#: mount/mount.c:1039
+#, c-format
+msgid "mount: %s is not a block device (maybe try `-o loop'?)"
+msgstr "mount: %s không phải là thiết bị khối (có thể hãy thử `-o loop'?)"
+
+#: mount/mount.c:1042
+#, c-format
+msgid "mount: %s is not a block device"
+msgstr "mount: %s không phải là thiết bị khối"
+
+#: mount/mount.c:1045
+#, c-format
+msgid "mount: %s is not a valid block device"
+msgstr "mount: %s không phải là thiết bị khối thích hợp"
+
+#: mount/mount.c:1048
+msgid "block device "
+msgstr "thiết bị khối"
+
+#: mount/mount.c:1050
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: không gắn được %s%s với chế độ chỉ đọc"
+
+#: mount/mount.c:1054
+#, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
+msgstr "mount: %s%s được bảo vệ khỏi ghi nhưng đưa ra cờ `-w' (write, ghi)"
+
+#: mount/mount.c:1071
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
+msgstr "mount: %s%s được bảo vệ khỏi ghi, đang gắn chỉ đọc"
+
+#: mount/mount.c:1170
+#, c-format
+msgid "mount: no type was given - I'll assume nfs because of the colon\n"
+msgstr "mount: không đưa ra loại fs - Coi như nfs vì có dấu hai chấm\n"
+
+#: mount/mount.c:1176
+#, c-format
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr "mount: không đưa ra loại fs - Coi như smbfs vì có // đằng trước\n"
+
+#: mount/mount.c:1193
+#, c-format
+msgid "mount: backgrounding \"%s\"\n"
+msgstr "mount: đưa ra nền sau \"%s\"\n"
+
+#: mount/mount.c:1204
+#, c-format
+msgid "mount: giving up \"%s\"\n"
+msgstr "mount: đang bỏ \"%s\"\n"
+
+#: mount/mount.c:1286
+#, c-format
+msgid "mount: %s already mounted on %s\n"
+msgstr "mount: đã gắn %s trên %s\n"
+
+#: mount/mount.c:1416
+#, c-format
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a [-t|-O] ...     : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"or move a subtree:\n"
+"       mount --move olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Sử dụng: mount -V                 : in ra phiên bản\n"
+"       mount -h                 : in ra trợ giúp này\n"
+"       mount                    : liệt kê hệ thống tập tin đã gắn\n"
+"       mount -l                 : như trên, bao gồm cả nhãn khối (volume)\n"
+"Tiếp theo là phần thông tin. Lần gắn ngay sau.\n"
+"Câu lệnh là `mount [-t fstype] thứ-gì-đó nơi-nào-đó'.\n"
+"Chi tiết tìm thấy trong /etc/fstab có thể bị bỏ đi.\n"
+"       mount -a [-t|-O] ...     : gắn mọi thứ từ /etc/fstab\n"
+"       mount thiết-bị             : gắn thiết-bị vào nơi đã biết\n"
+"       mount thư-mục          : gắn thiết bị đã biết vào thư-mục\n"
+"       mount -t loại thiết-bị thư-mục    : câu lệnh gắn một lần\n"
+"Chú ý rằng người dùng không thực sự gắn một thiết bị, mà gắn hệ thống\n"
+"tập tin (với loại chỉ ra) tìm thấy trên thiết bị.\n"
+"Người dùng còn có thể gắn cây thư mục đã gắn vào nơi khác:\n"
+"       mount --bind thưmục-cũ thưmục-mới\n"
+"hoặc di chuyển một cây thư mục con:\n"
+"       mount --move thưmục-cũ thưmục-mới\n"
+"Có thể chỉ ra thiết bị theo tên, ví dụ /dev/hda1 hoặc /dev/cdrom,\n"
+"hoặc theo nhãn bằng  -L tên-nhãn, hoặc theo uuid bằng  -U uuid .\n"
+"Những tùy chọn khácO: [-nfFrsvw] [-o tùy-chọn] [-p passwdfd].\n"
+"Để biết thêm thông tin hãy gõ lệnh man 8 mount .\n"
+
+#: mount/mount.c:1605
+msgid "mount: only root can do that"
+msgstr "mount: chỉ có root có quyền thực hiện"
+
+#: mount/mount.c:1610
+#, c-format
+msgid "mount: no %s found - creating it..\n"
+msgstr "mount: không tìm thấy %s - đang tạo..\n"
+
+#: mount/mount.c:1622
+msgid "mount: no such partition found"
+msgstr "mount: không tìm thấy phân vùng như vậy"
+
+#: mount/mount.c:1624
+#, c-format
+msgid "mount: mounting %s\n"
+msgstr "mount: đang gắn %s\n"
+
+#: mount/mount.c:1633
+msgid "nothing was mounted"
+msgstr "không gắn gì cả"
+
+#: mount/mount.c:1648
+#, c-format
+msgid "mount: cannot find %s in %s"
+msgstr "mount: không tìm thấy %s trong %s"
+
+#: mount/mount.c:1663
+#, c-format
+msgid "mount: can't find %s in %s or %s"
+msgstr "mount: không tìm thấy %s trong %s hoặc %s"
+
+#: mount/mount_guess_fstype.c:489
+#, c-format
+msgid "mount: error while guessing filesystem type\n"
+msgstr "mount: lỗi khi đoán loại hệ thống tập tin\n"
+
+#: mount/mount_guess_fstype.c:541
+#, c-format
+msgid "mount: you didn't specify a filesystem type for %s\n"
+msgstr "mount: người dùng chưa chỉ ra loại thiết bị tập tin cho %s\n"
+
+#: mount/mount_guess_fstype.c:544
+#, c-format
+msgid "       I will try all types mentioned in %s or %s\n"
+msgstr "      Sẽ thử tất cả mọi loại đề cập đến trong %s hay %s\n"
+
+#: mount/mount_guess_fstype.c:547
+#, c-format
+msgid "       and it looks like this is swapspace\n"
+msgstr "       và đây có vẻ là không gian swap\n"
+
+#: mount/mount_guess_fstype.c:549
+#, c-format
+msgid "       I will try type %s\n"
+msgstr "       Sẽ thử loại %s\n"
+
+#: mount/mount_guess_fstype.c:637
+#, c-format
+msgid "Trying %s\n"
+msgstr "Đang thử %s.\n"
+
+#: mount/nfsmount.c:235
+#, c-format
+msgid "mount: excessively long host:dir argument\n"
+msgstr "mount: tham số tênmáy:thưmục dài quá mức\n"
+
+#: mount/nfsmount.c:249
+#, c-format
+msgid "mount: warning: multiple hostnames not supported\n"
+msgstr "mount: cảnh báo: không hỗ trợ việc đưa ra nhiều tên máy\n"
+
+#: mount/nfsmount.c:254
+#, c-format
+msgid "mount: directory to mount not in host:dir format\n"
+msgstr "mount: thư mục để gắn tới không phải ở dạng tênmáy:thưmục\n"
+
+#: mount/nfsmount.c:265 mount/nfsmount.c:520
+#, c-format
+msgid "mount: can't get address for %s\n"
+msgstr "mount: không lấy được địa chỉ cho %s\n"
+
+#: mount/nfsmount.c:271
+#, c-format
+msgid "mount: got bad hp->h_length\n"
+msgstr "mount: nhận được hp->h_length xấu\n"
+
+#: mount/nfsmount.c:288
+#, c-format
+msgid "mount: excessively long option argument\n"
+msgstr "mount: tham số của tùy chọn quá dài\n"
+
+#: mount/nfsmount.c:380
+#, c-format
+msgid "Warning: Unrecognized proto= option.\n"
+msgstr "Cảnh báo: Không biết đến tùy chọn proto=.\n"
+
+#: mount/nfsmount.c:387
+#, c-format
+msgid "Warning: Option namlen is not supported.\n"
+msgstr "Cảnh báo: Không hỗ trợ tùy chọn namlen\n"
+
+#: mount/nfsmount.c:391
+#, c-format
+msgid "unknown nfs mount parameter: %s=%d\n"
+msgstr "tham số gắn nfs không biết đến: %s=%d\n"
+
+#: mount/nfsmount.c:425
+#, c-format
+msgid "Warning: option nolock is not supported.\n"
+msgstr "Cảnh báo: không hỗ trợ tùy chọn nolock\n"
+
+#: mount/nfsmount.c:430
+#, c-format
+msgid "unknown nfs mount option: %s%s\n"
+msgstr "không rõ tùy chọn gắn nfs: %s%s\n"
+
+#: mount/nfsmount.c:526
+#, c-format
+msgid "mount: got bad hp->h_length?\n"
+msgstr "mount: nhận được hp->h_length xấu?\n"
+
+#: mount/nfsmount.c:714
+#, c-format
+msgid "NFS over TCP is not supported.\n"
+msgstr "Không hỗ trợ NFS qua TCP.\n"
+
+#: mount/nfsmount.c:721
+msgid "nfs socket"
+msgstr "nfs socket"
+
+#: mount/nfsmount.c:725
+msgid "nfs bindresvport"
+msgstr "nfs bindresvport"
+
+#: mount/nfsmount.c:739
+msgid "nfs server reported service unavailable"
+msgstr "máy chủ nfs thông báo dịch vụ chưa sẵng sàng"
+
+#: mount/nfsmount.c:748
+#, c-format
+msgid "used portmapper to find NFS port\n"
+msgstr "sử dụng portmapper (sơ đồ cổng) để tìm cổng NFS\n"
+
+#: mount/nfsmount.c:752
+#, c-format
+msgid "using port %d for nfs deamon\n"
+msgstr "sử dụng cổng %d cho deamon nfs\n"
+
+#: mount/nfsmount.c:763
+msgid "nfs connect"
+msgstr "kết nối nfs"
+
+#: mount/nfsmount.c:850
+#, c-format
+msgid "unknown nfs status return value: %d"
+msgstr "không rõ giá trị trạng thái nfs: %d"
+
+#: mount/sundries.c:26
+msgid "bug in xstrndup call"
+msgstr "lỗi (bug) trong lời gọi xstrndup"
+
+#: mount/swapon.c:56
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p priority] special|LABEL=volume_name ...\n"
+"       %s [-s]\n"
+msgstr ""
+"sử dụng: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p ưu-tiên] special|LABEL=tên_volume ...\n"
+"       %s [-s]\n"
+
+#: mount/swapon.c:66
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
+msgstr ""
+"sử dụng: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
+
+#: mount/swapon.c:173 mount/swapon.c:265
+#, c-format
+msgid "%s on %s\n"
+msgstr "%s trên %s\n"
+
+#: mount/swapon.c:177 mount/swapon.c:243
+#, c-format
+msgid "%s: cannot find the device for %s\n"
+msgstr "%s: không tìm thấy thiết bị cho %s\n"
+
+#: mount/swapon.c:184
+#, c-format
+msgid "%s: cannot stat %s: %s\n"
+msgstr "%s: không thể stat %s: %s\n"
+
+#: mount/swapon.c:195
+#, c-format
+msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr "%s: cảnh báo: %s có quyền không bảo mật %04o, đề nghị dùng %04o\n"
+
+#: mount/swapon.c:207
+#, c-format
+msgid "%s: Skipping file %s - it appears to have holes.\n"
+msgstr "%s: Bỏ qua tập tin %s - nó có vẻ có lỗ hổng.\n"
+
+#: mount/swapon.c:275
+#, c-format
+msgid "Not superuser.\n"
+msgstr "Không phải người dùng root.\n"
+
+#: mount/swapon.c:309 mount/swapon.c:501
+#, c-format
+msgid "%s: cannot open %s: %s\n"
+msgstr "%s: không mở được %s: %s\n"
+
+#: mount/umount.c:49
+#, c-format
+msgid "umount: compiled without support for -f\n"
+msgstr "umount: không biên dịch hỗ trợ -f\n"
+
+#: mount/umount.c:139
+#, c-format
+msgid "umount: cannot fork: %s"
+msgstr "umount: không thể phân nhánh %s"
+
+#: mount/umount.c:171
+#, c-format
+msgid "host: %s, directory: %s\n"
+msgstr "host: %s, thư mục %s\n"
+
+#: mount/umount.c:191
+#, c-format
+msgid "umount: can't get address for %s\n"
+msgstr "umount: không lấy được địa chỉ cho %s\n"
+
+#: mount/umount.c:196
+#, c-format
+msgid "umount: got bad hostp->h_length\n"
+msgstr "umount: nhận hostp->h_length xấu\n"
+
+#: mount/umount.c:243
+#, c-format
+msgid "umount: %s: invalid block device"
+msgstr "umount: %s: thiết bị khối không đúng"
+
+#: mount/umount.c:245
+#, c-format
+msgid "umount: %s: not mounted"
+msgstr "umount: %s: chưa gắn"
+
+#: mount/umount.c:247
+#, c-format
+msgid "umount: %s: can't write superblock"
+msgstr "umount: %s: không thể ghi khối super"
+
+#: mount/umount.c:251
+#, c-format
+msgid "umount: %s: device is busy"
+msgstr "umount: %s: thiết bị đang bận"
+
+#: mount/umount.c:253
+#, c-format
+msgid "umount: %s: not found"
+msgstr "umount: %s: không tìm thấy"
+
+#: mount/umount.c:255
+#, c-format
+msgid "umount: %s: must be superuser to umount"
+msgstr "umount: %s: phải là người dùng root để bỏ gắn"
+
+#: mount/umount.c:257
+#, c-format
+msgid "umount: %s: block devices not permitted on fs"
+msgstr "umount: %s: thiết bị khối không cho phép trên fs"
+
+#: mount/umount.c:259
+#, c-format
+msgid "umount: %s: %s"
+msgstr "umount: %s: %s"
+
+#: mount/umount.c:313
+#, c-format
+msgid "no umount2, trying umount...\n"
+msgstr "không có umount2, đang thử umount..\n"
+
+#: mount/umount.c:329
+#, c-format
+msgid "could not umount %s - trying %s instead\n"
+msgstr "không bỏ gắn được %s - đang thử %s để thay thế\n"
+
+#: mount/umount.c:347
+#, c-format
+msgid "umount: %s busy - remounted read-only\n"
+msgstr "umount: %s bận - gắn lại chỉ đọc\n"
+
+#: mount/umount.c:357
+#, c-format
+msgid "umount: could not remount %s read-only\n"
+msgstr "umount: không thể gắn lại %s chỉ đọc\n"
+
+#: mount/umount.c:366
+#, c-format
+msgid "%s umounted\n"
+msgstr "%s đã bỏ gắn\n"
+
+#: mount/umount.c:464
+msgid "umount: cannot find list of filesystems to unmount"
+msgstr "umount: không tìm thấy danh sách hệ thống tập tin để bỏ gắn"
+
+#: mount/umount.c:494
+#, c-format
+msgid ""
+"Usage: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+msgstr ""
+"Sử dụng: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O tùychọn]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+
+#: mount/umount.c:546
+msgid "Cannot umount \"\"\n"
+msgstr "Không bỏ gắn được \"\"\n"
+
+#: mount/umount.c:552
+#, c-format
+msgid "Trying to umount %s\n"
+msgstr "Đang thử bỏ gắn %s\n"
+
+#: mount/umount.c:558
+#, c-format
+msgid "Could not find %s in mtab\n"
+msgstr "Không tìm thấy %s trong mtab\n"
+
+#: mount/umount.c:565
+#, c-format
+msgid "umount: %s is not mounted (according to mtab)"
+msgstr "umount: %s chưa gắn (theo mtab)"
+
+#: mount/umount.c:572
+#, c-format
+msgid "umount: it seems %s is mounted multiple times"
+msgstr "umount: có vẻ %s được gắn nhiều lần"
+
+#: mount/umount.c:585
+#, c-format
+msgid "umount: %s is not in the fstab (and you are not root)"
+msgstr "umount: %s không có trong fstab (và người dùng không phải là root)"
+
+#: mount/umount.c:589
+#, c-format
+msgid "umount: %s mount disagrees with the fstab"
+msgstr "umount: gắn %s không tương ứng fstab"
+
+#: mount/umount.c:630
+#, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: chỉ có %s có thể bỏ gắn %s từ %s"
+
+#: mount/umount.c:711
+msgid "umount: only root can do that"
+msgstr "umount: chỉ có root có quyền thực hiện"
+
+#: sys-utils/ctrlaltdel.c:27
+#, c-format
+msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
+msgstr "Phải là root để đặt tính năng của Ctrl-Alt-Del.\n"
+
+#: sys-utils/ctrlaltdel.c:42
+#, c-format
+msgid "Usage: ctrlaltdel hard|soft\n"
+msgstr "Sử dụng: ctrlaltdel hard|soft\n"
+
+#: sys-utils/cytune.c:115
+#, c-format
+msgid ""
+"File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Tập tin %s, Giá trị ngưỡng %lu, Số ký tự lớn nhất trong fifo là %d,\n"
+"và tốc độ truyền tải lớn nhất tính theo ký tự/giây là %f\n"
+
+#: sys-utils/cytune.c:126
+#, c-format
+msgid ""
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Tập tin %s, Giá trị ngưỡng %lu, và giá trị thời gian chờ %lu, Số ký tự lớn "
+"nhất trong fifo là %d,\n"
+"và tốc độ truyền tải lớn nhất tính theo ký tự/giây là %f\n"
+
+#: sys-utils/cytune.c:190
+#, c-format
+msgid "Invalid interval value: %s\n"
+msgstr "Giá trị khoảng thời gian không đúng: %s\n"
+
+#: sys-utils/cytune.c:198
+#, c-format
+msgid "Invalid set value: %s\n"
+msgstr "Giá trị đặt không đúng: %s\n"
+
+#: sys-utils/cytune.c:206
+#, c-format
+msgid "Invalid default value: %s\n"
+msgstr "Giá trị mặc định không đúng: %s\n"
+
+#: sys-utils/cytune.c:214
+#, c-format
+msgid "Invalid set time value: %s\n"
+msgstr "Giá trị đặt thời gian không đúng: %s\n"
+
+#: sys-utils/cytune.c:222
+#, c-format
+msgid "Invalid default time value: %s\n"
+msgstr "Giá trị thời gian mặc định không đúng: %s\n"
+
+#: sys-utils/cytune.c:239
+#, c-format
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Sử dụng: %s [-q [-i khoảngthờigian]] ([-s giátrị]|[-S giátrị]) ([-t giátrị]|"
+"[-T giátrị]) [-g|-G] tậptin [tậptin...]\n"
+
+#: sys-utils/cytune.c:251 sys-utils/cytune.c:270 sys-utils/cytune.c:290
+#: sys-utils/cytune.c:340
+#, c-format
+msgid "Can't open %s: %s\n"
+msgstr "Không mở được %s: %s\n"
+
+#: sys-utils/cytune.c:258
+#, c-format
+msgid "Can't set %s to threshold %d: %s\n"
+msgstr "Không đặt được %s cho ngưỡng %d: %s\n"
+
+#: sys-utils/cytune.c:277
+#, c-format
+msgid "Can't set %s to time threshold %d: %s\n"
+msgstr "Không đặt được %s cho ngưỡng thời gian %d: %s\n"
+
+#: sys-utils/cytune.c:295 sys-utils/cytune.c:352 sys-utils/cytune.c:383
+#, c-format
+msgid "Can't get threshold for %s: %s\n"
+msgstr "Không lấy được ngưỡng cho %s: %s\n"
+
+#: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
+#, c-format
+msgid "Can't get timeout for %s: %s\n"
+msgstr "Không lấy được thời gian chờ cho %s: %s\n"
+
+#: sys-utils/cytune.c:307
+#, c-format
+msgid "%s: %ld current threshold and %ld current timeout\n"
+msgstr "%s: %ld ngưỡng hiện thời và %ld thời gian chờ hiện thời\n"
+
+#: sys-utils/cytune.c:310
+#, c-format
+msgid "%s: %ld default threshold and %ld default timeout\n"
+msgstr "%s: %ld ngưỡng mặc định và %ld thời gian chờ mặc định\n"
+
+#: sys-utils/cytune.c:328
+msgid "Can't set signal handler"
+msgstr "Không lấy được trình điều khiển tín hiệu"
+
+#: sys-utils/cytune.c:332 sys-utils/cytune.c:367
+msgid "gettimeofday failed"
+msgstr "gettimeofday không thành công"
+
+#: sys-utils/cytune.c:345 sys-utils/cytune.c:377
+#, c-format
+msgid "Can't issue CYGETMON on %s: %s\n"
+msgstr "Không CYGETMON được trên %s: %s\n"
+
+#: sys-utils/cytune.c:419
+#, c-format
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu/%lu kýtự; fifo: %lu thresh, %lu tmout, %lu max, %lu "
+"bâygiờ\n"
+
+#: sys-utils/cytune.c:425
+#, c-format
+msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
+msgstr "   %f int/giây; %f rec, %f gửi (kýtự/giây)\n"
+
+#: sys-utils/cytune.c:430
+#, c-format
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu ints, %lu kýtự; fifo: %lu thresh, %lu tmout, %lu max, %lu bâygiờ\n"
+
+#: sys-utils/cytune.c:436
+#, c-format
+msgid "   %f int/sec; %f rec (char/sec)\n"
+msgstr "   %f int/giây; %f rec (kýtự/giây)\n"
+
+#: sys-utils/dmesg.c:56
+#, c-format
+msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
+msgstr "Sử dụng: %s [-c] [-n bậc] [ -s kíchthước_bộđệm]\n"
+
+#: sys-utils/flock.c:59
+#, c-format
+msgid "flock: unknown option, aborting.\n"
+msgstr "flock: tùy chọn không rõ, đang thoát.\n"
+
+#: sys-utils/flock.c:77
+#, fuzzy, c-format
+msgid ""
+"Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n"
+msgstr ""
+"Sử dụng câu lệnh flock [--shared | --timeout=?giây] têntậptin {arg arg...}\n"
+
+#: sys-utils/ipcrm.c:66
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "id sai: %s\n"
+
+#: sys-utils/ipcrm.c:84
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "không xóa bỏ được id %s (%s)\n"
+
+#: sys-utils/ipcrm.c:99
+#, c-format
+msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
+msgstr "không nên sử dụng: %s {shm | msg | sem} id ...\n"
+
+#: sys-utils/ipcrm.c:126
+#, c-format
+msgid "unknown resource type: %s\n"
+msgstr "dạng nguồn không rõ: %s\n"
+
+#: sys-utils/ipcrm.c:130
+#, c-format
+msgid "resource(s) deleted\n"
+msgstr "đã xóa (các) nguồn\n"
+
+#: sys-utils/ipcrm.c:140
+#, c-format
+msgid ""
+"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+msgstr ""
+"sử dụng: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+
+#: sys-utils/ipcrm.c:181
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: tùy chọn không cho phép -- %c\n"
+
+#: sys-utils/ipcrm.c:193
+#, c-format
+msgid "%s: illegal key (%s)\n"
+msgstr "%s: phím không cho phép (%s)\n"
+
+#: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
+msgid "permission denied for key"
+msgstr "không đủ quyền hạn cho chìa khóa"
+
+#: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
+msgid "already removed key"
+msgstr "đã xóa chìa khoá"
+
+#: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
+msgid "invalid key"
+msgstr "chìa khóa không đúng"
+
+#: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
+msgid "unknown error in key"
+msgstr "lỗi không rõ trong chìa khóa"
+
+#: sys-utils/ipcrm.c:241
+msgid "permission denied for id"
+msgstr "không đủ quyền hạn cho id"
+
+#: sys-utils/ipcrm.c:246
+msgid "invalid id"
+msgstr "id sai"
+
+#: sys-utils/ipcrm.c:251
+msgid "already removed id"
+msgstr "đã xóa id"
+
+#: sys-utils/ipcrm.c:256
+msgid "unknown error in id"
+msgstr "lỗi không rõ trong id"
+
+#: sys-utils/ipcrm.c:259
+#, c-format
+msgid "%s: %s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
+#: sys-utils/ipcrm.c:267
+#, c-format
+msgid "%s: unknown argument: %s\n"
+msgstr "%s: tham số không rõ: %s\n"
+
+#: sys-utils/ipcs.c:121
+#, c-format
+msgid "usage : %s -asmq -tclup \n"
+msgstr "sử dụng : %s -asmq -tclup \n"
+
+#: sys-utils/ipcs.c:122
+#, c-format
+msgid "\t%s [-s -m -q] -i id\n"
+msgstr "\t%s [-s -m -q] -i id\n"
+
+#: sys-utils/ipcs.c:123
+#, c-format
+msgid "\t%s -h for help.\n"
+msgstr "\t%s -h để xem trợ giúp.\n"
+
+#: sys-utils/ipcs.c:129
+#, c-format
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s cung cấp thông tin về phương tiện ipc cho những gì người dùng có truy cập "
+"đọc.\n"
+
+#: sys-utils/ipcs.c:131
+#, c-format
+msgid ""
+"Resource Specification:\n"
+"\t-m : shared_mem\n"
+"\t-q : messages\n"
+msgstr ""
+"Đặc điểm nguồn:\n"
+"\t-m : nguồn_chiasẻ\n"
+"\t-q : tinnhắn\n"
+
+#: sys-utils/ipcs.c:132
+#, c-format
+msgid ""
+"\t-s : semaphores\n"
+"\t-a : all (default)\n"
+msgstr ""
+"\t-s : cột đèn hiệu\n"
+"\t-a : tất cả (mặc định)\n"
+
+#: sys-utils/ipcs.c:133
+#, c-format
+msgid ""
+"Output Format:\n"
+"\t-t : time\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+msgstr ""
+"Định dạng kết quả đưa ra:\n"
+"\t-t : thời gian\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+
+#: sys-utils/ipcs.c:134
+#, c-format
+msgid ""
+"\t-l : limits\n"
+"\t-u : summary\n"
+msgstr ""
+"\t-l : giới hạn\n"
+"\t-u : tổng kết\n"
+
+#: sys-utils/ipcs.c:135
+#, c-format
+msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgstr "-i id [-s -q -m] : chi tiết về nguồn có tên id\n"
+
+#: sys-utils/ipcs.c:267
+#, c-format
+msgid "kernel not configured for shared memory\n"
+msgstr "nhân không cấu hình cho bộ nhớ chia sẻ\n"
+
+#: sys-utils/ipcs.c:273
+#, c-format
+msgid "------ Shared Memory Limits --------\n"
+msgstr "------ Giới hạn bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:278
+#, c-format
+msgid "max number of segments = %lu\n"
+msgstr "số đoạn lớn nhất = %lu\n"
+
+#: sys-utils/ipcs.c:280
+#, c-format
+msgid "max seg size (kbytes) = %lu\n"
+msgstr "kích thước đoạn lớn nhất (kbyte) = %lu\n"
+
+#: sys-utils/ipcs.c:282
+#, c-format
+msgid "max total shared memory (pages) = %lu\n"
+msgstr "tổng số bộ nhớ chia sẻ lớn nhất (tính theo trang) = %lu\n"
+
+#: sys-utils/ipcs.c:284
+#, c-format
+msgid "min seg size (bytes) = %lu\n"
+msgstr "kích thước đoạn nhỏ nhất (byte) = %lu\n"
+
+#: sys-utils/ipcs.c:289
+#, c-format
+msgid "------ Shared Memory Status --------\n"
+msgstr "------ Trạng thái bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:290
+#, c-format
+msgid "segments allocated %d\n"
+msgstr "%d đoạn đã phân phối\n"
+
+#: sys-utils/ipcs.c:291
+#, c-format
+msgid "pages allocated %ld\n"
+msgstr "%ld trang đã phân phối\n"
+
+#: sys-utils/ipcs.c:292
+#, c-format
+msgid "pages resident  %ld\n"
+msgstr "%ld trang nội trú\n"
+
+#: sys-utils/ipcs.c:293
+#, c-format
+msgid "pages swapped   %ld\n"
+msgstr "%ld trang đã đưa vào swap\n"
+
+#: sys-utils/ipcs.c:294
+#, c-format
+msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgstr "Hiệu suất swap: %ld lần thử\t %ld lần thành công\n"
+
+#: sys-utils/ipcs.c:299
+#, c-format
+msgid "------ Shared Memory Segment Creators/Owners --------\n"
+msgstr "------ Người tạo/Chủ sở hữu các đoạn của bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
+msgid "shmid"
+msgstr "shmid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:520 sys-utils/ipcs.c:538
+msgid "perms"
+msgstr "quyền hạn"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cuid"
+msgstr "cuid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cgid"
+msgstr "cgid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "uid"
+msgstr "uid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520
+msgid "gid"
+msgstr "gid"
+
+#: sys-utils/ipcs.c:305
+#, c-format
+msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
+msgstr "------ Gắn/Bỏ gắn/Thời gian thay đổi bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:306
+#, c-format
+msgid "%-10s %-10s %-20s %-20s %-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:538
+msgid "owner"
+msgstr "chủ sở hữu"
+
+#: sys-utils/ipcs.c:307
+msgid "attached"
+msgstr "đã gắn"
+
+#: sys-utils/ipcs.c:307
+msgid "detached"
+msgstr "đã bỏ gắn"
+
+#: sys-utils/ipcs.c:308
+msgid "changed"
+msgstr "đã thay đổi"
+
+#: sys-utils/ipcs.c:312
+#, c-format
+msgid "------ Shared Memory Creator/Last-op --------\n"
+msgstr "------ Bộ nhớ chia sẻ Người tạo/Thao tác cuối --------\n"
+
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
+#, c-format
+msgid "%-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:314
+msgid "cpid"
+msgstr "cpid"
+
+#: sys-utils/ipcs.c:314
+msgid "lpid"
+msgstr "lpid"
+
+#: sys-utils/ipcs.c:318
+#, c-format
+msgid "------ Shared Memory Segments --------\n"
+msgstr "------ Các đoạn bộ nhớ chia sẻ --------\n"
+
+#: sys-utils/ipcs.c:319
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
+msgid "key"
+msgstr "chìa khóa"
+
+#: sys-utils/ipcs.c:320
+msgid "bytes"
+msgstr "byte"
+
+#: sys-utils/ipcs.c:321
+msgid "nattch"
+msgstr "nattch"
+
+#: sys-utils/ipcs.c:321
+msgid "status"
+msgstr "trạng thái"
+
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:458 sys-utils/ipcs.c:460 sys-utils/ipcs.c:559
+#: sys-utils/ipcs.c:561 sys-utils/ipcs.c:563 sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:647 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:651 sys-utils/ipcs.c:675
+msgid "Not set"
+msgstr "Chưa đặt"
+
+#: sys-utils/ipcs.c:374
+msgid "dest"
+msgstr "đích"
+
+#: sys-utils/ipcs.c:375
+msgid "locked"
+msgstr "đã khóa"
+
+#: sys-utils/ipcs.c:395
+#, c-format
+msgid "kernel not configured for semaphores\n"
+msgstr "nhân không cấu hình cho đèn tín hiệu\n"
+
+#: sys-utils/ipcs.c:401
+#, c-format
+msgid "------ Semaphore Limits --------\n"
+msgstr "------ Giới hạn đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:405
+#, c-format
+msgid "max number of arrays = %d\n"
+msgstr "số dãy lớn nhất = %d\n"
+
+#: sys-utils/ipcs.c:406
+#, c-format
+msgid "max semaphores per array = %d\n"
+msgstr "số đèn hiện lớn nhất trên mỗi dãy = %d\n"
+
+#: sys-utils/ipcs.c:407
+#, c-format
+msgid "max semaphores system wide = %d\n"
+msgstr "số đèn hiện lớn nhất của cả hệ thống = %d\n"
+
+#: sys-utils/ipcs.c:408
+#, c-format
+msgid "max ops per semop call = %d\n"
+msgstr "số thao tác lớn nhất của mỗi lời gọi đèn hiệu = %d\n"
+
+#: sys-utils/ipcs.c:409
+#, c-format
+msgid "semaphore max value = %d\n"
+msgstr "giá trị đèn hiệu lớn nhất = %d\n"
+
+#: sys-utils/ipcs.c:413
+#, c-format
+msgid "------ Semaphore Status --------\n"
+msgstr "------ Trạng thái đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:414
+#, c-format
+msgid "used arrays = %d\n"
+msgstr "dãy đã sử dụng = %d\n"
+
+#: sys-utils/ipcs.c:415
+#, c-format
+msgid "allocated semaphores = %d\n"
+msgstr "đèn tín hiệu đã phân phối = %d\n"
+
+#: sys-utils/ipcs.c:419
+#, c-format
+msgid "------ Semaphore Arrays Creators/Owners --------\n"
+msgstr "------ Người tạo/Chủ sở hữu dãy đèn hiệu --------\n"
+
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
+msgid "semid"
+msgstr "semid"
+
+#: sys-utils/ipcs.c:425
+#, c-format
+msgid "------ Shared Memory Operation/Change Times --------\n"
+msgstr "------ Thao tác/Thời gian thay đổi bộ nhớ chia sẻ--------\n"
+
+#: sys-utils/ipcs.c:426
+#, c-format
+msgid "%-8s %-10s %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
+
+#: sys-utils/ipcs.c:427
+msgid "last-op"
+msgstr "thao tác cuối cùng"
+
+#: sys-utils/ipcs.c:427
+msgid "last-changed"
+msgstr "thay đổi cuối cùng"
+
+#: sys-utils/ipcs.c:434
+#, c-format
+msgid "------ Semaphore Arrays --------\n"
+msgstr "------ Dãy đèn tín hiệu --------\n"
+
+#: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:437
+msgid "nsems"
+msgstr "nsems"
+
+#: sys-utils/ipcs.c:496
+#, c-format
+msgid "kernel not configured for message queues\n"
+msgstr "nhân không cấu hình cho hàng đợi tin nhắn\n"
+
+#: sys-utils/ipcs.c:504
+#, c-format
+msgid "------ Messages: Limits --------\n"
+msgstr "------ Tin nhắn: Giới hạn --------\n"
+
+#: sys-utils/ipcs.c:505
+#, c-format
+msgid "max queues system wide = %d\n"
+msgstr "số hàng đợi lớn nhất của hệ thống = %d\n"
+
+#: sys-utils/ipcs.c:506
+#, c-format
+msgid "max size of message (bytes) = %d\n"
+msgstr "kích thước lớn nhất của tin nhắn (theo byte) = %d\n"
+
+#: sys-utils/ipcs.c:507
+#, c-format
+msgid "default max size of queue (bytes) = %d\n"
+msgstr "kích thước mặc định lớn nhất của hàng đợi (byte) = %d\n"
+
+#: sys-utils/ipcs.c:511
+#, c-format
+msgid "------ Messages: Status --------\n"
+msgstr "------ Tin nhắn: Trạng thái --------\n"
+
+#: sys-utils/ipcs.c:512
+#, c-format
+msgid "allocated queues = %d\n"
+msgstr "hàng đợi đã phân phối = %d\n"
+
+#: sys-utils/ipcs.c:513
+#, c-format
+msgid "used headers = %d\n"
+msgstr "phần đầu đã sử dụng = %d\n"
+
+#: sys-utils/ipcs.c:514
+#, c-format
+msgid "used space = %d bytes\n"
+msgstr "không gian đã sử dụng = %d byte\n"
+
+#: sys-utils/ipcs.c:518
+#, c-format
+msgid "------ Message Queues: Creators/Owners --------\n"
+msgstr "------ Hàng đợi: Người tạo/Chủ sở hữu --------\n"
+
+#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
+#: sys-utils/ipcs.c:538
+msgid "msqid"
+msgstr "msqid"
+
+#: sys-utils/ipcs.c:524
+#, c-format
+msgid "------ Message Queues Send/Recv/Change Times --------\n"
+msgstr "------ Hàng đợi tin nhắn Gửi/Nhận/Thời gian thay đổi --------\n"
+
+#: sys-utils/ipcs.c:525
+#, c-format
+msgid "%-8s %-10s %-20s %-20s %-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:526
+msgid "send"
+msgstr "gửi"
+
+#: sys-utils/ipcs.c:526
+msgid "recv"
+msgstr "nhận"
+
+#: sys-utils/ipcs.c:526
+msgid "change"
+msgstr "thay đổi"
+
+#: sys-utils/ipcs.c:530
+#, c-format
+msgid "------ Message Queues PIDs --------\n"
+msgstr "------ PID của hàng đợi tin nhắn --------\n"
+
+#: sys-utils/ipcs.c:532
+msgid "lspid"
+msgstr "lspid"
+
+#: sys-utils/ipcs.c:532
+msgid "lrpid"
+msgstr "lrpid"
+
+#: sys-utils/ipcs.c:536
+#, c-format
+msgid "------ Message Queues --------\n"
+msgstr "------ Hàng đợi tin nhắn --------\n"
+
+#: sys-utils/ipcs.c:537
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+
+#: sys-utils/ipcs.c:539
+msgid "used-bytes"
+msgstr "byte đã dùng"
+
+#: sys-utils/ipcs.c:539
+msgid "messages"
+msgstr "tin nhắn"
+
+#: sys-utils/ipcs.c:607
+#, c-format
+msgid ""
+"\n"
+"Shared memory Segment shmid=%d\n"
+msgstr ""
+"\n"
+"shmid của một đoạn bộ nhớ chia sẻ =%d\n"
+
+#: sys-utils/ipcs.c:608
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+
+#: sys-utils/ipcs.c:610
+#, c-format
+msgid "mode=%#o\taccess_perms=%#o\n"
+msgstr "chế_độ=%#o\tquyền_truy_cập=%#o\n"
+
+#: sys-utils/ipcs.c:612
+#, c-format
+msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+
+#: sys-utils/ipcs.c:615
+#, c-format
+msgid "att_time=%-26.24s\n"
+msgstr "att_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:617
+#, c-format
+msgid "det_time=%-26.24s\n"
+msgstr "det_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
+#, c-format
+msgid "change_time=%-26.24s\n"
+msgstr "change_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:634
+#, c-format
+msgid ""
+"\n"
+"Message Queue msqid=%d\n"
+msgstr ""
+"\n"
+"msqid của hàng đợi tin nhắn=%d\n"
+
+#: sys-utils/ipcs.c:635
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tchế_độ=%#o\n"
+
+#: sys-utils/ipcs.c:637
+#, c-format
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+
+#: sys-utils/ipcs.c:646
+#, c-format
+msgid "send_time=%-26.24s\n"
+msgstr "send_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:648
+#, c-format
+msgid "rcv_time=%-26.24s\n"
+msgstr "rcv_time=%-26.24s\n"
+
+#: sys-utils/ipcs.c:668
+#, c-format
+msgid ""
+"\n"
+"Semaphore Array semid=%d\n"
+msgstr ""
+"\n"
+"semid của dãy đèn tín hiệu=%d\n"
+
+#: sys-utils/ipcs.c:669
+#, c-format
+msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+
+#: sys-utils/ipcs.c:671
+#, c-format
+msgid "mode=%#o, access_perms=%#o\n"
+msgstr "chế_độ=%#o, quyền_truy_cập=%#o\n"
+
+#: sys-utils/ipcs.c:673
+#, c-format
+msgid "nsems = %ld\n"
+msgstr "nsems = %ld\n"
+
+#: sys-utils/ipcs.c:674
+#, c-format
+msgid "otime = %-26.24s\n"
+msgstr "otime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:676
+#, c-format
+msgid "ctime = %-26.24s\n"
+msgstr "ctime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:679
+msgid "semnum"
+msgstr "sốđèn"
+
+#: sys-utils/ipcs.c:679
+msgid "value"
+msgstr "giátrị"
+
+#: sys-utils/ipcs.c:679
+msgid "ncount"
+msgstr "ncount"
+
+#: sys-utils/ipcs.c:679
+msgid "zcount"
+msgstr "zcount"
+
+#: sys-utils/ipcs.c:679
+msgid "pid"
+msgstr "pid"
+
+#: sys-utils/rdev.c:69
+msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr "sử dụng: rdev [ -rv ] [ -o OFFSET ] [ HÌNHẢNH [ GIÁTRỊ [ OFFSET ] ] ]"
+
+#: sys-utils/rdev.c:70
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (hoặc rdev /linux, v.v...) hiển thị thiết bị ROOT hiện thời"
+
+#: sys-utils/rdev.c:71
+msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT thành /dev/hda2"
+
+#: sys-utils/rdev.c:72
+msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+msgstr "  rdev -R /dev/fd0 1              đặt ROOTFLAGS (trạng thái chỉ đọc)"
+
+#: sys-utils/rdev.c:73
+msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+msgstr "  rdev -r /dev/fd0 627            đặt kích thước RAMDISK"
+
+#: sys-utils/rdev.c:74
+msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+msgstr "  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE khởi động"
+
+#: sys-utils/rdev.c:75
+msgid "  rdev -o N ...                   use the byte offset N"
+msgstr "  -u, --unqote                  sử dụng bộ byte N"
+
+#: sys-utils/rdev.c:76
+msgid "  rootflags ...                   same as rdev -R"
+msgstr "  rootflags ...                   giống như rdev -R"
+
+#: sys-utils/rdev.c:77
+msgid "  ramsize ...                     same as rdev -r"
+msgstr "  ramsize ...                     giống như rdev -r"
+
+#: sys-utils/rdev.c:78
+msgid "  vidmode ...                     same as rdev -v"
+msgstr "  vidmode ...                     giống như rdev -v"
+
+#: sys-utils/rdev.c:79
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Chú ý: chế độ video là: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+
+#: sys-utils/rdev.c:80
+msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+msgstr "      hãy dùng -R 1 để gắn root chỉ đọc, -R 0 để đọc/ghi."
+
+#: sys-utils/rdev.c:247
+msgid "missing comma"
+msgstr "thiếu dấu phẩy"
+
+#: sys-utils/readprofile.c:72
+#, c-format
+msgid "out of memory"
+msgstr "không đủ bộ nhớ"
+
+#: sys-utils/readprofile.c:118
+#, c-format
+msgid ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile>  (defaults: \"%s\" and\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (default: \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
+"\t -i            print only info about the sampling step\n"
+"\t -v            print verbose data\n"
+"\t -a            print all symbols, even if count is 0\n"
+"\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
+"\t -r            reset all the counters (root only)\n"
+"\t -n            disable byte order auto-detection\n"
+"\t -V            print version and exit\n"
+msgstr ""
+"%s: Sử dụng: \"%s [tùy chọn]\n"
+"\t -m <mapfile>  (mặc định: \"%s\" và\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (mặc định: \"%s\")\n"
+"\t -M <mult>     đặt trình số nhân của xác lập thành <mult>\n"
+"\t -i            chỉ in ra thông tin về bước thử\n"
+"\t -v            in dữ liệu chi tiết\n"
+"\t -a            in mọi ký tự, kể cả nếu số đếm là 0\n"
+"\t -b            in ra số đếm histogram-bin riêng\n"
+"\t -s            in ra số đếm riêng trong hàm\n"
+"\t -r            đặt lại tất cả số đếm (chỉ root)\n"
+"\t -n            tắt bỏ việc tự động tìm ra thứ tự byte\n"
+"\t -V            in ra phiên bản và thoát\n"
+
+#: sys-utils/readprofile.c:197
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s phiên bản %s\n"
+
+#: sys-utils/readprofile.c:284
+#, c-format
+msgid "Sampling_step: %i\n"
+msgstr "Sampling_step: %i\n"
+
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
+#, c-format
+msgid "%s: %s(%i): wrong map line\n"
+msgstr "%s: %s(%i): sai dòng ánh xạ\n"
+
+#: sys-utils/readprofile.c:317
+#, c-format
+msgid "%s: can't find \"_stext\" in %s\n"
+msgstr "%s: không tìm thấy \"_stext\" trong %s\n"
+
+#: sys-utils/readprofile.c:343
+#, c-format
+msgid "%s: profile address out of range. Wrong map file?\n"
+msgstr "%s: địa chỉ của xác lập nằm ngoài phạm vi. Tập tin ánh xạ sai?\n"
+
+#: sys-utils/readprofile.c:401
+msgid "total"
+msgstr "tổng số"
+
+#: sys-utils/renice.c:68
+#, c-format
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"sử dụng: renice mứcđộ_ưutiên [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] người "
+"dùng ]\n"
+
+#: sys-utils/renice.c:97
+#, c-format
+msgid "renice: %s: unknown user\n"
+msgstr "renice: %s: người dùng không biết\n"
+
+#: sys-utils/renice.c:105
+#, c-format
+msgid "renice: %s: bad value\n"
+msgstr "renice: %s: giá trị xấu\n"
+
+#: sys-utils/renice.c:123 sys-utils/renice.c:135
+msgid "getpriority"
+msgstr "getpriority"
+
+#: sys-utils/renice.c:128
+msgid "setpriority"
+msgstr "setpriority"
+
+#: sys-utils/renice.c:139
+#, c-format
+msgid "%d: old priority %d, new priority %d\n"
+msgstr "%d: mức độ ưu tiên cũ %d, mới %d\n"
+
+#: sys-utils/setsid.c:26
+#, c-format
+msgid "usage: %s program [arg ...]\n"
+msgstr "sử dụng: %s chương trình [arg ...]\n"
+
+#: sys-utils/tunelp.c:75
+#, c-format
+msgid ""
+"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+msgstr ""
+"Sử dụng: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+
+#: sys-utils/tunelp.c:91
+msgid "malloc error"
+msgstr "lỗi malloc"
+
+#: sys-utils/tunelp.c:103
+#, c-format
+msgid "%s: bad value\n"
+msgstr "%s: giá trị xấu\n"
+
+#: sys-utils/tunelp.c:242
+#, c-format
+msgid "%s: %s not an lp device.\n"
+msgstr "%s: %s không phải là thiết bị lp.\n"
+
+#: sys-utils/tunelp.c:263
+#, c-format
+msgid "%s status is %d"
+msgstr "trạng thái %s là %d"
+
+#: sys-utils/tunelp.c:264
+#, c-format
+msgid ", busy"
+msgstr ", bận"
+
+#: sys-utils/tunelp.c:265
+#, c-format
+msgid ", ready"
+msgstr ", sẵn sàng"
+
+#: sys-utils/tunelp.c:266
+#, c-format
+msgid ", out of paper"
+msgstr ", không đủ trang"
+
+#: sys-utils/tunelp.c:267
+#, c-format
+msgid ", on-line"
+msgstr ", trực tuyến"
+
+#: sys-utils/tunelp.c:268
+#, c-format
+msgid ", error"
+msgstr ", lỗi"
+
+#: sys-utils/tunelp.c:285
+msgid "LPGETIRQ error"
+msgstr "lỗi LPGETIRQ"
+
+#: sys-utils/tunelp.c:291
+#, c-format
+msgid "%s using IRQ %d\n"
+msgstr "%s đang dùng IRQ %d\n"
+
+#: sys-utils/tunelp.c:293
+#, c-format
+msgid "%s using polling\n"
+msgstr "%s đang dùng polling\n"
+
+#: text-utils/col.c:153
+#, c-format
+msgid "col: bad -l argument %s.\n"
+msgstr "col: tham số -l xấu %s.\n"
+
+#: text-utils/col.c:535
+#, c-format
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "sử dụng: col [-bfpx] [-l nline]\n"
+
+#: text-utils/col.c:541
+#, c-format
+msgid "col: write error.\n"
+msgstr "col: lỗi ghi\n"
+
+#: text-utils/col.c:548
+#, c-format
+msgid "col: warning: can't back up %s.\n"
+msgstr "col: cảnh báo: không sao lưu được %s.\n"
+
+#: text-utils/col.c:549
+msgid "past first line"
+msgstr "đi qua dòng cuối cùng"
+
+#: text-utils/col.c:549
+msgid "-- line already flushed"
+msgstr "-- dòng đã san phẳng"
+
+#: text-utils/colcrt.c:97
+#, c-format
+msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "sử dụng: %s [ - ] [ -2 ] [ tập tin ... ]\n"
+
+#: text-utils/column.c:297
+msgid "line too long"
+msgstr "dòng quá dài"
+
+#: text-utils/column.c:374
+#, c-format
+msgid "usage: column [-tx] [-c columns] [file ...]\n"
+msgstr "sử dụng: column [-tx] [-c các-cột] [tập-tin ...]\n"
+
+#: text-utils/hexsyntax.c:82
+#, c-format
+msgid "hexdump: bad length value.\n"
+msgstr "hexdump: giá trị chiều dài xấu.\n"
+
+#: text-utils/hexsyntax.c:93
+#, c-format
+msgid "hexdump: bad skip value.\n"
+msgstr "hexdump: giá trị nhảy qua (skip) xấu.\n"
+
+#: text-utils/hexsyntax.c:131
+#, c-format
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f tậptin_fmt] [-n chiềudài] [-s nhảyqua] "
+"[tậptin ...]\n"
+
+#: text-utils/more.c:216
+#, c-format
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "sử dụng: %s [-dflpcsu] [+sốdòng | +/pattern] tên1 tên2 ...\n"
+
+#: text-utils/more.c:439
+#, c-format
+msgid "%s: unknown option \"-%c\"\n"
+msgstr "%s: không rõ tùy chọn \"-%c\"\n"
+
+#: text-utils/more.c:471
+#, c-format
+msgid ""
+"\n"
+"*** %s: directory ***\n"
+"\n"
+msgstr ""
+"\n"
+"*** %s: thư mục ***\n"
+"\n"
+
+#: text-utils/more.c:514
+#, c-format
+msgid ""
+"\n"
+"******** %s: Not a text file ********\n"
+"\n"
+msgstr ""
+"\n"
+"******** %s: Không phải tập tin văn bản ********\n"
+"\n"
+
+#: text-utils/more.c:617
+#, c-format
+msgid "[Use q or Q to quit]"
+msgstr "[Sử dụng q hoặc Q để thoát]"
+
+#: text-utils/more.c:709
+#, c-format
+msgid "--More--"
+msgstr "--Còn nữa--"
+
+#: text-utils/more.c:711
+#, c-format
+msgid "(Next file: %s)"
+msgstr "(Tập tin tiếp theo: %s)"
+
+#: text-utils/more.c:716
+#, c-format
+msgid "[Press space to continue, 'q' to quit.]"
+msgstr "[Nhấn phím trắng để tiếp tục, 'q' để thoát]"
+
+#: text-utils/more.c:1115
+#, c-format
+msgid "...back %d pages"
+msgstr "...quay lại %d trang"
+
+#: text-utils/more.c:1117
+msgid "...back 1 page"
+msgstr "...quay lại 1 trang"
+
+#: text-utils/more.c:1160
+msgid "...skipping one line"
+msgstr "...bỏ qua một dòng"
+
+#: text-utils/more.c:1162
+#, c-format
+msgid "...skipping %d lines"
+msgstr "...bỏ qua %d dòng"
+
+#: text-utils/more.c:1199
+msgid ""
+"\n"
+"***Back***\n"
+"\n"
+msgstr ""
+"\n"
+"***Quay lại***\n"
+"\n"
+
+#: text-utils/more.c:1237
+msgid ""
+"\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
+"Star (*) indicates argument becomes new default.\n"
+msgstr ""
+"\n"
+"Có thể thêm một tham số số nguyên vào trước hầu hết các câu lệnh.  Mặc định "
+"đặttrong dấu ngoặc đơn.\n"
+"Dấu sao (*) cho biết tham số sẽ thành mặc định mới.\n"
+
+#: text-utils/more.c:1244
+msgid ""
+"<space>                 Display next k lines of text [current screen size]\n"
+"z                       Display next k lines of text [current screen size]*\n"
+"<return>                Display next k lines of text [1]*\n"
+"d or ctrl-D             Scroll k lines [current scroll size, initially 11]*\n"
+"q or Q or <interrupt>   Exit from more\n"
+"s                       Skip forward k lines of text [1]\n"
+"f                       Skip forward k screenfuls of text [1]\n"
+"b or ctrl-B             Skip backwards k screenfuls of text [1]\n"
+"'                       Go to place where previous search started\n"
+"=                       Display current line number\n"
+"/<regular expression>   Search for kth occurrence of regular expression [1]\n"
+"n                       Search for kth occurrence of last r.e [1]\n"
+"!<cmd> or :!<cmd>       Execute <cmd> in a subshell\n"
+"v                       Start up /usr/bin/vi at current line\n"
+"ctrl-L                  Redraw screen\n"
+":n                      Go to kth next file [1]\n"
+":p                      Go to kth previous file [1]\n"
+":f                      Display current file name and line number\n"
+".                       Repeat previous command\n"
+msgstr ""
+"<space>                 Hiện k dòng văn bản tiếp theo [kích thước màn hình "
+"hiện thời]\n"
+"z                       Hiển thị k dòng văn bản tiếp theo [kích thước màn "
+"hình hiện thời]*\n"
+"<return>                Hiển thị k dòng văn bản tiếp theo [1]*\n"
+"d hoặc ctrl-D             Cuộn k dòng [kích thước cuộn hiện thời, ban đầu là "
+"11]*\n"
+"q hoặc Q hoặc <interrupt>   Thoát khỏi more\n"
+"s                       Bỏ qua k dòng văn bản [1]\n"
+"f                       Bỏ qua k màn hình văn bản [1]\n"
+"b hoặc ctrl-B             Nhảy ngược lại k màn hình văn bản [1]\n"
+"'                       Đi tới nơi trước khi bắt đầu tìm kiếm\n"
+"=                       Hiển thị số thứ tự dòng hiện thời\n"
+"/<biểu thức chính quy>   Tìm kiếm lần xuất hiện thứ k của biểu thức [1]\n"
+"n                       Tìm kiếm lần xuất hiện thứ k của biểu thức cuối cùng "
+"[1]\n"
+"!<cmd> hoặc :!<cmd>       Thực hiện <cmd> trong một shell con\n"
+"v                       Chạy /usr/bin/vi tại dòng hiện thời\n"
+"ctrl-L                  Vẽ lại màn hình\n"
+":n                      Đi tới tập tin thứ k tiếp theo [1]\n"
+":p                      Đi tới tập tin thứ k phía trước [1]\n"
+":f                      Hiển thị tên tập tin hiện thời và số thứ tự dòng\n"
+".                       Lặp lại câu lệnh vừa thực hiện\n"
+
+#: text-utils/more.c:1313 text-utils/more.c:1318
+#, c-format
+msgid "[Press 'h' for instructions.]"
+msgstr "[Hãy nhấn 'h' để xem chỉ dẫn.]"
+
+#: text-utils/more.c:1352
+#, c-format
+msgid "\"%s\" line %d"
+msgstr "\"%s\" dòng %d"
+
+#: text-utils/more.c:1354
+#, c-format
+msgid "[Not a file] line %d"
+msgstr "[Không phải tập tin] dòng %d"
+
+#: text-utils/more.c:1438
+msgid "  Overflow\n"
+msgstr "  Bị tràn\n"
+
+#: text-utils/more.c:1485
+msgid "...skipping\n"
+msgstr "...bỏ qua\n"
+
+#: text-utils/more.c:1514
+msgid "Regular expression botch"
+msgstr "Biểu thức chính quy không đẹp"
+
+#: text-utils/more.c:1526
+msgid ""
+"\n"
+"Pattern not found\n"
+msgstr ""
+"\n"
+"Không tìm thấy mẫu tìm kiếm\n"
+
+#: text-utils/more.c:1529 text-utils/pg.c:1125 text-utils/pg.c:1276
+msgid "Pattern not found"
+msgstr "Không tìm thấy mẫu tìm kiếm"
+
+#: text-utils/more.c:1590
+msgid "can't fork\n"
+msgstr "không phân nhánh được\n"
+
+#: text-utils/more.c:1629
+msgid ""
+"\n"
+"...Skipping "
+msgstr ""
+"\n"
+"...Bỏ qua "
+
+#: text-utils/more.c:1633
+msgid "...Skipping to file "
+msgstr "...Nhảy tới tập tin "
+
+#: text-utils/more.c:1635
+msgid "...Skipping back to file "
+msgstr "...Nhảy quay lại tập tin "
+
+#: text-utils/more.c:1913
+msgid "Line too long"
+msgstr "Dòng quá dài"
+
+#: text-utils/more.c:1956
+msgid "No previous command to substitute for"
+msgstr "Không có câu lệnh ngay trước để thay thế cho"
+
+#: text-utils/odsyntax.c:130
+#, c-format
+msgid "od: od(1) has been deprecated for hexdump(1).\n"
+msgstr "od: od(1) không tương thích cho hexdump(1).\n"
+
+#: text-utils/odsyntax.c:133
+#, c-format
+msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
+msgstr "od: tính tương thích với hexdump(1) không hỗ trợ tùy chọn -%c %s\n"
+
+#: text-utils/odsyntax.c:134
+msgid "; see strings(1)."
+msgstr "; hãy xem strings(1)."
+
+#: text-utils/parse.c:63
+#, c-format
+msgid "hexdump: can't read %s.\n"
+msgstr "hexdump: không đọc được %s.\n"
+
+#: text-utils/parse.c:68
+#, c-format
+msgid "hexdump: line too long.\n"
+msgstr "hexdump: dòng quá dài.\n"
+
+#: text-utils/parse.c:401
+#, c-format
+msgid "hexdump: byte count with multiple conversion characters.\n"
+msgstr "hexdump: số đếm byte với các ký tự đa chuyển đổi.\n"
+
+#: text-utils/parse.c:483
+#, c-format
+msgid "hexdump: bad byte count for conversion character %s.\n"
+msgstr "hexdump: số đếm byte xấu cho ký tự chuyển đổi %s.\n"
+
+#: text-utils/parse.c:490
+#, c-format
+msgid "hexdump: %%s requires a precision or a byte count.\n"
+msgstr "hexdump: %%s yêu cầu sự chính xác hoặc một số đếm byte.\n"
+
+#: text-utils/parse.c:496
+#, c-format
+msgid "hexdump: bad format {%s}\n"
+msgstr "hexdump: định dạng xấu {%s}\n"
+
+#: text-utils/parse.c:502
+#, c-format
+msgid "hexdump: bad conversion character %%%s.\n"
+msgstr "hexdump: ký tự chuyển đổi xấu %%%s.\n"
+
+#: text-utils/pg.c:237
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] "
+"[các_tậptin]\n"
+
+#: text-utils/pg.c:246
+#, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "%s: tùy chọn yêu cầu một tham số -- %s\n"
+
+#: text-utils/pg.c:254
+#, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: tùy chọn không cho phép -- %s\n"
+
+#: text-utils/pg.c:371
+msgid "...skipping forward\n"
+msgstr "...nhảy về trước\n"
+
+#: text-utils/pg.c:373
+msgid "...skipping backward\n"
+msgstr "...nhảy quay lại\n"
+
+#: text-utils/pg.c:395
+msgid "No next file"
+msgstr "Không có tập tin tiếp theo"
+
+#: text-utils/pg.c:399
+msgid "No previous file"
+msgstr "Không có tập tin trước"
+
+#: text-utils/pg.c:929
+#, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: Lỗi đọc từ tập tin %s\n"
+
+#: text-utils/pg.c:935
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr "%s: EOF (Kết thúc) không mong đợi trong tập tin %s\n"
+
+#: text-utils/pg.c:938
+#, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: Lỗi không rõ trong tập tin %s\n"
+
+#: text-utils/pg.c:1033
+#, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: Không tạo được tập tin tạm thời tempfile\n"
+
+#: text-utils/pg.c:1042 text-utils/pg.c:1217
+msgid "RE error: "
+msgstr "Lỗi RE: "
+
+#: text-utils/pg.c:1199
+msgid "(EOF)"
+msgstr "(Kết thúc tập tin)"
+
+#: text-utils/pg.c:1225
+msgid "No remembered search string"
+msgstr "Không có chuỗi tìm kiếm ghi nhớ nào"
+
+#: text-utils/pg.c:1308
+msgid "Cannot open "
+msgstr "Không mở được"
+
+#: text-utils/pg.c:1356
+msgid "saved"
+msgstr "đã ghi"
+
+#: text-utils/pg.c:1463
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ": !câulệnh không cho phép trong chế độ rflag.\n"
+
+#: text-utils/pg.c:1495
+msgid "fork() failed, try again later\n"
+msgstr "fork() không thành công, hãy thử lại sau\n"
+
+#: text-utils/pg.c:1700
+msgid "(Next file: "
+msgstr "(Tập tin tiếp theo: "
+
+#: text-utils/rev.c:113
+#, c-format
+msgid "Unable to allocate bufferspace\n"
+msgstr "Không thể phân phối không gian bộ đệm\n"
+
+#: text-utils/rev.c:156
+#, c-format
+msgid "usage: rev [file ...]\n"
+msgstr "sử dụng: rev [tậptin ...]\n"
+
+#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#, c-format
+msgid "Cannot open \"%s\" for read\n"
+msgstr "Không mở được \"%s\" để đọc\n"
+
+#: text-utils/tailf.c:93
+#, c-format
+msgid "Usage: tailf logfile\n"
+msgstr "Sử dụng: tailf tậptin_sựkiện\n"
+
+#: text-utils/ul.c:141
+#, c-format
+msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "sử dụng: %s [ -i ] [ -tTerm ] tậptin...\n"
+
+#: text-utils/ul.c:152
+#, c-format
+msgid "trouble reading terminfo"
+msgstr "có vấn đề khi đọc terminfo"
+
+#: text-utils/ul.c:242
+#, c-format
+msgid "Unknown escape sequence in input: %o, %o\n"
+msgstr "Chuỗi thoát không rõ trong dữ liệu vào: %o, %o\n"
+
+#: text-utils/ul.c:425
+#, c-format
+msgid "Unable to allocate buffer.\n"
+msgstr "Không phân phối được bộ đệm.\n"
+
+#: text-utils/ul.c:586
+#, c-format
+msgid "Input line too long.\n"
+msgstr "Dòng nhập vào quá dài.\n"
+
+#: text-utils/ul.c:599
+#, c-format
+msgid "Out of memory when growing buffer.\n"
+msgstr "Tràn bộ nhớ khi tăng buffer.\n"
+
+#~ msgid "Invalid number: %s\n"
+#~ msgstr "Số sai: %s\n"
+
+#~ msgid "Syntax error: '%s'\n"
+#~ msgstr "Lỗi cú pháp: '%s'\n"
+
+#~ msgid "No such parameter set: '%s'\n"
+#~ msgstr "Không có bộ tham số như vậy: '%s'\n"
+
+#~ msgid "   %s [ -p ] dev name\n"
+#~ msgstr "   %s [ -p ] dev name\n"
+
+#~ msgid ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+#~ msgstr ""
+#~ "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+
+#~ msgid "   %s [ -c | -y | -n | -d ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n | -d ] dev\n"
+
+#~ msgid "   %s [ -c | -y | -n ] dev\n"
+#~ msgstr "   %s [ -c | -y | -n ] dev\n"
+
+#~ msgid "version"
+#~ msgstr "phiên bản"
+
+#~ msgid "couldn't open /dev/urandom"
+#~ msgstr "không mở được /dev/urandom"
+
+#~ msgid "couldn't read random data from /dev/urandom"
+#~ msgstr "không đọc được dữ liệu xác suất từ /dev/urandom"
+
+#~ msgid "can't open %s for reading"
+#~ msgstr "không mở được %s để đọc"
+
+#~ msgid "can't stat(%s)"
+#~ msgstr "không stat(%s) được"
+
+#~ msgid "%s doesn't have the correct filemodes"
+#~ msgstr "%s không có chế độ tập tin đúng"
+
+#~ msgid "can't read data from %s"
+#~ msgstr "không đọc được dữ liệu từ %s"
+
+#~ msgid ""
+#~ "Too many users logged on already.\n"
+#~ "Try again later.\n"
+#~ msgstr ""
+#~ "Đã óc quá nhiều người dùng đăng nhập.\n"
+#~ "Hãy thử lại sau.\n"
+
+#~ msgid "You have too many processes running.\n"
+#~ msgstr "Bạn đang chạy quá nhiều tiến trình.\n"
+
+#~ msgid "The password must have at least 6 characters, try again.\n"
+#~ msgstr "Mật khẩu phải có gồm nhất 6 ký tự, hãy thử lại.\n"
+
+#~ msgid ""
+#~ "The password must contain characters out of two of the following\n"
+#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ "characters. See passwd(1) for more information.\n"
+#~ msgstr ""
+#~ "Mật khẩu phải gồm những ký tự của hai nhóm sau:  các chữ cái\n"
+#~ "thường và hoa; các chữ số và các ký tự không phải chữ cái và số.\n"
+#~ "Hãy xem passwd(1) để biết thêm thông tin.\n"
+
+#~ msgid "You cannot reuse the old password.\n"
+#~ msgstr "Không thể dùng lại mật khẩu cũ.\n"
+
+#~ msgid "Please don't use something like your username as password!\n"
+#~ msgstr "Đừng sử dụng những thứ như tên người dùng làm mật khẩu!\n"
+
+#~ msgid "Please don't use something like your realname as password!\n"
+#~ msgstr "Đừng sử dụng những thứ như tên thật làm mật khẩu!\n"
+
+#~ msgid "Usage: passwd [username [password]]\n"
+#~ msgstr "Sử dụng: passwd [tên-người-dùng [mật-khẩu]]\n"
+
+#~ msgid "Only root may use the one and two argument forms.\n"
+#~ msgstr "Chỉ có root mới có thể sử dụng các dạng một và hai tham số.\n"
+
+#~ msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+#~ msgstr "Sử dụng: passwd [-foqsvV] [người-dùng [mật-khẩu]]\n"
+
+#~ msgid "Can't exec %s: %s\n"
+#~ msgstr "Không thực hiện (exec) được %s: %s\n"
+
+#~ msgid "Cannot find login name"
+#~ msgstr "Không tìm thấy tên đăng nhập"
+
+#~ msgid "Only root can change the password for others.\n"
+#~ msgstr "Chỉ có root mới thay đổi được mật khẩu cho người dùng khác.\n"
+
+#~ msgid "Too many arguments.\n"
+#~ msgstr "Quá nhiều tham số.\n"
+
+#~ msgid "Can't find username anywhere. Is `%s' really a user?"
+#~ msgstr "Không tìm thấy tên người dùng. `%s' là một người dùng thật sự?"
+
+#~ msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+#~ msgstr ""
+#~ "Rất tiếc, chương trình chỉ có thể thay đổi mật khẩu nội bộ. Hãy dùng "
+#~ "yppasswd để thay thế."
+
+#~ msgid "UID and username does not match, imposter!"
+#~ msgstr "UID và tên người dùng không tương ứng, mạo danh!"
+
+#~ msgid "Changing password for %s\n"
+#~ msgstr "Đang thay đổi mật khẩu cho %s\n"
+
+#~ msgid "Enter old password: "
+#~ msgstr "Hãy nhập mật khẩu cũ: "
+
+#~ msgid "Illegal password, imposter."
+#~ msgstr "Mật khẩu không đúng, mạo danh."
+
+#~ msgid "Enter new password: "
+#~ msgstr "Hãy nhập mật khẩu mới: "
+
+#~ msgid "Password not changed."
+#~ msgstr "Mật khẩu chưa thay đổi."
+
+#~ msgid "Re-type new password: "
+#~ msgstr "Hãy nhập lại mật khẩu mới: "
+
+#~ msgid "You misspelled it. Password not changed."
+#~ msgstr "Hai lần nhập mật khẩu không trùng nhau. Mật khẩu chưa thay đổi."
+
+#~ msgid "password changed, user %s"
+#~ msgstr "Mật khẩu chưa thay đổi, người dùng %s."
+
+#~ msgid "ROOT PASSWORD CHANGED"
+#~ msgstr "MẬT KHẨU ROOT ĐÃ THAY ĐỔI"
+
+#~ msgid "password changed by root, user %s"
+#~ msgstr "mật khẩu thay đổi bởi root, người dùng %s"
+
+#~ msgid "calling setpwnam to set password.\n"
+#~ msgstr "đang gọi setpwnam để đặt mật khẩu.\n"
+
+#~ msgid "Password *NOT* changed.  Try again later.\n"
+#~ msgstr "Mật khẩu *CHƯA* thay đổi.  Hãy thử lại sau.\n"
+
+#~ msgid "Password changed.\n"
+#~ msgstr "Mật khẩu chưa thay đổi.\n"
+
+#~ msgid "mount: this version was compiled without support for the type `nfs'"
+#~ msgstr "mount: phiên bản này biên dịch không có hỗ trợ cho `nfs'"