summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2006-12-07 00:25:41 +0100
committerKarel Zak2006-12-07 00:25:41 +0100
commiteb63b9b8f4cecb34c2478282567862bc48ef256d (patch)
tree99243f8eecb44c2bb6a559982b99c680fcb649e7
parentImported from util-linux-2.9v tarball. (diff)
downloadkernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.tar.gz
kernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.tar.xz
kernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.zip
Imported from util-linux-2.10f tarball.
-rw-r--r--HISTORY88
-rw-r--r--INSTALL27
-rw-r--r--MAINTAINER2
-rw-r--r--MCONFIG26
-rw-r--r--Makefile41
-rw-r--r--README.clock39
-rw-r--r--VERSION1
-rw-r--r--clock/README.hwclock29
-rw-r--r--clock/clock-ppc.c459
-rw-r--r--clock/cmos.c5
-rw-r--r--clock/hwclock.835
-rw-r--r--clock/hwclock.c201
-rw-r--r--clock/kd.c15
-rw-r--r--clockB/Makefile31
-rw-r--r--clockB/directio.c727
-rw-r--r--clockB/hwclock.8599
-rw-r--r--clockB/hwclock.c1744
-rw-r--r--clockB/hwclock.h139
-rw-r--r--clockB/kd.c219
-rw-r--r--clockB/rtc.c425
-rw-r--r--clockB/shhopt.c467
-rw-r--r--clockB/shhopt.h33
-rw-r--r--clockB/util.c120
-rwxr-xr-xconfigure183
-rw-r--r--disk-utils/Makefile36
-rw-r--r--disk-utils/blockdev.c220
-rw-r--r--disk-utils/fdformat.c20
-rw-r--r--disk-utils/fsck.minix.c88
-rw-r--r--disk-utils/mkfs.bfs.848
-rw-r--r--disk-utils/mkfs.bfs.c284
-rw-r--r--disk-utils/mkfs.c14
-rw-r--r--disk-utils/mkfs.minix.844
-rw-r--r--disk-utils/mkfs.minix.c26
-rw-r--r--disk-utils/mkswap.831
-rw-r--r--disk-utils/mkswap.c166
-rw-r--r--disk-utils/raw.887
-rw-r--r--disk-utils/raw.c217
-rw-r--r--disk-utils/setfdprm.c23
-rw-r--r--fdisk/cfdisk.c13
-rw-r--r--fdisk/common.h1
-rw-r--r--fdisk/fdisk.811
-rw-r--r--fdisk/fdisk.c77
-rw-r--r--fdisk/fdisk.h5
-rw-r--r--fdisk/fdiskbsdlabel.c55
-rw-r--r--fdisk/fdiskbsdlabel.h2
-rw-r--r--fdisk/fdisksgilabel.c2
-rw-r--r--fdisk/fdisksunlabel.c2
-rw-r--r--fdisk/sfdisk.c25
-rw-r--r--games/Makefile1
-rw-r--r--games/banner.c2
-rw-r--r--kbd/kbdrate.83
-rw-r--r--kbd/kbdrate.c9
-rw-r--r--lib/README.widechar18
-rw-r--r--lib/err.c110
-rw-r--r--lib/err.h70
-rw-r--r--lib/errs.h16
-rw-r--r--lib/pathnames.h96
-rw-r--r--lib/widechar.h41
-rw-r--r--login-utils/Makefile4
-rw-r--r--login-utils/agetty.88
-rw-r--r--login-utils/agetty.c14
-rw-r--r--login-utils/chfn.c2
-rw-r--r--login-utils/chsh.c1
-rw-r--r--login-utils/login.110
-rw-r--r--login-utils/login.c41
-rw-r--r--login-utils/mesg.c2
-rw-r--r--login-utils/passwd.c2
-rw-r--r--login-utils/wall.c3
-rw-r--r--misc-utils/Makefile18
-rw-r--r--misc-utils/cal.15
-rw-r--r--misc-utils/cal.c23
-rwxr-xr-xmisc-utils/chkdupexe.pl11
-rw-r--r--misc-utils/ddate.c10
-rw-r--r--misc-utils/ddate.doc73
-rw-r--r--misc-utils/kill.c32
-rw-r--r--misc-utils/logger.116
-rw-r--r--misc-utils/logger.c7
-rw-r--r--misc-utils/look.16
-rw-r--r--misc-utils/look.c18
-rw-r--r--misc-utils/namei.c7
-rw-r--r--misc-utils/rename.140
-rw-r--r--misc-utils/rename.c97
-rw-r--r--misc-utils/setterm.11
-rw-r--r--misc-utils/setterm.c57
-rwxr-xr-xmisc-utils/sparc-solaris-hostid.sh13
-rw-r--r--misc-utils/tsort.c5
-rw-r--r--mount/Makefile16
-rw-r--r--mount/fstab.56
-rw-r--r--mount/fstab.c29
-rw-r--r--mount/fstab.h1
-rw-r--r--mount/linux_fs.h1
-rw-r--r--mount/losetup.c11
-rw-r--r--mount/mk_loop_h2
-rw-r--r--mount/mntent.c4
-rw-r--r--mount/mount.8264
-rw-r--r--mount/mount.c82
-rw-r--r--mount/mount_guess_fstype.c109
-rw-r--r--mount/realpath.c153
-rw-r--r--mount/realpath.h1
-rw-r--r--mount/sundries.c5
-rw-r--r--mount/umount.c38
-rw-r--r--mount/version.c2
-rw-r--r--po/Makefile4
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/cat-id-tbl.c3506
-rw-r--r--po/cs.po2359
-rw-r--r--po/de.po3277
-rw-r--r--po/fr.po4376
-rw-r--r--po/it.po8152
-rw-r--r--po/ja.po2983
-rw-r--r--po/nl.po3042
-rw-r--r--po/pt_BR.po3034
-rw-r--r--rescuept/README45
-rw-r--r--rescuept/rescuept.c117
-rw-r--r--sys-utils/Makefile9
-rw-r--r--sys-utils/ipcs.c40
-rw-r--r--sys-utils/readprofile.c17
-rw-r--r--sys-utils/tunelp.c19
-rwxr-xr-xtestincl28
-rw-r--r--text-utils/Makefile44
-rw-r--r--text-utils/col.c21
-rw-r--r--text-utils/colcrt.c44
-rw-r--r--text-utils/colrm.c52
-rw-r--r--text-utils/column.14
-rw-r--r--text-utils/column.c178
-rw-r--r--text-utils/more.c11
-rw-r--r--text-utils/rev.c36
-rw-r--r--text-utils/ul.c80
-rw-r--r--version.h3
129 files changed, 24555 insertions, 15695 deletions
diff --git a/HISTORY b/HISTORY
index c51c018e6..e89cbf655 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,88 @@
+util-linux 2.10f:
+
+* Security fix for mount (okir)
+* Avoid infinite loop in namei (Brett Wuth)
+* added clock-ppc.c (from Matsuura Takanori), not merged yet
+* deleted clockB subdirectory
+* recognize mkdosfs string (Michal Svec)
+
+util-linux 2.10e:
+
+* New: rename
+* Added option to mkswap so that user can override pagesize
+* fdisk -l now reads /proc/partitions when no device was given
+* Fixed fdisk.8 (James Manning)
+* Added devpts info to mount.8 (Elrond)
+* Newline fix for logger output to stdout (Henri Spencer)
+
+util-linux 2.10d:
+
+* Do not try to mount something as udf without good reason
+* Do not loop in umount if there is a stale lock file
+* Allow fdisk twice as many cylinders
+* Fixed non-casefolding search in look (Markus Demleitner)
+
+util-linux 2.10c:
+
+* Various compilation fixes
+
+util-linux 2.10b:
+
+* Fixed smbmount problem (Andrew Tridgell)
+* Fixed ddate problem with the day after St. Tib's Day (Brad)
+* German messages (Elrond)
+* Made kill a bit more standard compliant
+* Made some more programs output a version
+
+util-linux 2.10a:
+
+* Japanese messages (Daisuke Yamashita)
+* French messages and several Debian fixes (Vincent Renardias)
+* Fixed infinite loop in mkfs.minix
+
+util-linux 2.10:
+
+* Added BSD disklabel code to rescuept
+* Added blockdev utility
+* Fix losetup return code
+* Fix unit display in cfdisk
+* Do not redefine _PATH_MAILDIR (so that recent systems can have /var/mail)
+* Added --localtime option to hwclock;
+ added third line (LOCAL/UTC) to /etc/adjtime.
+* Add -H option to agetty (David Holland)
+
+util-linux 2.9z:
+
+* Japanese messages (Daisuke Yamashita)
+* Czech messages (Jiri Pavlovsky)
+* Added some udf stuff to mount.8
+* Added ioctl for fdisk on bsdlabels
+
+util-linux 2.9y:
+
+* Wide character support (Bruno Haible)
+* German messages and some small fixes (Elrond)
+* Small fix to owner mount option (Erik Troan)
+* Don't sleep so long in clock/kd.c (Christian T. Steigies)
+
+util-linux 2.9x:
+
+* German messages and a i18n fix (Elrond)
+* mount option: allow the owner to mount a device (RedHat)
+* ugly: let login open console with O_NONBLOCK (Maciej W. Rozycki)
+* UGLY: let login ignore mail that is precisely 523 bytes long (RedHat)
+* added mkfs.bfs, mkfs.bfs.8
+* mount now recognizes qnx4 and bfs partitions
+* rescuept now recognizes Unixware partitions
+* hwclock fix on m68k (Roman Hodek)
+* several minor things
+
+util-linux 2.9w:
+
+* Updated mount.8 (Yann Droneaud)
+* Improved makefiles
+* Fixed flaw in fdisk
+
util-linux 2.9v:
* cfdisk no longer believes the kernel's HDGETGEO
@@ -31,6 +116,7 @@ util-linux 2.9t:
util-linux 2.9s:
* tunelp patch (Andrea Arcangeli)
+* fixed mount race (HJLu)
* German messages (Elrond)
util-linux 2.9[pqr]:
@@ -66,8 +152,8 @@ util-linux 2.9l:
util-linux 2.9k:
* major reshuffle of hwclock stuff; added sparc and alpha code
+* fdisk fix
* tiny shutdown fix
-* tiny fdisk fix
util-linux 2.9j:
diff --git a/INSTALL b/INSTALL
index 631d50f0c..2f960b1f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,8 +21,8 @@ WARNING: The simpleinit and some other programs in this package are
To install from source:
1) Get source distribution (see the .lsm file for locations)
-2) Untar util-linux-2.9X.tar.gz somewhere
-3) cd util-linux-2.9X
+2) Untar util-linux-2.10X.tar.gz somewhere
+3) cd util-linux-2.10X
4) Edit MCONFIG
5) ./configure
6) Look at defines.h and make_include, and edit if necessary
@@ -37,15 +37,30 @@ To install from source:
If you have compilation problems: tell util-linux@math.uio.no about it.
-Users of libc 5.4.46 may get warnings like
+A glibc header bug causes
+ /usr/include/bits/string2.h:419: warning: pointer of type `void *'
+ used in arithmetic
+This is harmless.
+
+Users of libc5 may get warnings like
/usr/include/linux/byteorder/swab.h:100: warning: no previous prototype for `__fswab16'
-that they'll have to ignore. The Linux kernel includes are not meant to be included
-in user programs, but libc5 does precisely that and is inherently broken.
+that they'll have to ignore. The Linux kernel includes are not meant to be
+included in user programs, but libc5 does precisely that and is inherently
+broken.
-Some old libc have complaints like
+Several old libc have complaints like
/usr/include/sys/syslog.h:71: warning: missing braces around initializer
+ /usr/include/rpc/xdr.h:103: warning: function declaration isn't a prototype
+ /usr/include/rpc/auth.h:86: warning: function declaration isn't a prototype
+ /usr/include/rpc/svc.h:79: warning: function declaration isn't a prototype
Also this is a libc/include problem.
+Warnings like
+ <sys/mman.h>:11: warning: `MAP_FILE' redefined
+ <asm/mman.h>:30: warning: this is the location of the previous definition
+are caused by the libc/kernel combination.
+
+All such warnings are harmless.
There should be no compilation errors.
diff --git a/MAINTAINER b/MAINTAINER
new file mode 100644
index 000000000..5cd7a84e9
--- /dev/null
+++ b/MAINTAINER
@@ -0,0 +1,2 @@
+Maintainer: Andries Brouwer (aeb@cwi.nl)
+Maintainer address: util-linux@math.uio.no
diff --git a/MCONFIG b/MCONFIG
index 58112ddf1..4afbfe0e6 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -8,7 +8,7 @@
# - define DESTDIR
# Select for CPU one of intel, alpha, sparc, arm, m68k, mips
-CPU=$(shell uname -m | sed s/i.86/intel/)
+CPU=$(shell uname -m | sed 's/i.86/intel/;s/arm.*/arm/')
# define where is locale directrory (default /usr/share/locale)
LOCALEDIR=/usr/share/locale
@@ -74,25 +74,36 @@ HAVE_RESET=yes
# sln also comes with libc and glibc.
HAVE_SLN=no
-CC= gcc
+# If HAVE_TSORT is set to "yes", then tsort won't be installed.
+# GNU textutils 2.0 includes tsort.
+HAVE_TSORT=no
+
+# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
+HAVE_FDUTILS=no
+
+# Get CC from environment if defined
+ifeq "$(CC)" ""
+ CC= gcc
+endif
# Different optimizations for different cpus.
ifeq "$(CPU)" "intel"
OPT= -pipe -O2 -m486 -fomit-frame-pointer
else
ifeq "$(CPU)" "arm"
- OPT= -O2 -m3 -fomit-frame-pointer
+ OPT= -pipe -O2 -fsigned-char -fomit-frame-pointer
else
OPT= -O2 -fomit-frame-pointer
endif
endif
-ERR_O=$(LIB)/err.o
+LDFLAGS = -s
+
+WARNFLAGS = -Wall
LIB=../lib
-LDFLAGS = -s
-WARNFLAGS = -Wall
+ERR_O=$(LIB)/err.o
CFLAGS = $(OPT) -I. -I$(LIB) $(WARNFLAGS) \
$(CURSESFLAGS) $(SLANGFLAGS) \
@@ -141,6 +152,9 @@ FSCKDIR= $(SBINDIR)
# Directory for passwd
PASSWDDIR= $(USRBINDIR)
+# Directory for help file for more. Some may want /usr/share/misc .
+MOREHELPDIR= $(USRLIBDIR)
+
# Modes
DIRMODE= 755
BINMODE= 755
diff --git a/Makefile b/Makefile
index 09571b2c8..d9c653f49 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,6 @@
# May be distributed under the terms of the GNU GPL.
#
-VERSION=2.9
-
include ./make_include
include ./MCONFIG
@@ -24,7 +22,7 @@ SUBDIRS=po \
text-utils \
kbd
-.PHONEY: all install clean
+.PHONEY: all install clean now
all: defines.h
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
@@ -33,6 +31,12 @@ all: defines.h
defines.h make_include:
./configure
+now:
+ touch defines.h
+
+$(SUBDIRS): defines.h now
+ cd $@ && $(MAKE)
+
install:
@if [ "`whoami`" = "root" ]; then umask 022; fi
@for subdir in $(SUBDIRS); do \
@@ -49,17 +53,20 @@ distclean: make_include clean
cd po && make distclean
-rm -f defines.h make_include
-dist:
- (cd /tmp; \
- rm -rf /tmp/util-linux-$(VERSION); \
- cvs export -fNd util-linux-$(VERSION) -r HEAD util-linux; \
- cd util-linux-$(VERSION); \
- find -type d | xargs chmod 755; \
- find -type f | xargs chmod 644; \
- find -type d | xargs chown root:root; \
- find -type f | xargs chown root:root; \
- cd ..; \
- GZIP=-9 tar cvvzf util-linux-$(VERSION).tar.gz util-linux-$(VERSION); \
- cp -p util-linux-$(VERSION)/LSM util-linux-$(VERSION).lsm; \
- cp -p util-linux-$(VERSION)/ANNOUNCE util-linux-$(VERSION).Announce; \
- echo Done.)
+#
+# dist:
+# (cd /tmp; \
+# rm -rf /tmp/util-linux-$(VERSION); \
+# cvs export -fNd util-linux-$(VERSION) -r HEAD util-linux; \
+# cd util-linux-$(VERSION); \
+# find -type d | xargs chmod 755; \
+# find -type f | xargs chmod 644; \
+# find -type d | xargs chown root:root; \
+# find -type f | xargs chown root:root; \
+# cd ..; \
+# GZIP=-9 tar cvvzf util-linux-$(VERSION).tar.gz util-linux-$(VERSION); \
+# cp -p util-linux-$(VERSION)/LSM util-linux-$(VERSION).lsm; \
+# cp -p util-linux-$(VERSION)/ANNOUNCE util-linux-$(VERSION).Announce; \
+# echo Done.)
+#
+
diff --git a/README.clock b/README.clock
deleted file mode 100644
index a8cc98aad..000000000
--- a/README.clock
+++ /dev/null
@@ -1,39 +0,0 @@
-Util-linux has always had the clock program (by Charles Hedrick,
-Rob Hooft, Harald Koenig, Alan Modra).
-
-Slackware still uses the clock.c and clock.8 from util-linux-2.6
-(and calls the resulting source fragment clock-1.6.tar.gz).
-
-Bryan Henderson rewrote it, calling the result hwclock,
-and util-linux-2.6 has both clock.c and hwclock.c,
-util-linux-2.7 and later only have hwclock.c.
-
-Unfortunately, hwclock.c was broken in various ways, especially
-on non-intel hardware, and distributions started shipping private
-versions (usually derived from the old clock).
-
-For util-linux-2.9k Andries Brouwer took all clock versions around,
-and merged them. The resulting hwclock program works on all architectures.
-There are some kernel bugs in the handling of /dev/rtc on some i386 hardware,
-so under certain circumstances where hwclock fails one has to give it the
---directisa flag to let hwclock do the clock access itself (which works)
-rather than leave it to the kernel. [The precise cause is still being
-investigated.]
-This is the code presently found in the clock subdirectory.
-
-Bryan Henderson took this code again and merged it with his original
-hwclock source. That is the code found in the util-linux-2.9q clock
-directory. Unfortunately, this new version didnt work on Sparcs
-and in util-linux-2.9r this code was moved to the clockB subdirectory.
-
-
-Executive summary:
-clock/hwclock is claimed to be good (but may need the --directisa flag).
-
-
-Comments, bug reports etc are welcome.
-Note that the source contains a rather detailed description of the clock
-hardware involved. Additions and corrections are welcome.
-
-Andries
-aeb@cwi.nl
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..3a5546227
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.10f
diff --git a/clock/README.hwclock b/clock/README.hwclock
index 7d2f460dd..ba8bc44c3 100644
--- a/clock/README.hwclock
+++ b/clock/README.hwclock
@@ -2,21 +2,11 @@ Hwclock is a program that runs under Linux and sets and queries the
Hardware Clock, which is often called the Real Time Clock, RTC, or
CMOS clock.
-Hwclock is shipped with an ELF executable built for ISA (Intel)
-machines. So there is nothing to build for those machines. Just
-install the executable file "hwclock" and the man page file
-"hwclock.8" in suitable directories (like /sbin/hwclock and
-/usr/man/man8/hwclock.8) and you're ready to go.
-
-hwclock accesses platform-dependent hardware, so if you have something
-other than an ISA machine, the shipped executable probably doesn't work,
-and you have to compile hwclock yourself.
-
Sometimes, you need to install hwclock setuid root. If you want users
other than the superuser to be able to display the clock value using the
direct ISA I/O method, install it setuid root. If you have the /dev/rtc
-interface on your system or are on a non-ISA system, there's no need for
-users to use the direct ISA I/O method, so don't bother.
+interface on your system or are on a non-ISA system, there's probably
+no need for users to use the direct ISA I/O method, so don't bother.
To install setuid root, do something like this:
@@ -32,15 +22,6 @@ If you want to build hwclock, just cd to the source directory and invoke
make with no parameters.
hwclock calls option processing routines in the libsshopt library,
-which is part of Sverre H. Huseby's "shhopt" package. An ELF
-executable of this library is included in the package, but you can use
-a copy that is already on your system by altering the make file. You
-can find a more authoritative copy of this library, and its source
-code, on sunsite (ftp://sunsite.unc.edu/pub/Linux/libs/shhopt-X.Y).
-
-As shipped, the routines are linked in statically, so you only need the
-libsshopt.a file to build hwclock, not to run it.
-
-
-
-
+which is part of Sverre H. Huseby's "shhopt" package. You
+can find a more authoritative copy of this package on metalab
+(ftp://metalab.unc.edu/pub/Linux/libs/shhopt-X.Y).
diff --git a/clock/clock-ppc.c b/clock/clock-ppc.c
new file mode 100644
index 000000000..6d8969adb
--- /dev/null
+++ b/clock/clock-ppc.c
@@ -0,0 +1,459 @@
+/*
+From t-matsuu@protein.osaka-u.ac.jp Sat Jan 22 13:43:20 2000
+Date: Sat, 22 Jan 2000 21:42:54 +0900 (JST)
+To: Andries.Brouwer@cwi.nl
+Subject: Please merge the source for PPC
+From: MATSUURA Takanori <t-matsuu@protein.osaka-u.ac.jp>
+
+Even now, it is used clock-1.1 based source on Linux for PowerPC
+architecture, attached on this mail.
+
+Please merge this source in main util-linux source.
+
+But I'm not an author of this source, but Paul Mackerras.
+http://linuxcare.com.au/paulus/
+shows details of him.
+
+MATSUURA Takanori @ Division of Protein Chemistry,
+ Institute for Protein Research, Osaka University, Japan
+E-Mail: t-matsuu@protein.osaka-u.ac.jp
+Web Page: http://www.protein.osaka-u.ac.jp/chemistry/matsuura/
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <time.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <sys/time.h>
+
+#include <asm/cuda.h>
+
+/*
+ * Adapted for Power Macintosh by Paul Mackerras.
+ */
+
+/* V1.0
+ * CMOS clock manipulation - Charles Hedrick, hedrick@cs.rutgers.edu, Apr 1992
+ *
+ * clock [-u] -r - read cmos clock
+ * clock [-u] -w - write cmos clock from system time
+ * clock [-u] -s - set system time from cmos clock
+ * clock [-u] -a - set system time from cmos clock, adjust the time to
+ * correct for systematic error, and put it back to the cmos.
+ * -u indicates cmos clock is kept in universal time
+ *
+ * The program is designed to run setuid, since we need to be able to
+ * write to the CUDA.
+ *
+ *********************
+ * V1.1
+ * Modified for clock adjustments - Rob Hooft, hooft@chem.ruu.nl, Nov 1992
+ * Also moved error messages to stderr. The program now uses getopt.
+ * Changed some exit codes. Made 'gcc 2.3 -Wall' happy.
+ *
+ * I think a small explanation of the adjustment routine should be given
+ * here. The problem with my machine is that its CMOS clock is 10 seconds
+ * per day slow. With this version of clock.c, and my '/etc/rc.local'
+ * reading '/etc/clock -au' instead of '/etc/clock -u -s', this error
+ * is automatically corrected at every boot.
+ *
+ * To do this job, the program reads and writes the file '/etc/adjtime'
+ * to determine the correction, and to save its data. In this file are
+ * three numbers:
+ *
+ * 1) the correction in seconds per day (So if your clock runs 5
+ * seconds per day fast, the first number should read -5.0)
+ * 2) the number of seconds since 1/1/1970 the last time the program was
+ * used.
+ * 3) the remaining part of a second which was leftover after the last
+ * adjustment
+ *
+ * Installation and use of this program:
+ *
+ * a) create a file '/etc/adjtime' containing as the first and only line:
+ * '0.0 0 0.0'
+ * b) run 'clock -au' or 'clock -a', depending on whether your cmos is in
+ * universal or local time. This updates the second number.
+ * c) set your system time using the 'date' command.
+ * d) update your cmos time using 'clock -wu' or 'clock -w'
+ * e) replace the first number in /etc/adjtime by your correction.
+ * f) put the command 'clock -au' or 'clock -a' in your '/etc/rc.local'
+ *
+ * If the adjustment doesn't work for you, try contacting me by E-mail.
+ *
+ ******
+ * V1.2
+ *
+ * Applied patches by Harald Koenig (koenig@nova.tat.physik.uni-tuebingen.de)
+ * Patched and indented by Rob Hooft (hooft@EMBL-Heidelberg.DE)
+ *
+ * A free quote from a MAIL-message (with spelling corrections):
+ *
+ * "I found the explanation and solution for the CMOS reading 0xff problem
+ * in the 0.99pl13c (ALPHA) kernel: the RTC goes offline for a small amount
+ * of time for updating. Solution is included in the kernel source
+ * (linux/kernel/time.c)."
+ *
+ * "I modified clock.c to fix this problem and added an option (now default,
+ * look for USE_INLINE_ASM_IO) that I/O instructions are used as inline
+ * code and not via /dev/port (still possible via #undef ...)."
+ *
+ * With the new code, which is partially taken from the kernel sources,
+ * the CMOS clock handling looks much more "official".
+ * Thanks Harald (and Torsten for the kernel code)!
+ *
+ ******
+ * V1.3
+ * Canges from alan@spri.levels.unisa.edu.au (Alan Modra):
+ * a) Fix a few typos in comments and remove reference to making
+ * clock -u a cron job. The kernel adjusts cmos time every 11
+ * minutes - see kernel/sched.c and kernel/time.c set_rtc_mmss().
+ * This means we should really have a cron job updating
+ * /etc/adjtime every 11 mins (set last_time to the current time
+ * and not_adjusted to ???).
+ * b) Swapped arguments of outb() to agree with asm/io.h macro of the
+ * same name. Use outb() from asm/io.h as it's slightly better.
+ * c) Changed CMOS_READ and CMOS_WRITE to inline functions. Inserted
+ * cli()..sti() pairs in appropriate places to prevent possible
+ * errors, and changed ioperm() call to iopl() to allow cli.
+ * d) Moved some variables around to localise them a bit.
+ * e) Fixed bug with clock -ua or clock -us that cleared environment
+ * variable TZ. This fix also cured the annoying display of bogus
+ * day of week on a number of machines. (Use mktime(), ctime()
+ * rather than asctime() )
+ * f) Use settimeofday() rather than stime(). This one is important
+ * as it sets the kernel's timezone offset, which is returned by
+ * gettimeofday(), and used for display of MSDOS and OS2 file
+ * times.
+ * g) faith@cs.unc.edu added -D flag for debugging
+ *
+ * V1.4: alan@SPRI.Levels.UniSA.Edu.Au (Alan Modra)
+ * Wed Feb 8 12:29:08 1995, fix for years > 2000.
+ * faith@cs.unc.edu added -v option to print version.
+ *
+ * August 1996 Tom Dyas (tdyas@eden.rutgers.edu)
+ * Converted to be compatible with the SPARC /dev/rtc driver.
+ *
+ */
+
+#define VERSION "1.4"
+
+/* Here the information for time adjustments is kept. */
+#define ADJPATH "/etc/adjtime"
+
+/* Apparently the RTC on PowerMacs stores seconds since 1 Jan 1904 */
+#define RTC_OFFSET 2082844800
+
+/* used for debugging the code. */
+/*#define KEEP_OFF */
+
+/* Globals */
+int readit = 0;
+int adjustit = 0;
+int writeit = 0;
+int setit = 0;
+int universal = 0;
+int debug = 0;
+
+time_t mkgmtime(struct tm *);
+
+volatile void
+usage ( void )
+{
+ (void) fprintf (stderr,
+ "clock [-u] -r|w|s|a|v\n"
+ " r: read and print CMOS clock\n"
+ " w: write CMOS clock from system time\n"
+ " s: set system time from CMOS clock\n"
+ " a: get system time and adjust CMOS clock\n"
+ " u: CMOS clock is in universal time\n"
+ " v: print version (" VERSION ") and exit\n"
+ );
+ exit(EXIT_FAILURE);
+}
+
+int adb_fd;
+
+void
+adb_init ( void )
+{
+ adb_fd = open ("/dev/adb", 2);
+ if (adb_fd < 0)
+ {
+ perror ("unable to open /dev/adb read/write : ");
+ exit(EXIT_FAILURE);
+ }
+}
+
+unsigned char get_packet[2] = { (unsigned char) CUDA_PACKET,
+ (unsigned char) CUDA_GET_TIME };
+unsigned char set_packet[6] = { (unsigned char) CUDA_PACKET,
+ (unsigned char) CUDA_SET_TIME };
+
+int
+main (int argc, char **argv )
+{
+ struct tm tm, *tmp;
+ time_t systime;
+ time_t last_time;
+ time_t clock_time;
+ int i, arg;
+ double factor;
+ double not_adjusted;
+ int adjustment = 0;
+ /* unsigned char save_control, save_freq_select; */
+ unsigned char reply[16];
+
+ while ((arg = getopt (argc, argv, "rwsuaDv")) != -1)
+ {
+ switch (arg)
+ {
+ case 'r':
+ readit = 1;
+ break;
+ case 'w':
+ writeit = 1;
+ break;
+ case 's':
+ setit = 1;
+ break;
+ case 'u':
+ universal = 1;
+ break;
+ case 'a':
+ adjustit = 1;
+ break;
+ case 'D':
+ debug = 1;
+ break;
+ case 'v':
+ (void) fprintf( stderr, "clock " VERSION "\n" );
+ exit(EXIT_SUCCESS);
+ default:
+ usage ();
+ }
+ }
+
+ /* If we are in MkLinux do not even bother trying to set the clock */
+ if(!access("/proc/osfmach3/version", R_OK))
+ { // We're running MkLinux
+ if ( readit | writeit | setit | adjustit )
+ printf("You must change the clock setting in MacOS.\n");
+ exit(0);
+ }
+
+ if (readit + writeit + setit + adjustit > 1)
+ usage (); /* only allow one of these */
+
+ if (!(readit | writeit | setit | adjustit)) /* default to read */
+ readit = 1;
+
+ adb_init ();
+
+ if (adjustit)
+ { /* Read adjustment parameters first */
+ FILE *adj;
+ if ((adj = fopen (ADJPATH, "r")) == NULL)
+ {
+ perror (ADJPATH);
+ exit(EXIT_FAILURE);
+ }
+ if (fscanf (adj, "%lf %d %lf", &factor, (int *) (&last_time),
+ &not_adjusted) < 0)
+ {
+ perror (ADJPATH);
+ exit(EXIT_FAILURE);
+ }
+ (void) fclose (adj);
+ if (debug) (void) printf(
+ "Last adjustment done at %d seconds after 1/1/1970\n",
+ (int) last_time);
+ }
+
+ if (readit || setit || adjustit)
+ {
+ int ii;
+
+ if (write(adb_fd, get_packet, sizeof(get_packet)) < 0) {
+ perror("write adb");
+ exit(EXIT_FAILURE);
+ }
+ ii = (int) read(adb_fd, reply, sizeof(reply));
+ if (ii < 0) {
+ perror("read adb");
+ exit(EXIT_FAILURE);
+ }
+ if (ii != 7)
+ (void) fprintf(stderr,
+ "Warning: bad reply length from CUDA (%d)\n", ii);
+ clock_time = (time_t) ((reply[3] << 24) + (reply[4] << 16)
+ + (reply[5] << 8)) + (time_t) reply[6];
+ clock_time -= RTC_OFFSET;
+
+ if (universal) {
+ systime = clock_time;
+ } else {
+ tm = *gmtime(&clock_time);
+ (void) printf("time in rtc is %s", asctime(&tm));
+ tm.tm_isdst = -1; /* don't know whether it's DST */
+ systime = mktime(&tm);
+ }
+ }
+
+ if (readit)
+ {
+ (void) printf ("%s", ctime (&systime ));
+ }
+
+ if (setit || adjustit)
+ {
+ struct timeval tv;
+ struct timezone tz;
+
+/* program is designed to run setuid, be secure! */
+
+ if (getuid () != 0)
+ {
+ (void) fprintf (stderr,
+ "Sorry, must be root to set or adjust time\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (adjustit)
+ { /* the actual adjustment */
+ double exact_adjustment;
+
+ exact_adjustment = ((double) (systime - last_time))
+ * factor / (24 * 60 * 60)
+ + not_adjusted;
+ if (exact_adjustment > 0.)
+ adjustment = (int) (exact_adjustment + 0.5);
+ else
+ adjustment = (int) (exact_adjustment - 0.5);
+ not_adjusted = exact_adjustment - (double) adjustment;
+ systime += adjustment;
+ if (debug) {
+ (void) printf ("Time since last adjustment is %d seconds\n",
+ (int) (systime - last_time));
+ (void) printf ("Adjusting time by %d seconds\n",
+ adjustment);
+ (void) printf ("remaining adjustment is %.3f seconds\n",
+ not_adjusted);
+ }
+ }
+#ifndef KEEP_OFF
+ tv.tv_sec = systime;
+ tv.tv_usec = 0;
+ tz.tz_minuteswest = timezone / 60;
+ tz.tz_dsttime = daylight;
+
+ if (settimeofday (&tv, &tz) != 0)
+ {
+ (void) fprintf (stderr,
+ "Unable to set time -- probably you are not root\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (debug) {
+ (void) printf( "Called settimeofday:\n" );
+ (void) printf( "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n",
+ tv.tv_sec, tv.tv_usec );
+ (void) printf( "\ttz.tz_minuteswest = %d, tz.tz_dsttime = %d\n",
+ tz.tz_minuteswest, tz.tz_dsttime );
+ }
+#endif
+ }
+
+ if (writeit || (adjustit && adjustment != 0))
+ {
+ systime = time (NULL);
+
+ if (universal) {
+ clock_time = systime;
+
+ } else {
+ tmp = localtime(&systime);
+ clock_time = mkgmtime(tmp);
+ }
+
+ clock_time += RTC_OFFSET;
+ set_packet[2] = clock_time >> 24;
+ set_packet[3] = clock_time >> 16;
+ set_packet[4] = clock_time >> 8;
+ set_packet[5] = (unsigned char) clock_time;
+
+ if (write(adb_fd, set_packet, sizeof(set_packet)) < 0) {
+ perror("write adb (set)");
+ exit(EXIT_FAILURE);
+ }
+ i = (int) read(adb_fd, reply, sizeof(reply));
+ if (debug) {
+ int j;
+ (void) printf("set reply %d bytes:", i);
+ for (j = 0; j < i; ++j)
+ (void) printf(" %.2x", (unsigned int) reply[j]);
+ (void) printf("\n");
+ }
+ if (i != 3 || reply[1] != (unsigned char) 0)
+ (void) fprintf(stderr, "Warning: error %d setting RTC\n",
+ (int) reply[1]);
+
+ if (debug) {
+ clock_time -= RTC_OFFSET;
+ (void) printf("set RTC to %s", asctime(gmtime(&clock_time)));
+ }
+ }
+ else
+ if (debug) (void) printf ("CMOS clock unchanged.\n");
+ /* Save data for next 'adjustit' call */
+ if (adjustit)
+ {
+ FILE *adj;
+ if ((adj = fopen (ADJPATH, "w")) == NULL)
+ {
+ perror (ADJPATH);
+ exit(EXIT_FAILURE);
+ }
+ (void) fprintf (adj, "%f %d %f\n", factor, (int) systime, not_adjusted);
+ (void) fclose (adj);
+ }
+ exit(EXIT_SUCCESS);
+}
+
+/* Stolen from linux/arch/i386/kernel/time.c. */
+/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
+ * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
+ * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
+ *
+ * [For the Julian calendar (which was used in Russia before 1917,
+ * Britain & colonies before 1752, anywhere else before 1582,
+ * and is still in use by some communities) leave out the
+ * -year/100+year/400 terms, and add 10.]
+ *
+ * This algorithm was first published by Gauss (I think).
+ *
+ * WARNING: this function will overflow on 2106-02-07 06:28:16 on
+ * machines were long is 32-bit! (However, as time_t is signed, we
+ * will already get problems at other places on 2038-01-19 03:14:08)
+ */
+time_t mkgmtime(struct tm *tm)
+{
+ int mon = tm->tm_mon + 1;
+ int year = tm->tm_year + 1900;
+
+ if (0 >= (int) (mon -= 2)) { /* 1..12 -> 11,12,1..10 */
+ mon += 12; /* Puts Feb last since it has leap day */
+ year -= 1;
+ }
+ return (((
+ (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12) +
+ tm->tm_mday + year*365 - 719499
+ )*24 + tm->tm_hour /* now have hours */
+ )*60 + tm->tm_min /* now have minutes */
+ )*60 + tm->tm_sec; /* finally seconds */
+}
diff --git a/clock/cmos.c b/clock/cmos.c
index 78d5dbb94..827ec54a9 100644
--- a/clock/cmos.c
+++ b/clock/cmos.c
@@ -146,8 +146,9 @@ set_cmos_epoch(int ARCconsole, int SRM) {
if (debug) printf (_("booted from MILO\n"));
}
- /* See whether we are dealing with a RUFFIAN aka UX, as they have REALLY
- different TOY (TimeOfYear) format: BCD, and not an ARC-style epoch.
+ /* See whether we are dealing with a RUFFIAN aka Alpha PC-164 UX (or BX),
+ as they have REALLY different TOY (TimeOfYear) format: BCD, and not
+ an ARC-style epoch.
BCD is detected dynamically, but we must NOT adjust like ARC. */
if (ARCconsole && is_in_cpuinfo("system type", "Ruffian")) {
ARCconsole = 0;
diff --git a/clock/hwclock.8 b/clock/hwclock.8
index 0a216840a..ddf0c7c3e 100644
--- a/clock/hwclock.8
+++ b/clock/hwclock.8
@@ -2,34 +2,35 @@
.SH NAME
clock \- query and set the hardware clock (RTC)
.SH SYNOPSIS
-.B "hwclock --show"
+.B "hwclock \-\-show"
.br
-.B "hwclock --set --date=newdate"
+.B "hwclock \-\-set \-\-date=newdate"
.br
-.B "hwclock --systohc"
+.B "hwclock \-\-systohc"
.br
-.B "hwclock --hctosys"
+.B "hwclock \-\-hctosys"
.br
-.B "hwclock --getepoch"
+.B "hwclock \-\-getepoch"
.br
-.B "hwclock --setepoch --epoch=year"
+.B "hwclock \-\-setepoch \-\-epoch=year"
.br
-.B "hwclock --adjust"
+.B "hwclock \-\-adjust"
.br
-.B "hwclock --version"
+.B "hwclock \-\-version"
.PP
other options:
.PP
-.B "--utc --localtime --directisa --test --debug"
+.B "\-\-utc \-\-localtime \-\-directisa \-\-test \-\-debug"
.PP
and arcane options for DEC Alpha:
.PP
-.B "--arc --jensen --srm --funky-toy"
+.B "\-\-arc \-\-jensen \-\-srm \-\-funky-toy"
.PP
Minimum unique abbreviations of all options are acceptable.
.PP
-Also, equivalent options -r, -w, -s, -a, -v, -u, -D, -A, -J, -S, and -F
-are accepted for compatibility with the program "clock".
+Also, equivalent options \-r, \-w, \-s, \-a, \-v, \-u,
+\-D, \-A, \-J, \-S, and \-F are accepted for compatibility
+with the program "clock", while \-h asks for a help message.
.SH DESCRIPTION
.I hwclock
@@ -239,7 +240,9 @@ are invalid if you don't have an Alpha and shouldn't be necessary if you
do, because
.I hwclock
should be able to determine by itself what it's
-running on. These options make it possible for
+running on, at least when
+.I /proc
+is mounted. These options make it possible for
.I hwclock
to work even when
its environment does not conform to its expectations and thus it cannot
@@ -259,10 +262,12 @@ automatically.
means you are running on a Jensen model.
.B \-\-arc
-means your machine is running with ARC console time.
+means your machine uses epoch 1980 in its hardware clock, as is commonly
+the case for machines on ARC console (but Ruffians have epoch 1900).
.B \-\-srm
-means your machine is running with SRM console time.
+means your machine uses epoch 1900 in its hardware clock, as is commonly
+the case for machines on SRM console.
.B \-\-funky\-toy
means that on your machine, one has to use the UF bit instead
diff --git a/clock/hwclock.c b/clock/hwclock.c
index a496e0570..8c682380e 100644
--- a/clock/hwclock.c
+++ b/clock/hwclock.c
@@ -75,9 +75,9 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <shhopt.h>
+#include <stdarg.h>
#include "clock.h"
-#include "../version.h"
#include "nls.h"
#define MYNAME "hwclock"
@@ -104,11 +104,19 @@ struct adjtime {
structure is not what's in the disk file (because it has been
updated since read from the disk file).
*/
- bool dirty;
+ bool dirty;
+ /* line 1 */
float drift_factor;
time_t last_adj_time;
float not_adjusted;
+ /* line 2 */
time_t last_calib_time;
+ /* The most recent time that we set the clock from an external
+ authority (as opposed to just doing a drift adjustment) */
+ /* line 3 */
+ enum a_local_utc {LOCAL, UTC, UNKNOWN} local_utc;
+ /* To which time zone, local or UTC, we most recently set the
+ hardware clock. */
};
bool debug;
@@ -189,6 +197,25 @@ time_inc(struct timeval addend, float increment) {
}
+static bool
+hw_clock_is_utc(const bool utc, const bool local_opt,
+ const struct adjtime adjtime) {
+ bool ret;
+
+ if (utc)
+ ret = TRUE; /* --utc explicitly given on command line */
+ else if (local_opt)
+ ret = FALSE; /* --localtime explicitly given */
+ else
+ /* get info from adjtime file - default is local */
+ ret = (adjtime.local_utc == UTC);
+ if (debug)
+ printf(_("Assuming hardware clock is kept in %s time.\n"),
+ ret ? _("UTC") : _("local"));
+ return ret;
+}
+
+
static void
read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
@@ -214,6 +241,7 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
adjtime_p->last_adj_time = 0;
adjtime_p->not_adjusted = 0;
adjtime_p->last_calib_time = 0;
+ adjtime_p->local_utc = UNKNOWN;
*rc_p = 0;
} else {
@@ -224,11 +252,14 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
} else {
char line1[81]; /* String: first line of adjtime file */
char line2[81]; /* String: second line of adjtime file */
+ char line3[81]; /* String: third line of adjtime file */
line1[0] = '\0'; /* In case fgets fails */
fgets(line1, sizeof(line1), adjfile);
line2[0] = '\0'; /* In case fgets fails */
fgets(line2, sizeof(line2), adjfile);
+ line3[0] = '\0'; /* In case fgets fails */
+ fgets(line3, sizeof(line3), adjfile);
fclose(adjfile);
@@ -244,6 +275,19 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
&adjtime_p->not_adjusted);
sscanf(line2, "%d", (int *) &adjtime_p->last_calib_time);
+
+ if (!strcmp(line3, "UTC\n"))
+ adjtime_p->local_utc = UTC;
+ else if (!strcmp(line3, "LOCAL\n"))
+ adjtime_p->local_utc = LOCAL;
+ else {
+ adjtime_p->local_utc = UNKNOWN;
+ if (line3[0]) {
+ fprintf(stderr, _("%s: Warning: unrecognized third line in adjtime file\n"),
+ MYNAME);
+ fprintf(stderr, _("(Expected: `UTC' or `LOCAL' or nothing.)\n"));
+ }
+ }
*rc_p = 0;
}
@@ -254,6 +298,9 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
(int) adjtime_p->last_adj_time);
printf(_("Last calibration done at %d seconds after 1969\n"),
(int) adjtime_p->last_calib_time);
+ printf(_("Hardware clock is on %s time\n"),
+ (adjtime_p->local_utc == LOCAL) ? _("local") :
+ (adjtime_p->local_utc == UTC) ? _("UTC") : _("unknown"));
}
}
}
@@ -312,7 +359,6 @@ mktime_tz(struct tm tm, const bool universal,
changing the local time zone to UTC.
*/
zone = (char *) getenv("TZ"); /* remember original time zone */
- mktime_result = mktime(&tm);
if (universal) {
/* Set timezone to UTC */
setenv("TZ", "", TRUE);
@@ -340,7 +386,9 @@ mktime_tz(struct tm tm, const bool universal,
*valid_p = TRUE;
*systime_p = mktime_result;
if (debug)
- printf(_("Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"),
+ printf(_("Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = "
+ "%d seconds since 1969\n"),
+ tm.tm_year, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec, (int) *systime_p);
}
/* now put back the original zone. */
@@ -578,10 +626,7 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
Also set the kernel time zone value to the value indicated by the
TZ environment variable and/or /usr/lib/zoneinfo/, interpreted as
- tzset() would interpret them. Except: do not consider Daylight
- Savings Time to be a separate component of the time zone. Include
- any effect of DST in the basic timezone value and set the kernel
- DST value to 0.
+ tzset() would interpret them.
EXCEPT: if hclock_valid is false, just issue an error message
saying there is no valid time in the Hardware Clock to which to set
@@ -590,7 +635,7 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
If 'testing' is true, don't actually update anything -- just say we
would have.
-----------------------------------------------------------------------------*/
- int retcode; /* our eventual return code */
+ int retcode;
if (!hclock_valid) {
fprintf(stderr,_("The Hardware Clock does not contain a valid time, so "
@@ -598,32 +643,30 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
retcode = 1;
} else {
struct timeval tv;
- int rc; /* local return code */
+ int rc;
tv.tv_sec = newtime;
tv.tv_usec = 0;
- tzset(); /* init timezone, daylight from TZ or ...zoneinfo/localtime */
- /* An undocumented function of tzset() is to set global variabales
- 'timezone' and 'daylight'
- */
+ tzset(); /* init timezone from TZ or ...zoneinfo/localtime */
if (debug) {
printf( _("Calling settimeofday:\n") );
printf( _("\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"),
(long) tv.tv_sec, (long) tv.tv_usec );
- printf( _("\ttz.tz_minuteswest = %ld\n"), timezone/60 - 60*daylight);
+ printf( _("\ttz.tz_minuteswest = %ld\n"), timezone/60);
}
if (testing) {
printf(_("Not setting system clock because running in test mode.\n"));
retcode = 0;
} else {
/* For documentation of settimeofday(), in addition to its man page,
- see kernel/time.c in the Linux source code.
- */
- const struct timezone tz = { timezone/60 - 60*daylight, 0 };
- /* put daylight in minuteswest rather than dsttime,
- since the latter is mostly ignored ... */
+ see kernel/time.c in the Linux source code.
+ The code used to have `-60*daylight' here, but that is wrong.
+ The variable `daylight' does not specify whether it is DST now. */
+
+ const struct timezone tz = { timezone/60, 0 };
+
rc = settimeofday(&tv, &tz);
if (rc != 0) {
if (errno == EPERM)
@@ -744,16 +787,17 @@ save_adjtime(const struct adjtime adjtime, const bool testing) {
But if the contents are clean (unchanged since read from disk), don't
bother.
-----------------------------------------------------------------------------*/
- char newfile[405]; /* Stuff to write to disk file */
+ char newfile[412]; /* Stuff to write to disk file */
if (adjtime.dirty) {
/* snprintf is not always available, but this is safe
as long as libc does not use more than 100 positions for %ld or %f */
- sprintf(newfile, "%f %ld %f\n%ld\n",
+ sprintf(newfile, "%f %ld %f\n%ld\n%s\n",
adjtime.drift_factor,
(long) adjtime.last_adj_time,
adjtime.not_adjusted,
- (long) adjtime.last_calib_time );
+ (long) adjtime.last_calib_time,
+ (adjtime.local_utc == UTC) ? "UTC" : "LOCAL");
if (testing) {
printf(_("Not updating adjtime file because of testing mode.\n"));
@@ -883,9 +927,8 @@ manipulate_clock(const bool show, const bool adjust,
const bool set, const time_t set_time,
const bool hctosys, const bool systohc,
const struct timeval startup_time,
- const bool universal, const bool testing,
- int *retcode_p
- ) {
+ const bool utc, const bool local_opt,
+ const bool testing, int *retcode_p) {
/*---------------------------------------------------------------------------
Do all the normal work of hwclock - read, set clock, etc.
@@ -902,7 +945,7 @@ manipulate_clock(const bool show, const bool adjust,
if (no_auth) *retcode_p = 1;
else {
- if (adjust || set || systohc)
+ if (adjust || set || systohc || (!utc && !local_opt))
read_adjtime(&adjtime, &rc);
else {
/* A little trick to avoid reading the file if we don't have to */
@@ -911,6 +954,14 @@ manipulate_clock(const bool show, const bool adjust,
}
if (rc != 0) *retcode_p = 2;
else {
+ const bool universal = hw_clock_is_utc(utc, local_opt, adjtime);
+
+ if ((set || systohc || adjust) &&
+ (adjtime.local_utc == UTC) != universal) {
+ adjtime.local_utc = universal ? UTC : LOCAL;
+ adjtime.dirty = TRUE;
+ }
+
synchronize_to_clock_tick(retcode_p);
/* this takes up to 1 second */
if (*retcode_p == 0) {
@@ -1016,6 +1067,66 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
#endif
}
+/*
+ usage - Output (error and) usage information
+
+ This function is called both directly from main to show usage
+ information and as fatal function from shhopt if some argument is
+ not understood. In case of normal usage info FMT should be NULL.
+ In that case the info is printed to stdout. If FMT is given
+ usage will act like fprintf( stderr, fmt, ... ), show a usage
+ information and terminate the program afterwards.
+*/
+static void
+usage( const char *fmt, ... ) {
+ FILE *usageto;
+ va_list ap;
+
+ usageto = fmt ? stderr : stdout;
+
+ fprintf( usageto, _(
+ "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"
+ "\nOptions: \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 /dev/rtc\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"
+ ));
+#ifdef __alpha__
+ fprintf( usageto, _(
+ " --jensen, --arc, --srm, --funky-toy\n"
+ " tell hwclock the type of alpha you have (see hwclock(8))\n"
+ ) );
+#endif
+
+
+ fflush(stdout);
+ if( fmt ) {
+ usageto = stderr;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ }
+
+ exit( fmt ? 99 : 0 );
+}
+
int
main(int argc, char **argv, char **envp) {
@@ -1034,12 +1145,14 @@ main(int argc, char **argv, char **envp) {
are given by the option_def. The only exception is <show>, which
may be modified after parsing is complete to effect an implied option.
*/
- bool show, set, systohc, hctosys, adjust, getepoch, setepoch, version;
- bool ARCconsole, universal, testing, directisa, Jensen, SRM, funky_toy;
+ bool help, show, set, systohc, hctosys, adjust, getepoch, setepoch, version;
+ bool ARCconsole, utc, testing, directisa, Jensen, SRM, funky_toy;
+ bool local_opt;
char *date_opt;
int epoch_opt;
const optStruct option_def[] = {
+ { 'h', (char *) "help", OPT_FLAG, &help, 0 },
{ 'r', (char *) "show", OPT_FLAG, &show, 0 },
{ 0, (char *) "set", OPT_FLAG, &set, 0 },
{ 'w', (char *) "systohc", OPT_FLAG, &systohc, 0 },
@@ -1048,9 +1161,11 @@ main(int argc, char **argv, char **envp) {
{ 0, (char *) "setepoch", OPT_FLAG, &setepoch, 0 },
{ 'a', (char *) "adjust", OPT_FLAG, &adjust, 0 },
{ 'v', (char *) "version", OPT_FLAG, &version, 0 },
+ { 'V', (char *) "version", OPT_FLAG, &version, 0 },
{ 0, (char *) "date", OPT_STRING, &date_opt, 0 },
{ 0, (char *) "epoch", OPT_UINT, &epoch_opt, 0 },
- { 'u', (char *) "utc", OPT_FLAG, &universal, 0 },
+ { 'u', (char *) "utc", OPT_FLAG, &utc, 0 },
+ { 0, (char *) "localtime", OPT_FLAG, &local_opt, 0 },
{ 0, (char *) "badyear", OPT_FLAG, &badyear, 0 },
{ 0, (char *) "directisa", OPT_FLAG, &directisa, 0 },
{ 0, (char *) "test", OPT_FLAG, &testing, 0 },
@@ -1073,8 +1188,8 @@ main(int argc, char **argv, char **envp) {
textdomain(PACKAGE);
/* set option defaults */
- show = set = systohc = hctosys = adjust = getepoch = setepoch =
- version = universal = ARCconsole = SRM = funky_toy =
+ help = show = set = systohc = hctosys = adjust = getepoch = setepoch =
+ version = utc = local_opt = ARCconsole = SRM = funky_toy =
directisa = badyear = Jensen = testing = debug = FALSE;
date_opt = NULL;
epoch_opt = -1;
@@ -1082,8 +1197,8 @@ main(int argc, char **argv, char **envp) {
argc_parse = argc; argv_parse = argv;
optParseOptions(&argc_parse, argv_parse, option_def, 0);
/* Uses and sets argc_parse, argv_parse.
- Sets show, systohc, hctosys, adjust, universal, version, testing,
- debug, set, date_opt, getepoch, setepoch, epoch_opt
+ Sets show, systohc, hctosys, adjust, utc, local_opt, version,
+ testing, debug, set, date_opt, getepoch, setepoch, epoch_opt
*/
/* This is an ugly routine - for example, if I give an incorrect
option, it only says "unrecognized option" without telling
@@ -1091,12 +1206,14 @@ main(int argc, char **argv, char **envp) {
getopt() and usage() and throw shhopt out. */
if (argc_parse - 1 > 0) {
- fprintf(stderr, _("%s takes no non-option arguments. "
+ usage( _("%s takes no non-option arguments. "
"You supplied %d.\n"),
MYNAME, argc_parse - 1);
- exit(100);
}
+ if (help)
+ usage( NULL );
+
if (show + set + systohc + hctosys + adjust +
getepoch + setepoch + version > 1) {
fprintf(stderr, _("You have specified multiple function options.\n"
@@ -1104,6 +1221,12 @@ main(int argc, char **argv, char **envp) {
exit(100);
}
+ if (utc && local_opt) {
+ fprintf(stderr, _("%s: The --utc and --localtime options are mutually "
+ "exclusive. You specified both.\n"), MYNAME);
+ exit(100);
+ }
+
#ifdef __alpha__
set_cmos_epoch(ARCconsole, SRM);
set_cmos_access(Jensen, funky_toy);
@@ -1145,6 +1268,8 @@ main(int argc, char **argv, char **envp) {
} else if (getepoch || setepoch) {
manipulate_epoch(getepoch, setepoch, epoch_opt, testing);
} else {
+ if (debug)
+ printf(MYNAME " " VERSION "/%s\n",util_linux_version);
determine_clock_access_method(directisa);
if (!ur)
fprintf(stderr, _("Cannot access the Hardware Clock via any known "
@@ -1152,7 +1277,7 @@ main(int argc, char **argv, char **envp) {
"search for an access method.\n"));
else
manipulate_clock(show, adjust, set, set_time, hctosys, systohc,
- startup_time, universal, testing, &rc);
+ startup_time, utc, local_opt, testing, &rc);
}
}
exit(retcode);
@@ -1161,7 +1286,7 @@ main(int argc, char **argv, char **envp) {
/* A single routine for greater uniformity */
void
outsyserr(char *msg) {
- fprintf(stderr, _("%s: %s, errno=%d: %s.\n"),
+ fprintf(stderr, "%s: %s, errno=%d: %s.\n",
progname, msg, errno, strerror(errno));
}
diff --git a/clock/kd.c b/clock/kd.c
index 9ec91f005..d1c4aca19 100644
--- a/clock/kd.c
+++ b/clock/kd.c
@@ -3,6 +3,7 @@
#include <fcntl.h> /* for O_RDONLY */
#include <sys/ioctl.h>
+#include "../defines.h" /* for HAVE_nanosleep */
#include "clock.h"
#include "nls.h"
@@ -46,6 +47,20 @@ synchronize_to_clock_tick_kd(void) {
i = 0;
do {
+ /* Added by Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de> */
+ /* "The culprit is the fast loop with KDGHWCLK ioctls. It seems
+ the kernel gets confused by those on Amigas with A2000 RTCs
+ and simply hangs after some time. Inserting a nanosleep helps." */
+ /* Christian T. Steigies: 1 instead of 1000000 is still sufficient
+ to keep the machine from freezing. */
+
+#ifdef HAVE_nanosleep
+ struct timespec sleep = { 0, 1 };
+ nanosleep( &sleep, NULL );
+#else
+ usleep(1);
+#endif
+
if (i++ >= 1000000) {
fprintf(stderr, _("Timed out waiting for time change.\n"));
return 2;
diff --git a/clockB/Makefile b/clockB/Makefile
deleted file mode 100644
index 1a2f4ecd6..000000000
--- a/clockB/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Makefile -- Makefile for util-linux Linux utilities
-#
-include ../make_include
-include ../MCONFIG
-
-# Where to put man pages?
-
-MAN8= hwclock.8
-
-# Where to put binaries?
-# See the "install" rule for the links. . .
-
-SBIN= hwclock
-
-
-all: $(SBIN)
-
-
-CFLAGS = -s -Wall -Wwrite-strings -Wstrict-prototypes -Winline $(CDEBUG)
-
-hwclock: hwclock.o rtc.o directio.o kd.o util.o shhopt.o
-hwclock.o: shhopt.h
-hwclock.o rtc.o directio.o kd.o util.o: hwclock.h
-
-install: all
- $(INSTALLDIR) $(SBINDIR) $(BINDIR) $(USRBINDIR)
- $(INSTALLBIN) $(SBIN) $(SBINDIR)
- $(INSTALLMAN) $(MAN8) $(MAN8DIR)
-
-clean:
- -rm -f *.o *~ core $(SBIN)
diff --git a/clockB/directio.c b/clockB/directio.c
deleted file mode 100644
index d3a77eb19..000000000
--- a/clockB/directio.c
+++ /dev/null
@@ -1,727 +0,0 @@
-/**************************************************************************
-
- This is a component of the hwclock program.
-
- This file contains the code for accessing the hardware clock via
- direct I/O (kernel-style input and output operations) as opposed
- to via a device driver.
-
-
- MAINTENANCE NOTES
-
- Here is some information on how the Hardware Clock works, from
- unknown source and authority. In theory, the specification for this
- stuff is the specification of Motorola's MC146818A clock chip, used
- in the early ISA machines. Subsequent machines should have copied
- its function exactly. In reality, though, the copies are inexact
- and the MC146818A itself may fail to implement its specifications,
- and we have just have to work with whatever is there (actually,
- anything that Windows works with, because that's what determines
- whether broken hardware has to be fixed!).
-
- i386 CMOS starts out with 14 bytes clock data
- alpha has something similar, but with details
- depending on the machine type.
-
- byte 0: seconds (0-59)
- byte 2: minutes (0-59)
- byte 4: hours (0-23 in 24hr mode,
- 1-12 in 12hr mode, with high bit unset/set if am/pm)
- byte 6: weekday (1-7, Sunday=1)
- byte 7: day of the month (1-31)
- byte 8: month (1-12)
- byte 9: year (0-99)
-
-
- Numbers are stored in BCD/binary if bit 2 of byte 11 is unset/set
- The clock is in 12hr/24hr mode if bit 1 of byte 11 is unset/set
- The clock is undefined (being updated) if bit 7 of byte 10 is set.
- The clock is frozen (to be updated) by setting bit 7 of byte 11
- Bit 7 of byte 14 indicates whether the CMOS clock is reliable:
- it is 1 if RTC power has been good since this bit was last read;
- it is 0 when the battery is dead and system power has been off.
-
- The century situation is messy:
-
- Usually byte 50 (0x32) gives the century (in BCD, so 0x19 or 0x20 in
- pure binary), but IBM PS/2 has (part of) a checksum there and uses
- byte 55 (0x37). Sometimes byte 127 (0x7f) or Bank 1, byte 0x48
- gives the century. The original RTC will not access any century
- byte; some modern versions will. If a modern RTC or BIOS increments
- the century byte it may go from 0x19 to 0x20, but in some buggy
- cases 0x1a is produced.
-
- CMOS byte 10 (clock status register A) has 3 bitfields:
- bit 7: 1 if data invalid, update in progress (read-only bit)
- (this is raised 224 us before the actual update starts)
- 6-4 select base frequency
- 010: 32768 Hz time base (default)
- 111: reset
- all other combinations are manufacturer-dependent
- (e.g.: DS1287: 010 = start oscillator, anything else = stop)
- 3-0 rate selection bits for interrupt
- 0000 none
- 0001, 0010 give same frequency as 1000, 1001
- 0011 122 microseconds (minimum, 8192 Hz)
- .... each increase by 1 halves the frequency, doubles the period
- 1111 500 milliseconds (maximum, 2 Hz)
- 0110 976.562 microseconds (default 1024 Hz)
-
- Avoid setting the RTC clock within 2 seconds of the day rollover
- that starts a new month or enters daylight saving time.
-
-****************************************************************************/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#if defined(__i386__) || defined(__alpha__)
-#include <asm/io.h> /* for inb, outb */
-#else
-void outb(int a, int b){}
-int inb(int c){ return 0; }
-#endif
-
-#include "hwclock.h"
-
-#define BCD_TO_BIN(val) (((val)&0x0f) + ((val)>>4)*10)
-#define BIN_TO_BCD(val) ((((val)/10)<<4) + (val)%10)
-
-
-/*----------------------------------------------------------------------------
- ATOMIC_TOP and ATOMIC_BOTTOM are wierd macros that help us to do
- atomic operations when we do ugly low level I/O.
-
- You put ATOMIC_TOP above some code and ATOMIC_BOTTOM below it and
- it makes sure all the enclosed code executes without interruption
- by some other process (and, in some cases, even the kernel).
-
- These work fundamentally differently depending on the machine
- architecture. In the case of a x86, it simply turns interrupts off
- at the top and turns them back on at the bottom.
-
- For Alpha, we can't mess with interrupts (we shouldn't for x86
- either, but at least it tends to work!), so instead we start a loop
- at the top and close it at the bottom. This loop repeats the
- enclosed code until the upper 32 bits of the cycle counter are the
- same before and after. That means there was no context change
- while the enclosed code was executing.
-
- For other architectures, we do nothing, and the atomicity is only
- feigned.
-
------------------------------------------------------------------------------*/
-
-#if defined(__i386__)
-#define ATOMIC_TOP \
- { \
- const bool interrupts_were_enabled = interrupts_enabled; \
- __asm__ volatile ("cli"); \
- interrupts_enabled = FALSE;
-
-#define ATOMIC_BOTTOM \
- if (interrupts_were_enabled) { \
- __asm__ volatile ("sti"); \
- interrupts_enabled = TRUE; \
- } \
- }
-#elif defined(__alpha__)
-#define ATOMIC_TOP \
- { \
- unsigned long ts1, ts2, n; \
- n = 0; \
- do { \
- asm volatile ("rpcc %0" : "r="(ts1));
-
-#define ATOMIC_BOTTOM \
- asm volatile ("rpcc %0" : "r="(ts2)); \
- n++; \
- } while ((ts1 ^ ts2) >> 32 != 0); \
- }
-#else
-#define ATOMIC_BOTTOM
-#define ATOMIC_TOP
-#endif
-
-
-#if defined(__i386__) || defined(__alpha__)
-/* The following are just constants. Oddly, this program will not
- compile if the inb() and outb() functions use something even
- slightly different from these variables. This is probably at least
- partially related to the fact that __builtin_constant_p() doesn't
- work (is never true) in an inline function. See comment to this
- effect in asm/io.h.
-*/
-static unsigned short clock_ctl_addr = 0x70;
-static unsigned short clock_data_addr = 0x71;
-#endif
-
-
-static bool interrupts_enabled;
- /* Interrupts are enabled as normal. We, unfortunately, turn interrupts
- on the machine off in some places where we do the direct ISA accesses
- to the Hardware Clock. It is in extremely poor form for a user space
- program to do this, but that's the price we have to pay to run on an
- ISA machine without the rtc driver in the kernel.
-
- Code which turns interrupts off uses this value to determine if they
- need to be turned back on.
- */
-
-
-void
-assume_interrupts_enabled(void) {
- interrupts_enabled = TRUE;
-}
-
-
-
-static int
-i386_iopl(const int level) {
-/*----------------------------------------------------------------------------
- When compiled for an Intel target, this is just the iopl() kernel call.
- When compiled for any other target, this is a dummy function.
-
- We do it this way in order to keep the conditional compilation stuff
- out of the way so it doesn't mess up readability of the code.
------------------------------------------------------------------------------*/
-#ifdef __i386__
- extern int iopl(int level);
- return iopl(level);
-#else
- return -1;
-#endif
-}
-
-
-
-bool
-uf_bit_needed(const bool user_wants_uf) {
-/*----------------------------------------------------------------------------
- Return true iff the UIP bit doesn't work on this hardware clock, so
- we will need to use the UF bit to synchronize with the clock (if in
- fact we synchronize using direct I/O to the clock).
-
- To wit, we need to use the UF bit on a DEC Alpha PC164/LX164/SX164.
- Or, of course, if the user told us to.
------------------------------------------------------------------------------*/
- bool retval;
-
- if (user_wants_uf) retval = TRUE;
- else {
- if (alpha_machine && (
- is_in_cpuinfo("system variation", "PC164") ||
- is_in_cpuinfo("system variation", "LX164") ||
- is_in_cpuinfo("system variation", "SX164")))
- retval = TRUE;
- else retval = FALSE;
- }
- if (debug && retval)
- printf("We will be using the UF bit instead of the usual "
- "UIP bit to synchronize with the clock, as required on "
- "certain models of DEC Alpha.\n");
-
- return retval;
-}
-
-
-
-int
-zero_year(const bool arc_opt, const bool srm_opt) {
-/*----------------------------------------------------------------------------
- Return the year of the century (e.g. 0) to which a zero value in
- the year register of the hardware clock applies (or at least what
- we are to assume -- nobody can say for sure!)
-
- 'arc_opt' and 'srm_opt' are the true iff the user specified the
- corresponding invocation option to instruct us that the machine is an
- Alpha with ARC or SRM console time.
-
- A note about hardware clocks:
-
- ISA machines are simple: the year register is a year-of-century
- register, so the zero year is zero. On Alphas, we may see 1980 or
- 1952 (Digital Unix?) or 1958 (ALPHA_PRE_V1_2_SRM_CONSOLE)
------------------------------------------------------------------------------*/
- int retval; /* our return value */
-
- if (arc_opt || srm_opt) {
- /* User is telling us what epoch his machine uses. Believe it. */
- if (arc_opt) retval = 0;
- else retval = 0;
- } else {
- unsigned long kernel_epoch;
- char *reason; /* malloc'ed */
-
- get_epoch(&kernel_epoch, &reason);
- if (reason == NULL) retval = kernel_epoch;
- else {
- /* OK, the user doesn't know and the kernel doesn't know;
- figure it out from the machine model
- */
- free(reason); /* Don't care about kernel's excuses */
- /* See whether we are dealing with SRM or MILO, as they have
- different "epoch" ideas. */
- if (is_in_cpuinfo("system serial number", "MILO")) {
- if (debug) printf("booted from MILO\n");
- /* See whether we are dealing with a RUFFIAN aka UX, as they
- have REALLY different TOY (TimeOfYear) format: BCD, and not
- an ARC-style epoch. BCD is detected dynamically, but we
- must NOT adjust like ARC.
- */
- if (is_in_cpuinfo("system type", "Ruffian")) {
- if (debug) printf("Ruffian BCD clock\n");
- retval = 0;
- } else {
- if (debug) printf("Not Ruffian BCD clock\n");
- retval = 80;
- }
- } else {
- if (debug) printf("Not booted from MILO\n");
- retval = 0;
- }
- }
- }
- return retval;
-}
-
-
-
-static inline unsigned char
-hclock_read(const unsigned char reg, const int dev_port) {
-/*---------------------------------------------------------------------------
- Relative byte 'reg' of the Hardware Clock value.
-
- Get this with direct CPU I/O instructions. If 'dev_port' is not -1,
- use the /dev/port device driver (via the 'dev_port' file descriptor)
- to do this I/O. Otherwise, use the kernel's inb()/outb() facility.
-
- On a system without the inb()/outb() facility, if 'dev_port' is -1,
- just return 0.
-
- Results undefined if 'reg' is out of range.
----------------------------------------------------------------------------*/
- unsigned char ret;
-
- ATOMIC_TOP
- if (dev_port >= 0) {
- const unsigned char v = reg | 0x80;
- lseek(dev_port, 0x170, 0);
- write(dev_port, &v, 1);
- lseek(dev_port, 0x171, 0);
- read(dev_port, &ret, 1);
- } else {
-#if defined(__i386__) || defined(__alpha__)
- /* & 0x7f ensures that we are not disabling NMI while we read.
- Setting on Bit 7 here would disable NMI
-
- Various docs suggest that one should disable NMI while
- reading/writing CMOS data, and enable it again afterwards.
- This would yield the sequence
- outb (reg | 0x80, 0x70);
- val = inb(0x71);
- outb (0x0d, 0x70); // 0x0d: random read-only location
- Other docs state that "any write to 0x70 should be followed
- by an action to 0x71 or the RTC wil be left in an unknown state".
- Most docs say that it doesn't matter at all what one does.
- */
- outb(reg & 0x7f, clock_ctl_addr);
- ret = inb(clock_data_addr);
-#else
- ret = 0;
-#endif
- }
- ATOMIC_BOTTOM
- return ret;
-}
-
-
-
-static inline void
-hclock_write(unsigned char reg, unsigned char val, const int dev_port) {
-/*----------------------------------------------------------------------------
- Set relative byte 'reg' of the Hardware Clock value to 'val'.
- Do this with the kernel's outb() function if 'dev_port' is -1, but
- if not, use the /dev/port device (via the 'dev_port' file descriptor),
- which is almost the same thing.
-
- On a non-ISA, non-Alpha machine, if 'dev_port' is -1, do nothing.
-----------------------------------------------------------------------------*/
- if (dev_port >= 0) {
- unsigned char v;
- v = reg | 0x80;
- lseek(dev_port, 0x170, 0);
- write(dev_port, &v, 1);
- v = (val & 0xff);
- lseek(dev_port, 0x171, 0);
- write(dev_port, &v, 1);
- } else {
-#if defined(__i386__) || defined(__alpha__)
- /* & 0x7f ensures that we are not disabling NMI while we read.
- Setting on Bit 7 here would disable NMI
- */
- outb(reg & 0x7f, clock_ctl_addr);
- outb(val, clock_data_addr);
-#endif
- }
-}
-
-
-
-static inline int
-hardware_clock_busy(const int dev_port, const bool use_uf_bit) {
-/*----------------------------------------------------------------------------
- Return whether the hardware clock is in the middle of an update
- (which happens once each second).
-
- Use the clock's UIP bit (bit 7 of Control Register A) to tell
- unless 'use_uf_bit' is true, in which case use the UF bit (bit 4 of
- Control Register C).
------------------------------------------------------------------------------*/
- return
- use_uf_bit ? (hclock_read(12, dev_port) & 0x10) :
- (hclock_read(10, dev_port) & 0x80);
-}
-
-
-
-void
-synchronize_to_clock_tick_ISA(int *retcode_p, const int dev_port,
- const bool use_uf_bit) {
-/*----------------------------------------------------------------------------
- Same as synchronize_to_clock_tick(), but just for ISA.
------------------------------------------------------------------------------*/
- int i; /* local loop index */
-
- /* Wait for rise. Should be within a second, but in case something
- weird happens, we have a limit on this loop to reduce the impact
- of this failure.
- */
- for (i = 0;
- !hardware_clock_busy(dev_port, use_uf_bit) && (i < 10000000);
- i++);
- if (i >= 10000000) *retcode_p = 1;
- else {
- /* Wait for fall. Should be within 2.228 ms. */
- for (i = 0;
- hardware_clock_busy(dev_port, use_uf_bit) && (i < 1000000);
- i++);
- if (i >= 10000000) *retcode_p = 1;
- else *retcode_p = 0;
- }
-}
-
-
-
-void
-read_hardware_clock_isa(struct tm *tm, const int dev_port,
- int hc_zero_year) {
-/*----------------------------------------------------------------------------
- Read the hardware clock and return the current time via <tm> argument.
- Assume we have an ISA machine and read the clock directly with CPU I/O
- instructions. If 'dev_port' isn't -1, use the /dev/port facility to
- do this I/O. Otherwise, use the kernel's inb()/outb() service.
-
- This function is not totally reliable. It takes a finite and
- unpredictable amount of time to execute the code below. During that
- time, the clock may change and we may even read an invalid value in
- the middle of an update. We do a few checks to minimize this
- possibility, but only the kernel can actually read the clock
- properly, since it can execute code in a short and predictable
- amount of time (by turning off interrupts).
-
- In practice, the chance of this function returning the wrong time is
- extremely remote.
-
------------------------------------------------------------------------------*/
- bool got_time;
- /* We've successfully read a time from the Hardware Clock */
- int attempts;
- /* Number of times we've tried to read the clock. This only
- matters because we will give up (and proceed with garbage in
- variables) rather than hang if something is broken and we are
- never able to read the clock
- */
- int hclock_sec = 0, hclock_min = 0, hclock_hour = 0, hclock_wday = 0,
- hclock_mon = 0, hclock_mday = 0, hclock_year = 0;
- /* The values we got from the Hardware Clock's registers, assuming
- they are in pure binary.
- */
-
- int status = 0; /* Hardware Clock status register, as if pure binary */
- int adjusted_year;
- int ampmhour;
- int pmbit;
-
- got_time = FALSE;
- attempts = 0; /* initial value */
- while (!got_time && attempts++ < 1000000) {
- /* Bit 7 of Byte 10 of the Hardware Clock value is the Update In Progress
- (UIP) bit, which is on while and 244 uS before the Hardware Clock
- updates itself. It updates the counters individually, so reading
- them during an update would produce garbage. The update takes 2mS,
- so we could be spinning here that long waiting for this bit to turn
- off.
-
- Furthermore, it is pathologically possible for us to be in this
- code so long that even if the UIP bit is not on at first, the
- clock has changed while we were running. We check for that too,
- and if it happens, we start over.
- */
-
- if ((hclock_read(10, dev_port) & 0x80) == 0) {
- /* No clock update in progress, go ahead and read */
-
- status = hclock_read(11, dev_port);
-
- hclock_sec = hclock_read(0, dev_port);
- hclock_min = hclock_read(2, dev_port);
- hclock_hour = hclock_read(4, dev_port);
- hclock_wday = hclock_read(6, dev_port);
- hclock_mday = hclock_read(7, dev_port);
- hclock_mon = hclock_read(8, dev_port);
- hclock_year = hclock_read(9, dev_port);
- /* Unless the clock changed while we were reading, consider this
- a good clock read .
- */
- if (hclock_sec == hclock_read(0, dev_port)) got_time = TRUE;
- /* Yes, in theory we could have been running for 60 seconds and
- the above test wouldn't work!
- */
- }
- }
-
- if (!(status & 0x04)) {
- /* The hardware clock is in BCD mode. This is normal. */
- tm->tm_sec = BCD_TO_BIN(hclock_sec);
- tm->tm_min = BCD_TO_BIN(hclock_min);
- ampmhour = BCD_TO_BIN(hclock_hour & 0x7f);
- pmbit = hclock_hour & 0x80;
- tm->tm_wday = BCD_TO_BIN(hclock_wday) - 1; /* Used to be 3. Why?? */
- tm->tm_mday = BCD_TO_BIN(hclock_mday);
- tm->tm_mon = BCD_TO_BIN(hclock_mon) - 1;
- adjusted_year = BCD_TO_BIN(hclock_year);
- } else {
- /* The hardware clock registers are in pure binary format. */
- tm->tm_sec = hclock_sec;
- tm->tm_min = hclock_min;
- ampmhour = hclock_hour & 0x7f;
- pmbit = hclock_hour & 0x80;
- tm->tm_wday = hclock_wday - 1; /* Used to be 3. Why?? */
- tm->tm_mday = hclock_mday;
- tm->tm_mon = hclock_mon - 1;
- adjusted_year = hclock_year;
- }
-
- if (!(status & 0x02)) {
- /* Clock is in 12 hour (am/pm) mode. This is unusual. */
- if (pmbit == 0x80) {
- if (ampmhour == 12) tm->tm_hour = 12;
- else tm->tm_hour = 12 + ampmhour;
- } else {
- if (ampmhour ==12) tm->tm_hour = 0;
- else tm->tm_hour = ampmhour;
- }
- } else {
- /* Clock is in 24 hour mode. This is normal. */
- tm->tm_hour = ampmhour;
- }
- /* We don't use the century byte (Byte 50) of the Hardware Clock.
- Here's why: It didn't exist in the original ISA specification,
- so old machines don't have it, and even some new ones don't.
- Some machines, including the IBM Valuepoint 6387-X93, use that
- byte for something else. Some machines have the century in
- Byte 55.
-
- Furthermore, the Linux standard time data structure doesn't
- allow for times beyond about 2037 and no Linux systems were
- running before 1937. Therefore, all the century byte could tell
- us is that the clock is wrong or this whole program is obsolete!
-
- So we just say if the year of century is less than 37, it's the
- 2000's, otherwise it's the 1900's.
-
- Alpha machines (some, anyway) don't have this ambiguity
- because they do not have a year-of-century register. We
- pretend they do anyway, for simplicity and to avoid
- recognizing times that can't be represented in Linux standard
- time. So even though we already have enough information to
- know that the clock says 2050, we will render it as 1950.
- */
- {
- const int year_of_century = (adjusted_year + hc_zero_year) % 100;
- if (year_of_century >= 37) tm->tm_year = year_of_century;
- else tm->tm_year = year_of_century + 100;
- }
- tm->tm_isdst = -1; /* don't know whether it's daylight */
-}
-
-
-
-void
-set_hardware_clock_isa(const struct tm new_tm,
- const int hc_zero_year,
- const int dev_port,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock to the time (in broken down format)
- new_tm. Use direct I/O instructions to what we assume is
- an ISA Hardware Clock.
-
- Iff 'dev_port' is -1, use the kernel inb()/outb() service, otherwise
- use the /dev/port device (via file descriptor 'dev_port')
- to do those I/O instructions.
-----------------------------------------------------------------------------*/
- unsigned char save_control, save_freq_select;
-
- if (testing)
- printf("Not setting Hardware Clock because running in test mode.\n");
- else {
- int ampmhour;
- /* The hour number that goes into the hardware clock, taking into
- consideration whether the clock is in 12 or 24 hour mode
- */
- int pmbit;
- /* Value to OR into the hour register as the am/pm bit */
- const int adjusted_year =
- (new_tm.tm_year - hc_zero_year)%100;
- /* The number that goes in the hardware clock's year register */
-
- int hclock_sec, hclock_min, hclock_hour, hclock_wday, hclock_mon,
- hclock_mday, hclock_year;
- /* The values we will put, in pure binary, in the Hardware Clock's
- registers.
- */
-
- ATOMIC_TOP
-
- save_control = hclock_read(11, dev_port);
- /* tell the clock it's being set */
- hclock_write(11, (save_control | 0x80), dev_port);
- save_freq_select = hclock_read(10, dev_port);
- /* stop and reset prescaler */
- hclock_write (10, (save_freq_select | 0x70), dev_port);
-
-
- if (!(save_control & 0x02)) {
- /* Clock is in 12 hour (am/pm) mode. This is unusual. */
- if (new_tm.tm_hour == 0) {
- ampmhour = 12;
- pmbit = 0x00;
- } else if (new_tm.tm_hour < 12) {
- ampmhour = new_tm.tm_hour;
- pmbit = 0x00;
- } else if (new_tm.tm_hour == 12) {
- ampmhour = 12;
- pmbit = 0x80;
- } else {
- ampmhour = new_tm.tm_hour - 12;
- pmbit = 0x80;
- }
- } else {
- /* Clock is in 24 hour mode. This is normal. */
- ampmhour = new_tm.tm_hour;
- pmbit = 0x00;
- }
-
-
- if (!(save_control & 0x04)) {
- /* Clock's registers are in BCD. This is normal. */
- hclock_sec = BIN_TO_BCD(new_tm.tm_sec);
- hclock_min = BIN_TO_BCD(new_tm.tm_min);
- hclock_hour = pmbit | BIN_TO_BCD(ampmhour);
- hclock_wday = BIN_TO_BCD(new_tm.tm_wday + 1); /* Used to be 3. Why??*/
- hclock_mday = BIN_TO_BCD(new_tm.tm_mday);
- hclock_mon = BIN_TO_BCD(new_tm.tm_mon + 1);
- hclock_year = BIN_TO_BCD(adjusted_year);
- } else {
- /* Clock's registers are in pure binary. This is unusual. */
- hclock_sec = new_tm.tm_sec;
- hclock_min = new_tm.tm_min;
- hclock_hour = pmbit | ampmhour;
- hclock_wday = new_tm.tm_wday + 1; /* Used to be 3. Why?? */
- hclock_mday = new_tm.tm_mday;
- hclock_mon = new_tm.tm_mon + 1;
- hclock_year = adjusted_year;
- }
-
- hclock_write(0, hclock_sec, dev_port);
- hclock_write(2, hclock_min, dev_port);
- hclock_write(4, hclock_hour, dev_port);
- hclock_write(6, hclock_wday, dev_port);
- hclock_write(7, hclock_mday, dev_port);
- hclock_write(8, hclock_mon, dev_port);
- hclock_write(9, hclock_year, dev_port);
-
- /* We don't set the century byte (usually Byte 50) because it isn't
- always there. (see further comments in read_hardware_clock_isa).
- In previous releases, we did.
- */
-
- /* The kernel sources, linux/arch/i386/kernel/time.c, have the
- following comment:
-
- The following flags have to be released exactly in this order,
- otherwise the DS12887 (popular MC146818A clone with integrated
- battery and quartz) will not reset the oscillator and will not
- update precisely 500 ms later. You won't find this mentioned
- in the Dallas Semiconductor data sheets, but who believes data
- sheets anyway ... -- Markus Kuhn
-
- Hence, they will also be done in this order here.
- faith@cs.unc.edu, Thu Nov 9 08:26:37 1995
- */
-
- hclock_write (11, save_control, dev_port);
- hclock_write (10, save_freq_select, dev_port);
-
- ATOMIC_BOTTOM
- }
-}
-
-
-
-void
-get_inb_outb_privilege(const enum clock_access_method clock_access,
- bool * const no_auth_p) {
-
- if (clock_access == ISA) {
- const int rc = i386_iopl(3);
- if (rc != 0) {
- fprintf(stderr, MYNAME " is unable to get I/O port access. "
- "I.e. iopl(3) returned nonzero return code %d.\n"
- "This is often because the program isn't running "
- "with superuser privilege, which it needs.\n",
- rc);
- *no_auth_p = TRUE;
- } else *no_auth_p = FALSE;
- } else *no_auth_p = FALSE;
-}
-
-
-
-void
-get_dev_port_access(const enum clock_access_method clock_access,
- int * dev_port_p) {
-
- if (clock_access == DEV_PORT) {
- /* Get the /dev/port file open */
- *dev_port_p = open("/dev/port", O_RDWR);
- if (*dev_port_p < 0) {
- fprintf(stderr, MYNAME "is unable to open the /dev/port file. "
- "I.e. open() of the file failed with errno = %s (%d).\n"
- "Run with the --debug option and check documentation "
- "to find out why we are trying "
- "to use /dev/port instead of some other means to access "
- "the Hardware Clock.",
- strerror(errno), errno);
- }
- } else *dev_port_p = 0;
-}
-
-
-
diff --git a/clockB/hwclock.8 b/clockB/hwclock.8
deleted file mode 100644
index 0a216840a..000000000
--- a/clockB/hwclock.8
+++ /dev/null
@@ -1,599 +0,0 @@
-.TH CLOCK 8 "02 March 1998"
-.SH NAME
-clock \- query and set the hardware clock (RTC)
-.SH SYNOPSIS
-.B "hwclock --show"
-.br
-.B "hwclock --set --date=newdate"
-.br
-.B "hwclock --systohc"
-.br
-.B "hwclock --hctosys"
-.br
-.B "hwclock --getepoch"
-.br
-.B "hwclock --setepoch --epoch=year"
-.br
-.B "hwclock --adjust"
-.br
-.B "hwclock --version"
-.PP
-other options:
-.PP
-.B "--utc --localtime --directisa --test --debug"
-.PP
-and arcane options for DEC Alpha:
-.PP
-.B "--arc --jensen --srm --funky-toy"
-.PP
-Minimum unique abbreviations of all options are acceptable.
-.PP
-Also, equivalent options -r, -w, -s, -a, -v, -u, -D, -A, -J, -S, and -F
-are accepted for compatibility with the program "clock".
-
-.SH DESCRIPTION
-.I hwclock
-is a tool for accessing the Hardware Clock. You can display the
-current time, set the Hardware Clock to a specified time, set the
-Hardware Clock to the System Time, and set the System Time from the
-Hardware Clock.
-.PP
-You can also run
-.I hwclock
-periodically to insert or remove time from the Hardware Clock to
-compensate for systematic drift (where the clock consistently gains or
-loses time at a certain rate if left to run).
-
-.SH OPTIONS
-You need exactly one of the following options to tell
-.I hwclock
-what function to perform:
-.PP
-.TP
-.B \-\-show
-Read the Hardware Clock and print the time on Standard Output.
-The time is always in local time, even if you keep your Hardware Clock
-in Coordinated Universal Time. See the
-.B \-\-utc
-option.
-
-.TP
-.B \-\-set
-Set the Hardware Clock to the time given by the
-.B \-\-date
-option.
-.TP
-.B \-\-hctosys
-Set the System Time from the Hardware Clock.
-
-Also set the kernel's timezone value to the local timezone as indicated by
-the TZ environment variable and/or
-.IR /usr/lib/zoneinfo ,
-as
-.BR tzset (3)
-would interpret them. EXCEPT: always set the Daylight Savings Time part of
-the kernel's timezone value to 0 ("not Daylight Savings Time"). If DST
-is indicated, just add an hour to the base part.
-
-See the discussion of timezones below.
-
-This is a good option to use in one of the system startup scripts.
-.TP
-.B \-\-systohc
-Set the Hardware Clock to the current System Time.
-.TP
-.B \-\-adjust
-Add or subtract time from the Hardware Clock to account for systematic
-drift since the last time the clock was set or adjusted. See discussion
-below.
-.TP
-.B \-\-getepoch
-Print out standard output the kernel's Hardware Clock epoch value.
-This is the number of years into AD to which a zero year value in the
-Hardware Clock refers. For example, if you are using the convention
-that the year counter in your Hardware Clock contains the number of
-full years since 1952, then the kernel's Hardware Counter epoch value
-must be 1952.
-
-This epoch value is used whenever hwclock reads or sets the Hardware Clock.
-.TP
-.B \-\-setepoch
-Set the kernel's Hardware Clock epoch value to the value specified by the
-.B \-\-epoch
-option. See the
-.B \-\-getepoch
-option for details.
-.TP
-.B \-\-version
-Print the version of
-.I hwclock
-on Standard Output.
-.br
-You need the following option if you specify
-.B \-\-set
-option. Otherwise, it is ignored.
-.TP
-.B \-\-date=date_string
-Specifies the time to which to set the Hardware Clock. The value of this
-option is an argument to the
-.I date(1)
-program. For example,
-.sp
-.I hwclock --set --date="9/22/96 16:45:05"
-.sp
-The argument is in local time, even if you keep your Hardware Clock in
-Coordinated Universal time. See the
-.I \-\-utc
-option.
-
-.TP
-.B \-\-epoch=year
-Specifies the year which is the beginning of the Hardware Clock's
-epoch. I.e. the number of years into AD to which a zero value in the
-Hardware Clock's year counter refers.
-
-For example,
-.sp
-.I hwclock --setepoch --epoch=1952
-
-.PP
-The following options apply to most functions.
-.TP
-.B \-\-utc
-.TP
-.B \-\-localtime
-Indicates that the Hardware Clock is kept in Coordinated Universal
-Time or local time, respectively. It is your choice whether to keep
-your clock in UTC or local time, but nothing in the clock tells which
-you've chosen. So this option is how you give that information to
-.IR hwclock .
-
-If you specify the wrong one of these options (or specify neither and
-take a wrong default), both setting and querying of the Hardware Clock
-will be messed up.
-
-If you specify neither
-.B \-\-utc
-nor
-.B \-\-localtime
-, the default is whichever was specified the last time
-.I hwclock
-was used to set the clock (i.e. hwclock was successfully run with the
-.B \-\-set
-,
-.B \-\-systohc
-,
-or
-.B \-\-adjust
-options), as recorded in the adjtime file. If the adjtime file doesn't
-exist, the default is local time.
-
-.TP
-.B \-\-directisa
-is meaningful only on an ISA machine or an Alpha (which implements enough
-of ISA to be, roughly speaking, an ISA machine for
-.IR hwclock 's
-purposes). For other machines, it has no effect. This option tells
-.I hwclock
-to use explicit I/O instructions to access the Hardware Clock.
-Without this option,
-.I hwclock
-will try to use the /dev/rtc device (which it assumes to be driven by the
-rtc device driver). If it is unable to open the device (for read), it will
-use the explicit I/O instructions anyway.
-
-The rtc device driver was new in Linux Release 2.
-.TP
-.B \-\-badyear
-Indicates that the Hardware Clock is incapable of storing years outside
-the range 1994-1999. There is a problem in some BIOSes (almost all
-Award BIOSes made between 4/26/94 and 5/31/95) wherein they are unable
-to deal with years after 1999. If one attempts to set the year-of-century
-value to something less than 94 (or 95 in some cases), the value that
-actually gets set is 94 (or 95). Thus, if you have one of these machines,
-.I hwclock
-cannot set the year after 1999 and cannot use the value of the clock as
-the true time in the normal way.
-
-To compensate for this (without your getting a BIOS update, which would
-definitely be preferable), always use
-.B \-\-badyear
-if you have one of these machines. When
-.I hwclock
-knows it's working with a brain-damaged clock, it ignores the year part of
-the Hardware Clock value and instead tries to guess the year based on the
-last calibrated date in the adjtime file, by assuming that that date is
-within the past year. For this to work, you had better do a
-.I hwclock \-\-set
-or
-.I hwclock \-\-systohc
-at least once a year!
-
-Though
-.I hwclock
-ignores the year value when it reads the Hardware Clock, it sets the
-year value when it sets the clock. It sets it to 1995, 1996, 1997, or
-1998, whichever one has the same position in the leap year cycle as
-the true year. That way, the Hardware Clock inserts leap days where
-they belong. Again, if you let the Hardware Clock run for more than a
-year without setting it, this scheme could be defeated and you could
-end up losing a day.
-
-.I hwclock
-warns you that you probably need
-.B \-\-badyear
-whenever it finds your Hardware Clock set to 1994 or 1995.
-
-.TP
-.B \-\-srm
-.TP
-.B \-\-arc
-.TP
-.B \-\-jensen
-.TP
-.B \-\-funky\-toy
-These options all tell
-.I hwclock
-what kind of Alpha machine you have. They
-are invalid if you don't have an Alpha and shouldn't be necessary if you
-do, because
-.I hwclock
-should be able to determine by itself what it's
-running on. These options make it possible for
-.I hwclock
-to work even when
-its environment does not conform to its expectations and thus it cannot
-accurately determine what sort of system it is running on. If you think
-hwclock is incorrectly determining the system's characteristics, try
-running with the
-.B \-\-debug
-option to see what conclusions the program is
-reaching and how. If you find you need one of these options to make
-.I hwclock
-work, contact the
-.I hwclock
-maintainer to see if the program can be improved to detect your system
-automatically.
-
-.B \-\-jensen
-means you are running on a Jensen model.
-
-.B \-\-arc
-means your machine is running with ARC console time.
-
-.B \-\-srm
-means your machine is running with SRM console time.
-
-.B \-\-funky\-toy
-means that on your machine, one has to use the UF bit instead
-of the UIP bit in the Hardware Clock to detect a time transition. "Toy"
-in the option name refers to the Time Of Year facility of the machine.
-
-
-.TP
-.B \-\-test
-Do everything except actually updating the Hardware Clock or anything
-else. This is useful, especially in conjunction with
-.B \-\-debug,
-in learning about
-.I hwclock.
-.TP
-.B \-\-debug
-Display a lot of information about what
-.I hwclock
-is doing internally. Some of its function is complex and this output
-can help you understand how the program works.
-
-
-.SH NOTES
-
-
-.SH Clocks in a Linux System
-.PP
-There are two main clocks in a Linux system:
-.PP
-.B The Hardware Clock:
-This is a clock that runs independently of any control program running
-in the CPU and even when the machine is powered off.
-
-On an ISA system, this clock is specified as part of the ISA standard.
-The control program can read or set this clock to a whole second, but
-the control program can also detect the edges of the 1 second clock
-ticks, so the clock actually has virtually infinite precision.
-.PP
-This clock is commonly called the hardware clock, the real time clock,
-the RTC, the BIOS clock, and the CMOS clock. Hardware Clock, in its
-capitalized form, was coined for use by
-.I hwclock
-because all of the other names are inappropriate to the point of being
-misleading.
-.PP
-.B The System Time:
-This is the time kept by a clock inside the Linux kernel and driven by
-a timer interrupt. (On an ISA machine, the timer interrupt is part of
-the ISA standard). It has meaning only while Linux is running on the
-machine. The System Time is the number of seconds since 00:00:00
-January 1, 1970 UTC (or more succinctly, the number of seconds since
-1969). The System Time is not an integer, though. It has virtually
-infinite precision.
-.PP
-The System Time is the time that matters. The Hardware Clock's basic
-purpose in a Linux system is to keep time when Linux is not running. You
-initialize the System Time to the time from the Hardware Clock when Linux
-starts up, and then never use the Hardware Clock again. Note that in DOS,
-for which ISA was designed, the Hardware Clock is the only real time clock.
-.PP
-It is important that the System Time not have any discontinuities such as
-would happen if you used the
-.BR date (1L)
-program to set it while the system is running. You can, however, do whatever
-you want to the Hardware Clock while the system is running, and the next
-time Linux starts up, it will do so with the adjusted time from the Hardware
-Clock. You can also use the program
-.BR adjtimex (8)
-to smoothly adjust the System Time while the system runs.
-.PP
-A Linux kernel maintains a concept of a local timezone for the system.
-But don't be misled -- almost nobody cares what timezone the kernel
-thinks it is in. Instead, programs that care about the timezone
-(perhaps because they want to display a local time for you) almost
-always use a more traditional method of determining the timezone: They
-use the TZ environment variable and/or the /usr/local/timezone
-directory, as explained in the man page for tzset(3). However, some
-programs and fringe parts of the Linux kernel such as filesystems use
-the kernel timezone value. An example is the vfat filesystem. If the
-kernel timezone value is wrong, the vfat filesystem will report and
-set the wrong timestamps on files.
-.PP
-.I hwclock
-sets the kernel timezone to the value indicated by TZ and/or
-/usr/local/timezone when you set the System Time using the
-.B \-\-hctosys
-option.
-.PP
-A complication is that the timezone value actually consists of two
-parts: 1) how far from the Standard Meridian the locality is
-geographically, and 2) whether or not a Daylight Savings Time (DST)
-convention is in effect in the locality at the present time. In
-practice, the DST part of the timezone value is almost never used, so
-if the geographical part were to be set to its correct value, the
-users of the timezone value would actually compute the wrong local
-time.
-.PP
-Therefore,
-.I hwclock
-violates the definition of the kernel's timezone value and always sets
-the DST part to zero. If DST is supposed to be in effect,
-.I hwclock
-simply adds an hour to the geographical part.
-
-.SH How hwclock Accesses the Hardware Clock
-.PP
-.I hwclock
-Uses many different ways to get and set Hardware Clock values.
-The most normal way is to do I/O to the device special file /dev/rtc,
-which is presumed to be driven by the rtc device driver. However,
-this method is not always available. For one thing, the rtc driver is
-a relatively recent addition to Linux. Older systems don't have it.
-Also, though there are versions of the rtc driver that work on DEC
-Alphas, there appear to be plenty of Alphas on which the rtc driver
-does not work (a common symptom is hwclock hanging).
-.PP
-On older systems, the method of accessing the Hardware Clock depends on
-the system hardware.
-.PP
-On an ISA system,
-.I hwclock
-can directly access the "CMOS memory" registers that
-constitute the clock, by doing I/O to Ports 0x70 and 0x71. It does
-this with actual I/O instructions and consequently can only do it if
-running with superuser effective userid. (In the case of a Jensen
-Alpha, there is no way for
-.I hwclock
-to execute those I/O instructions, and so it uses instead the
-/dev/port device special file, which provides almost as low-level an
-interface to the I/O subsystem).
-
-This is a really poor method of accessing the clock, for all the
-reasons that user space programs are generally not supposed to do
-direct I/O and disable interrupts. Hwclock provides it because it is
-the only method available on ISA and Alpha systems which don't have
-working rtc device drivers available.
-
-.PP
-On an m68k system,
-.I hwclock
-can access the clock via the console driver, via the device special
-file /dev/tty1.
-.PP
-.I hwclock
-tries to use /dev/rtc. If it is compiled for a kernel that doesn't have
-that function or it is unable to open /dev/rtc,
-.I hwclock
-will fall back to another method, if available. On an ISA or Alpha
-machine, you can force
-.I hwclock
-to use the direct manipulation of the CMOS registers without even trying
-.I /dev/rtc
-by specifying the \-\-directisa option.
-
-
-.SH The Adjust Function
-.PP
-The Hardware Clock is usually not very accurate. However, much of its
-inaccuracy is completely predictable - it gains or loses the same amount
-of time every day. This is called systematic drift.
-.IR hwclock 's
-"adjust" function lets you make systematic corrections to correct the
-systematic drift.
-.PP
-It works like this:
-.I hwclock
-keeps a file,
-.I /etc/adjtime,
-that keeps some historical information. This is called the adjtime file.
-.PP
-Suppose you start with no adjtime file. You issue a
-.I hwclock \-\-set
-command to set the Hardware Clock to the true current time.
-.I Hwclock
-creates the adjtime file and records in it the current time as the
-last time the clock was calibrated.
-5 days
-later, the clock has gained 10 seconds, so you issue another
-.I hwclock \-\-set
-command to set it back 10 seconds.
-.I Hwclock
-updates the adjtime file to show the current time as the last time the
-clock was calibrated, and records 2 seconds per day as the systematic
-drift rate. 24 hours go by, and then you issue a
-.I hwclock \-\-adjust
-command.
-.I Hwclock
-consults the adjtime file and sees that the clock gains 2 seconds per
-day when left alone and that it has been left alone for exactly one
-day. So it subtracts 2 seconds from the Hardware Clock. It then
-records the current time as the last time the clock was adjusted.
-Another 24 hours goes by and you issue another
-.I hwclock \-\-adjust.
-.I Hwclock
-does the same thing: subtracts 2 seconds and updates the adjtime file
-with the current time as the last time the clock was adjusted.
-.PP
-Every time you calibrate (set) the clock (using
-.I \-\-set
-or
-.I \-\-systohc
-),
-.I hwclock
-recalculates the systematic drift rate based on how long it has been
-since the last calibration, how long it has been since the last
-adjustment, what drift rate was assumed in any intervening
-adjustments, and the amount by which the clock is presently off.
-.PP
-A small amount of error creeps in any time
-.I hwclock
-sets the clock, so it refrains from making an adjustment that would be
-less than 1 second. Later on, when you request an adjustment again,
-the accumulated drift will be more than a second and
-.I hwclock
-will do the adjustment then.
-.PP
-It is good to do a
-.I hwclock \-\-adjust
-just before the
-.I hwclock \-\-hctosys
-at system startup time, and maybe periodically while the system is
-running via cron.
-.PP
-The adjtime file, while named for its historical purpose of controlling
-adjustments only, actually contains other information for use by hwclock
-in remembering information from one invocation to the next.
-.PP
-The format of the adjtime file is, in ASCII:
-.PP
-Line 1: 3 numbers, separated by blanks: 1) systematic drift rate in
-seconds per day, floating point decimal; 2) Resulting number of
-seconds since 1969 UTC of most recent adjustment or calibration,
-decimal integer; 3) zero (for compatibility with
-.IR clock )
-as a decimal integer.
-.PP
-Line 2: 1 number: Resulting number of seconds since 1969 UTC of most
-recent calibration. Zero if there has been no calibration yet or it
-is known that any previous calibration is moot (for example, because
-the Hardware Clock has been found, since that calibration, not to
-contain a valid time). This is a decimal integer.
-.PP
-Line 3: "UTC" or "LOCAL". Tells whether the Hardware Clock is set to
-Coordinated Universal Time or local time. You can always override this
-value with options on the
-.I hwclock
-command line.
-.PP
-You can use an adjtime file that was previously used with the
-.I clock
-program with
-.I hwclock.
-
-
-.SH "Automatic Hardware Clock Synchronization By the Kernel"
-
-You should be aware of another way that the Hardware Clock is kept
-synchronized in some systems. The Linux kernel has a mode wherein it
-copies the System Time to the Hardware Clock every 11 minutes.
-This is a good mode to use when you are using something sophisticated
-like ntp to keep your System Time synchronized. (ntp is a way to keep
-your System Time synchronized either to a time server somewhere on the
-network or to a radio clock hooked up to your system. See RFC 1305).
-
-This mode (we'll call it "11 minute mode") is off until something
-turns it on. The ntp daemon xntpd is one thing that turns it on. You
-can turn it off by running anything, including
-.IR "hwclock \-\-hctosys" ,
-that sets the System Time the old fashioned way.
-
-To see if it is on or
-off, use the command
-.I adjtimex \-\-print
-and look at the value of "status". If the "64" bit of this number
-(expressed in binary) equal to 0, 11 minute mode is on. Otherwise, it
-is off.
-
-If your system runs with 11 minute mode on, don't use
-.I hwclock \-\-adjust
-or
-.IR "hwclock \-\-hctosys" .
-You'll just make a mess. It is acceptable to use a
-.I hwclock \-\-hctosys
-at startup time to get a reasonable System Time until your system is
-able to set the System Time from the external source and start 11
-minute mode.
-
-
-.SH ISA Hardware Clock Century value
-
-There is some sort of standard that defines CMOS memory Byte 50 on an ISA
-machine as an indicator of what century it is.
-.I hwclock
-does not use or set that byte because there are some machines that
-don't define the byte that way, and it really isn't necessary anyway,
-since the year-of-century does a good job of implying which century it
-is.
-
-If you have a bona fide use for a CMOS century byte, contact the
-.I hwclock
-maintainer; an option may be appropriate.
-
-Note that this section is only relevant when you are using the "direct
-ISA" method of accessing the Hardware Clock.
-
-
-
-.SH "ENVIRONMENT VARIABLES"
-.I TZ
-
-.SH FILES
-.I /etc/adjtime
-.I /usr/lib/zoneinfo/
-.I /dev/rtc
-.I /dev/port
-.I /dev/tty1
-.I /proc/cpuinfo
-
-.SH "SEE ALSO"
-.BR adjtimex (8),
-.BR date (1),
-.BR gettimeofday (2),
-.BR settimeofday (2),
-.BR crontab (1),
-.BR tzset (3)
-
-.SH AUTHORS
-Written By Bryan Henderson, September 1996 (bryanh@giraffe-data.com),
-based on work done on the
-.I clock
-program by Charles Hedrick, Rob Hooft, and Harald Koenig.
-See the source code for complete history and credits.
-
-
diff --git a/clockB/hwclock.c b/clockB/hwclock.c
deleted file mode 100644
index e7f1c919b..000000000
--- a/clockB/hwclock.c
+++ /dev/null
@@ -1,1744 +0,0 @@
-/**************************************************************************
- hwclock
-***************************************************************************
-
- This is a program for reading and setting the Hardware Clock on an ISA
- family computer. This is the clock that is also known as the RTC,
- real time clock, or, unfortunately, the CMOS clock.
-
- See man page for details.
-
- By Bryan Henderson, 96.09.19. bryanh@giraffe-data.com
-
- Based on work by others; see history at end of source code.
-
-**************************************************************************/
-/**************************************************************************
- Maintenance notes
-
- To compile this, you must use GNU compiler optimization (-O option)
- in order to make the "extern inline" functions from asm/io.h (inb(),
- etc.) compile. If you don't optimize, which means the compiler
- will generate no inline functions, the references to these functions
- in this program will be compiled as external references. Since you
- probably won't be linking with any functions by these names, you will
- have unresolved external references when you link.
-
- The program is designed to run setuid superuser, since we need to be
- able to do direct I/O. (More to the point: we need permission to
- execute the iopl() system call). (However, if you use one of the
- methods other than direct ISA I/O to access the clock, no setuid is
- required).
-
- Here's some info on how we must deal with the time that elapses while
- this program runs: There are two major delays as we run:
-
- 1) Waiting up to 1 second for a transition of the Hardware Clock so
- we are synchronized to the Hardware Clock.
-
- 2) Running the "date" program to interpret the value of our --date
- option.
-
- Reading the /etc/adjtime file is the next biggest source of delay and
- uncertainty.
-
- The user wants to know what time it was at the moment he invoked us,
- not some arbitrary time later. And in setting the clock, he is
- giving us the time at the moment we are invoked, so if we set the
- clock some time later, we have to add some time to that.
-
- So we check the system time as soon as we start up, then run "date"
- and do file I/O if necessary, then wait to synchronize with a
- Hardware Clock edge, then check the system time again to see how
- much time we spent. We immediately read the clock then and (if
- appropriate) report that time, and additionally, the delay we measured.
-
- If we're setting the clock to a time given by the user, we wait some
- more so that the total delay is an integral number of seconds, then
- set the Hardware Clock to the time the user requested plus that
- integral number of seconds. N.B. The Hardware Clock can only be set
- in integral seconds.
-
- If we're setting the clock to the system clock value, we wait for
- the system clock to reach the top of a second, and then set the
- Hardware Clock to the system clock's value.
-
- Here's an interesting point about setting the Hardware Clock: On my
- machine, when you set it, it sets to that precise time. But one can
- imagine another clock whose update oscillator marches on a steady one
- second period, so updating the clock between any two oscillator ticks
- is the same as updating it right at the earlier tick. To avoid any
- complications that might cause, we set the clock as soon as possible
- after an oscillator tick.
-
-
- About synchronizing to the Hardware Clock when reading the time: The
- precision of the Hardware Clock counters themselves is one second.
- You can't read the counters and find out that is 12:01:02.5. But if
- you consider the location in time of the counter's ticks as part of
- its value, then its precision is as infinite as time is continuous!
- What I'm saying is this: To find out the _exact_ time in the
- hardware clock, we wait until the next clock tick (the next time the
- second counter changes) and measure how long we had to wait. We
- then read the value of the clock counters and subtract the wait time
- and we know precisely what time it was when we set out to query the
- time.
-
- hwclock uses this method, and considers the Hardware Clock to have
- infinite precision.
-
- Definition of century: In this program, a century is a 100 year
- period in which all the years' numbers in the Gregorian calendar
- differ only in their last two decimal digits. E.g. 1900-1999 is
- a century. The 20th Century (1901-2000), however, is not.
-
-
- About the unusual situation of the Jensen variety of Alpha:
-
- Martin Ostermann writes:
-
- The problem with the Jensen is twofold: First, it has the clock at a
- different address. Secondly, it has a distinction beween "local" and
- normal bus addresses. The local ones pertain to the hardware integrated
- into the chipset, like serial/parallel ports and of course, the RTC.
- Those need to be addressed differently. This is handled fine in the kernel,
- and it's not a problem, since this usually gets totally optimized by the
- compile. But the i/o routines of (g)libc lack this support so far.
- The result of this is, that the old clock program worked only on the
- Jensen when USE_DEV_PORT was defined, but not with the normal inb/outb
- functions.
-
-
-
- Enhancements needed:
-
- - When waiting for whole second boundary in set_hardware_clock_exact,
- fail if we miss the goal by more than .1 second, as could happen if
- we get pre-empted (by the kernel dispatcher).
-
-****************************************************************************/
-
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include "shhopt.h"
-#include "../version.h" /* Defines UTIL_LINUX, among other things */
-#include "hwclock.h"
-
-#define FLOOR(arg) ((arg >= 0 ? (int) arg : ((int) arg) - 1));
-
-/* Here the information for time adjustments is kept. */
-#define ADJPATH "/etc/adjtime"
-
-/* Note that we must define the boolean type as int because we use the
- shhopt option processing library which, unfortunately, returns flag
- options as integers. It is customary to define bool as char, but
- then we would have to do a lot of conversion in order to interface
- with shhopt.
-*/
-
-/* The following are times, in unix standard format (seconds since 1969) */
-#define START_OF_1994 757411200
-#define END_OF_1995 820396800
-
-struct adjtime {
- /* This is information we keep in the adjtime file that tells us how
- to do drift corrections, among other things. Elements are all
- straight from the adjtime file, so see documentation of that file
- for details. Exception is <dirty>, which is an indication that
- what's in this structure is not what's in the disk file (because
- it has been updated since read from the disk file).
- */
-
- bool dirty;
- float drift_factor;
- time_t last_adj_time;
- float not_adjusted;
- time_t last_calib_time;
- /* The most recent time that we set the clock from an external
- authority (as opposed to just doing a drift adjustment)
- */
- enum a_local_utc {LOCAL, UTC} local_utc;
- /* To which time zone, local or UTC, we most recently set the
- hardware clock.
- */
-};
-
-
-
-
-
-bool debug;
- /* We are running in debug mode, wherein we put a lot of information about
- what we're doing to standard output. Because of the pervasive and yet
- background nature of this value, this is a global variable. */
-
-
-
-/* We're going to assume that if the CPU is in the Intel x86 family,
- this is an ISA family machine. For all practical purposes, this is
- the case at the time of this writing, especially after we assume a
- Linux kernel is running on it.
- */
-const bool isa_machine =
-#ifdef __i386__
-TRUE
-#else
-FALSE;
-#endif
-;
-
-const bool alpha_machine =
-#ifdef __alpha__
-TRUE
-#else
-FALSE;
-#endif
-;
-
-
-
-static bool
-hw_clock_is_utc(const bool utc, const bool local_opt,
- const struct adjtime adjtime) {
-/*----------------------------------------------------------------------------
- Return true iff the hardware clock keeps Coordinated Universal Time
- rather than local time.
-
- 'utc' means the user told us in the invocation options that the
- hardware clock is kept in UTC.
------------------------------------------------------------------------------*/
-
- bool retval; /* our return value */
-
- if (utc) retval = TRUE;
- else if (local_opt) retval = FALSE;
- else retval = (adjtime.local_utc == UTC);
- if (debug) printf("Assuming hardware clock is kept in %s time.\n",
- retval ? "UTC" : "LOCAL");
- return retval;
-}
-
-
-
-static void
-read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
-/*----------------------------------------------------------------------------
- Read the adjustment parameters and other persistent variables out of
- the /etc/adjtime file.
-
- Return them as the adjtime structure <*adjtime_p>.
-
- If there is no /etc/adjtime file, return defaults.
- If values are missing from the file, return defaults for them.
-
- return *rc_p = 0 if all OK, !=0 otherwise.
-
- Note: The default is LOCAL rather than UTC for historical reasons.
-
------------------------------------------------------------------------------*/
- FILE *adjfile;
- int rc; /* local return code */
- struct stat statbuf; /* We don't even use the contents of this. */
-
- rc = stat(ADJPATH, &statbuf);
- if (rc < 0 && errno == ENOENT) {
- /* He doesn't have a adjtime file, so we'll use defaults. */
- adjtime_p->drift_factor = 0;
- adjtime_p->last_adj_time = 0;
- adjtime_p->not_adjusted = 0;
- adjtime_p->last_calib_time = 0;
- adjtime_p->local_utc = LOCAL;
-
- *rc_p = 0;
- } else {
- adjfile = fopen(ADJPATH, "r"); /* open file for reading */
- if (adjfile == NULL) {
- const int fopen_errno = errno;
- fprintf(stderr, MYNAME " is unable to open file " ADJPATH ". "
- "fopen() errno=%d:%s", fopen_errno, strerror(fopen_errno));
- *rc_p = 2;
- } else {
- char line1[81]; /* String: first line of adjtime file */
- char line2[81]; /* String: second line of adjtime file */
- char line3[81]; /* String: third line of adjtime file */
-
- line1[0] = '\0'; /* In case fgets fails */
- fgets(line1, sizeof(line1), adjfile);
- line2[0] = '\0'; /* In case fgets fails */
- fgets(line2, sizeof(line2), adjfile);
- line3[0] = '\0'; /* In case fgets fails */
- fgets(line3, sizeof(line3), adjfile);
-
- fclose(adjfile);
-
- /* Set defaults in case values are missing from file */
- adjtime_p->drift_factor = 0;
- adjtime_p->last_adj_time = 0;
- adjtime_p->not_adjusted = 0;
- adjtime_p->last_calib_time = 0;
- adjtime_p->local_utc = LOCAL;
-
- sscanf(line1, "%f %d %f",
- &adjtime_p->drift_factor,
- (int *) &adjtime_p->last_adj_time,
- &adjtime_p->not_adjusted);
-
- sscanf(line2, "%d", (int *) &adjtime_p->last_calib_time);
-
- {
- char local_utc_string[sizeof(line3)];
-
- local_utc_string[0] = '\0'; /* In case nothing in line3 */
- sscanf(line3, "%s", local_utc_string);
-
- *rc_p = 0; /* Initial assumption - local/utc token is valid */
- if (strlen(local_utc_string) == 0)
- adjtime_p->local_utc = LOCAL;
- else if (strcmp(local_utc_string, "UTC") == 0)
- adjtime_p->local_utc = UTC;
- else if (strcmp(local_utc_string, "LOCAL") == 0)
- adjtime_p->local_utc = LOCAL;
- else {
- fprintf(stderr, "%s: The first token of the third line of the file "
- ADJPATH " is invalid. It must be LOCAL or UTC, indicating "
- "to which time zone the hardware clock is set. Its "
- "present value is '%s'.\n", MYNAME, local_utc_string);
- *rc_p = 5;
- }
- }
- }
- adjtime_p->dirty = FALSE;
-
- if (debug) {
- printf("Last drift adjustment done %s (Time %d)\n",
- ctime2(adjtime_p->last_adj_time),
- (int) adjtime_p->last_adj_time);
- printf("Last calibration done %s (Time %d)\n",
- ctime2(adjtime_p->last_calib_time),
- (int) adjtime_p->last_calib_time);
- }
- }
-}
-
-
-
-static void
-synchronize_to_clock_tick(enum clock_access_method clock_access,
- const int dev_port, const bool use_uf_bit,
- int *retcode_p) {
-/*-----------------------------------------------------------------------------
- Wait until the moment the Hardware Clock updates to the next second,
- so we know the exact time.
-
- The clock only has 1 second precision, so it gives the exact time only
- once per second.
-
- Return *retcode_p == 0 if it worked, nonzero if it didn't.
------------------------------------------------------------------------------*/
- if (debug) printf("Waiting for clock tick...\n");
-
- switch (clock_access) {
- case ISA: synchronize_to_clock_tick_ISA(retcode_p, -1, use_uf_bit); break;
- case DEV_PORT: synchronize_to_clock_tick_ISA(retcode_p, dev_port,
- use_uf_bit); break;
- case RTC_IOCTL: synchronize_to_clock_tick_RTC(retcode_p); break;
- case KD: synchronize_to_clock_tick_KD(retcode_p); break;
- default:
- fprintf(stderr, "%s: Internal error in synchronize_to_clock_tick. "
- "Invalid value for clock_access argument: %d.\n",
- MYNAME, clock_access);
- *retcode_p = 1;
- }
- if (debug) printf("...got clock tick\n");
- return;
-}
-
-
-static struct tm
-make_within_one_year(const struct tm base_tm, const time_t last_known_time) {
-/*----------------------------------------------------------------------------
- Compute a time that is the same as the input base_tm, except for a
- different year. The year shall be whatever year it takes to make the
- output time within one year after last_known_time.
-
- The timezone for both the input and output values is the value of
- the TZ environment variable.
------------------------------------------------------------------------------*/
- struct tm broken_last_known_time;
- /* The input time last_known_time, in broken down format */
- struct tm test_time;
-
- if (debug)
- printf("Ignoring clock year and assuming "
- "it's within 1 year after %s\n",
- ctime2(last_known_time));
-
- broken_last_known_time = *localtime(&last_known_time);
-
- test_time = base_tm;
- test_time.tm_year = broken_last_known_time.tm_year;
-
- if (mktime(&test_time) < last_known_time)
- test_time.tm_year += 1;
-
- return(test_time);
-}
-
-
-
-static void
-mktime_tz(struct tm hw_tm, const bool universal, const bool badyear,
- const time_t last_known_time,
- bool *valid_p, time_t *systime_p) {
-/*-----------------------------------------------------------------------------
- Convert a time in broken down format (hours, minutes, etc.) as read
- from the Hardware Clock into standard unix time (seconds into
- epoch). Return it as *systime_p.
-
- The broken down time is argument <tm>. This broken down time is
- either in local time zone or UTC, depending on value of logical
- argument 'universal'. True means it is in UTC.
-
- Argument 'badyear' true means the input time is from one of those
- machines with the Award BIOS that is incapable of storing a year
- value less than 94 or 95, which means we can't use the year value
- from the clock (see documentation of hwclock's --badyear option).
- In this case, we instead determine the year by assuming that it's
- less than a year since the time <last_known_time>.
-
-
- If the argument contains values that do not constitute a valid time,
- and mktime() recognizes this, return *valid_p == false and
- *systime_p undefined. However, mktime() sometimes goes ahead and
- computes a fictional time "as if" the input values were valid,
- e.g. if they indicate the 31st day of April, mktime() may compute
- the time of May 1. In such a case, we return the same fictional
- value mktime() does as *systime_p and return *valid_p == true.
-
------------------------------------------------------------------------------*/
- time_t mktime_result; /* The value returned by our mktime() call */
- struct tm adjusted_tm;
- /* The same as the value from our argument, except if we determine
- the year in the argument is garbage, this value contains the year
- computed from the ADJTIME file instead.
- */
- char *zone; /* Local time zone name */
-
- /* We use the C library function mktime(), but since it only works on
- local time zone input, we may have to fake it out by temporarily
- changing the local time zone to UTC.
- */
- zone = (char *) getenv("TZ"); /* remember original time zone */
-
- if (universal) {
- /* Set timezone to UTC */
- setenv("TZ", "UTC 0", TRUE);
- /* Note: tzset() gets called implicitly by the time code, but only the
- first time. When changing the environment variable, better call
- tzset() explicitly.
-
- Also: documentation for tzset() says if TZ = "", that means UTC.
- But practice shows that that only works if tzset() hasn't already
- been called before. So we explicitly say "UTC 0".
- */
- tzset();
- }
-
- if (badyear)
- adjusted_tm = make_within_one_year(hw_tm, last_known_time);
- else adjusted_tm = hw_tm;
-
- mktime_result = mktime(&adjusted_tm);
- if (mktime_result == -1) {
- /* This apparently (not specified in mktime() documentation) means
- the 'adjusted_tm' structure does not contain valid values (however, not
- containing valid values does _not_ imply mktime() returns -1).
- */
- /* Note that we are assuming here that the invalidity came from the
- hardware values and was not introduced by our adjustments!
- */
- *valid_p = FALSE;
- *systime_p = 0;
- if (debug)
- printf("Invalid values in hardware clock: "
- "%2d/%.2d/%.2d %.2d:%.2d:%.2d\n",
- hw_tm.tm_year, hw_tm.tm_mon+1, hw_tm.tm_mday,
- hw_tm.tm_hour, hw_tm.tm_min, hw_tm.tm_sec
- );
- } else {
- *valid_p = TRUE;
- *systime_p = mktime_result;
- if (debug)
- printf("Hw clock time : %s = %d seconds since 1969\n",
- ctime2(*systime_p), (int) *systime_p);
- }
- /* now put back the original zone. */
- if (zone) setenv("TZ", zone, TRUE);
- else unsetenv("TZ");
- tzset();
-}
-
-
-
-static void
-read_hardware_clock(const enum clock_access_method method,
- const int dev_port,
- const bool universal, const int hc_zero_year,
- const bool badyear,
- const time_t last_known_time,
- bool *valid_p, time_t *systime_p) {
-/*----------------------------------------------------------------------------
- Read the hardware clock and return the current time via *systime_p
- argument.
-
- If the hardware clock fails to tell us a time, return *valid_p == false
- and undefined value as *systime_p. Otherwise *valid_p == true.
-
- Consider the hardware clock to be set in Coordinated Universal Time
- (UTC) iff 'universal' == true.
-
- Consider the year value of the clock to be useless iff 'badyear' == true.
-
- Recognize that the present time is is after 'last_known_time', which
- information may be necessary to interpret the value of some hardware
- clocks.
-
- Use the method indicated by 'method' argument to access the hardware clock.
------------------------------------------------------------------------------*/
- struct tm tm;
-
- switch (method) {
- case RTC_IOCTL:
- read_hardware_clock_rtc_ioctl(&tm);
- break;
- case ISA:
- read_hardware_clock_isa(&tm, -1, hc_zero_year);
- break;
- case DEV_PORT:
- read_hardware_clock_isa(&tm, dev_port, hc_zero_year);
- break;
- case KD:
- read_hardware_clock_kd(&tm);
- break;
- default:
- fprintf(stderr,
- "%s: Internal error: invalid value for clock access method.\n",
- MYNAME);
- exit(5);
- }
- if (debug)
- printf ("Time read from Hardware Clock: Y=%d M=%d D=%d %02d:%02d:%02d\n",
- tm.tm_year, tm.tm_mon+1, tm.tm_mday,
- tm.tm_hour, tm.tm_min, tm.tm_sec);
- mktime_tz(tm, universal, badyear, last_known_time, valid_p, systime_p);
-}
-
-
-
-static void
-set_hardware_clock(const enum clock_access_method method,
- const int dev_port,
- const time_t newtime,
- const bool universal,
- const int hc_zero_year, const bool badyear,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock to the time 'newtime', in local time zone or UTC,
- according to 'universal'.
-
- 'badyear' true means the clock is incapable of storing the proper
- year value, so we instead store 95, 96, 97, or 98 so that it is at
- least in the right place in the leap year cycle (and will remain so
- for at least the next year).
-
- Use the method indicated by the 'method' argument.
-----------------------------------------------------------------------------*/
- struct tm new_broken_time;
- /* Time to which we will set Hardware Clock, in broken down format, in
- the time zone of caller's choice
- */
-
- if (universal) new_broken_time = *gmtime(&newtime);
- else new_broken_time = *localtime(&newtime);
-
- /* If the clock is incapable of storing the true year value, change
- the year to a fictional stand-in year as described in the prolog.
- */
- if (badyear)
- new_broken_time.tm_year = 95 + ((new_broken_time.tm_year + 1) % 4);
-
- if (debug)
- printf("Setting Hardware Clock to %.2d:%.2d:%.2d "
- "= %d seconds since 1969\n",
- new_broken_time.tm_hour, new_broken_time.tm_min,
- new_broken_time.tm_sec, (int) newtime);
-
- switch (method) {
- case RTC_IOCTL:
- set_hardware_clock_rtc_ioctl(new_broken_time, testing);
- break;
- case ISA:
- set_hardware_clock_isa(new_broken_time, hc_zero_year, -1, testing);
- break;
- case DEV_PORT:
- set_hardware_clock_isa(new_broken_time, hc_zero_year, dev_port, testing);
- break;
- case KD:
- set_hardware_clock_kd(new_broken_time, testing);
- break;
- default:
- fprintf(stderr,
- "%s: Internal error: invalid value for clock access method.\n",
- MYNAME);
- exit(5);
- }
-}
-
-
-
-static void
-set_hardware_clock_exact(const time_t settime,
- const struct timeval ref_time,
- const enum clock_access_method clock_access,
- const int dev_port,
- const bool universal,
- const int hc_zero_year,
- const bool badyear,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock to the time 'settime', in local time zone or UTC,
- according to 'universal'.
-
- But iff 'badyear', use a fictional year as appropriate for the --badyear
- option.
-
- But correct 'settime' and wait for a fraction of a second so that
- 'settime' is the value of the Hardware Clock as of system time
- 'ref_time', which is in the past. For example, if 'settime' is
- 14:03:05 and 'ref_time' is 12:10:04.5 and the current system
- time is 12:10:06.0: Wait .5 seconds (to make exactly 2 seconds since
- 'ref_time') and then set the Hardware Clock to 14:03:07, thus
- getting a precise and retroactive setting of the clock.
-
- (Don't be confused by the fact that the system clock and the Hardware
- Clock differ by two hours in the above example. That's just to remind
- you that there are two independent time scales here).
-
- This function ought to be able to accept set times as fractional times.
- Idea for future enhancement.
-
------------------------------------------------------------------------------*/
- time_t newtime; /* Time to which we will set Hardware Clock */
- struct timeval now_time; /* locally used time */
-
- gettimeofday(&now_time, NULL);
- newtime = settime + (int) time_diff(now_time, ref_time) + 1;
- if (debug)
- printf("Time elapsed since reference time has been %.6f seconds.\n"
- "Delaying further to reach the next full second.\n",
- time_diff(now_time, ref_time));
-
- /* Now delay some more until Hardware Clock time 'newtime' arrives */
- do gettimeofday(&now_time, NULL);
- while (time_diff(now_time, ref_time) < newtime - settime);
-
- set_hardware_clock(clock_access, dev_port, newtime,
- universal, hc_zero_year, badyear, testing);
-}
-
-
-
-static void
-display_time(const bool hclock_valid, const time_t systime,
- const float sync_duration, const bool badyear_warn) {
-/*----------------------------------------------------------------------------
- Put the time 'systime' on standard output in display format.
- Except if hclock_valid == false, just tell standard output that we don't
- know what time it is.
-
- Include in the output the adjustment 'sync_duration'.
-
- If the year is 1994 or 1995 and 'badyear_warn' is true, warn the
- user that he has a brain-damaged clock and needs to use --badyear.
- Since we didn't exist in 1994 and 1995, we know the clock isn't
- correct.
-
------------------------------------------------------------------------------*/
- if (!hclock_valid)
- fprintf(stderr, "%s: 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", MYNAME);
- else {
- if (badyear_warn && (systime > START_OF_1994 && systime < END_OF_1995)) {
- printf("WARNING: The Hardware Clock shows a time in 1994 "
- "or 1995. This probably means you have a Hardware Clock "
- "that is incapable of tracking years after 1999, and you "
- "must use the --badyear option to make hwclock work for "
- "you. See hwclock documentation for details.\n");
- }
-
- printf("%s %.6f seconds\n", ctime2(systime), -(sync_duration));
- }
-}
-
-
-
-static int
-interpret_date_string(const char *date_opt, time_t * const time_p) {
-/*----------------------------------------------------------------------------
- Interpret the value of the --date option, which is something like
- "13:05:01". In fact, it can be any of the myriad ASCII strings that specify
- a time which the "date" program can understand. The date option value in
- question is our "dateopt" argument.
-
- The specified time is in the local time zone.
-
- Our output, "*time_p", is a seconds-into-epoch time.
-
- We use the "date" program to interpret the date string. "date" must be
- runnable by issuing the command "date" to the /bin/sh shell. That means
- in must be in the current PATH.
-
- If anything goes wrong (and many things can), we return return code
- 10 and arbitrary *time_p. Otherwise, return code is 0 and *time_p
- is valid.
-----------------------------------------------------------------------------*/
- FILE *date_child_fp;
- char date_resp[100];
- const char magic[]="seconds-into-epoch=";
- char date_command[100];
- int retcode; /* our eventual return code */
- int rc; /* local return code */
-
- if (date_opt == NULL) {
- fprintf(stderr, "%s: No --date option specified.\n", MYNAME);
- retcode = 14;
- } else if (strchr(date_opt, '"') != NULL) {
- /* Quotation marks in date_opt would ruin the date command we construct.
- */
- fprintf(stderr, "%s: The value of the --date option is not a valid date.\n"
- "In particular, it contains quotation marks.\n", MYNAME);
- retcode = 12;
- } else {
- sprintf(date_command, "date --date=\"%s\" +seconds-into-epoch=%%s",
- date_opt);
- if (debug) printf("Issuing date command: %s\n", date_command);
-
- date_child_fp = popen(date_command, "r");
- if (date_child_fp == NULL) {
- fprintf(stderr, "%s: Unable to run 'date' program in /bin/sh shell. "
- "popen() failed with errno=%s (%d)\n",
- MYNAME, strerror(errno), errno);
- retcode = 10;
- } else {
- date_resp[0] = '\0'; /* in case fgets fails */
- fgets(date_resp, sizeof(date_resp), date_child_fp);
- if (debug) printf("response from date command = %s\n", date_resp);
- if (strncmp(date_resp, magic, sizeof(magic)-1) != 0) {
- fprintf(stderr, "%s: The date command issued by " MYNAME " returned "
- "unexpected results.\n"
- "The command was:\n %s\nThe response was:\n %s\n",
- MYNAME, date_command, date_resp);
- retcode = 8;
- } else {
- int seconds_since_epoch;
- rc = sscanf(date_resp + sizeof(magic)-1, "%d", &seconds_since_epoch);
- if (rc < 1) {
- fprintf(stderr, "%s: The date command issued by " MYNAME " returned"
- "something other than an integer where the converted"
- "time value was expected.\n"
- "The command was:\n %s\nThe response was:\n %s\n",
- MYNAME, date_command, date_resp);
- retcode = 6;
- } else {
- retcode = 0;
- *time_p = seconds_since_epoch;
- if (debug)
- printf("date string %s equates to %d seconds since 1969.\n",
- date_opt, (int) *time_p);
- }
- }
- fclose(date_child_fp);
- }
- }
- return(retcode);
-}
-
-
-
-static int
-set_system_clock(const bool hclock_valid, const time_t newtime,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the System Clock to time 'newtime'.
-
- Also set the kernel time zone value to the value indicated by the
- TZ environment variable and/or /usr/lib/zoneinfo/, interpreted as
- tzset() would interpret them. Except: do not consider Daylight
- Savings Time to be a separate component of the time zone. Include
- any effect of DST in the basic timezone value and set the kernel
- DST value to 0.
-
- EXCEPT: if hclock_valid is false, just issue an error message
- saying there is no valid time in the Hardware Clock to which to set
- the system time.
-
- If 'testing' is true, don't actually update anything -- just say we
- would have.
------------------------------------------------------------------------------*/
- int retcode; /* our eventual return code */
-
- if (!hclock_valid) {
- fprintf(stderr, "%s: The Hardware Clock does not contain a valid time, so "
- "we cannot set the System Time from it.\n", MYNAME);
- retcode = 1;
- } else {
- struct timeval tv;
- int rc; /* local return code */
-
- tv.tv_sec = newtime;
- tv.tv_usec = 0;
-
- tzset(); /* init timezone, daylight from TZ or ...zoneinfo/localtime */
- /* An undocumented function of tzset() is to set global variabales
- 'timezone' and 'daylight'
- */
-
- if (debug) {
- printf( "Calling settimeofday:\n" );
- /* Note: tv_sec and tv_usec are declared variously on different
- systems: int, long, time_t. Casting to long below makes it
- compile everywhere.
- */
- printf( "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n",
- (long) tv.tv_sec, (long) tv.tv_usec );
- }
- if (testing) {
- printf("Not setting system clock because running in test mode.\n");
- retcode = 0;
- } else {
- /* For documentation of settimeofday() see, in addition to its man page,
- kernel/time.c in the Linux source code.
- */
- const struct timezone tz = { timezone/60 - 60*daylight, 0 };
- /* put daylight in minuteswest rather than dsttime,
- since the latter is mostly ignored ... */
- rc = settimeofday(&tv, &tz);
- if (rc != 0) {
- if (errno == EPERM)
- fprintf(stderr, "%s: Must be superuser to set system clock.\n",
- MYNAME);
- else
- fprintf(stderr,
- "%s: settimeofday() failed, errno=%s (%d)\n",
- MYNAME, strerror(errno), errno);
- retcode = 1;
- } else retcode = 0;
- }
- }
- return(retcode);
-}
-
-
-static void
-adjust_drift_factor(struct adjtime *adjtime_p,
- const time_t actual_time,
- const bool hclock_valid,
- const struct timeval hclocktime ) {
-/*---------------------------------------------------------------------------
- Update the drift factor and calibration parameters in '*adjtime_p'
- to reflect the fact that at some recent instant when the actual time
- was 'actual_time', the Hardware Clock said the time was
- 'hclocktime', and that we have corrected the Hardware Clock
- accordingly. Note that 'hclocktime' is a fractional time, taking
- into consideration the Hardware Clock register contents and how long
- those contents had been that.
-
- We assume that the only cause of error in the Hardware Clock is
- systematic drift and that the user has been doing regular drift
- adjustments using the drift factor in the adjtime file. Therefore,
- if 'actual_time' and 'hclocktime' are different, that means the drift
- factor isn't quite right.
-
- EXCEPT: if 'hclock_valid' is false, assume Hardware Clock was not set
- before to anything meaningful and regular adjustments have not been
- done, so don't adjust the drift factor.
-
- Also, don't adjust if the error is more than 30 minutes, because that
- kind of error probably isn't drift.
-
-----------------------------------------------------------------------------*/
- if (!hclock_valid) {
- if (debug)
- printf("Not adjusting drift factor because the Hardware Clock "
- "previously contained garbage.\n");
- } else if (adjtime_p->last_calib_time == 0) {
- if (debug)
- printf("Not adjusting drift factor because there is no \n"
- "previous calibration information (i.e. adjtime file is \n"
- "nonexistent or has 0 in last calibration time field).\n");
- } else if (time_diff(hclocktime, t2tv(adjtime_p->last_calib_time))
- < 23.0 * 60.0 * 60.0) {
- if (debug)
- printf("Not adjusting drift factor because it has been less than a "
- "day since the last calibration.\n");
- } else {
- const float sec_per_day = 24.0 * 60.0 * 60.0;
- float atime_per_htime; /* adjusted time units per hardware time unit */
- float adj_days; /* days since last adjustment (in hardware clock time) */
- float cal_days; /* days since last calibration (in hardware clock time) */
- float exp_drift; /* expected drift (sec) since last adjustment */
- float unc_drift; /* uncorrected drift (sec) since last calibration */
- float factor_adjust; /* amount to add to previous drift factor */
- atime_per_htime = 1.0 + adjtime_p->drift_factor / sec_per_day;
- adj_days = time_diff(hclocktime, t2tv(adjtime_p->last_adj_time))
- / sec_per_day;
- exp_drift = adj_days * adjtime_p->drift_factor + adjtime_p->not_adjusted;
- unc_drift = time_diff(t2tv(actual_time), hclocktime) - exp_drift;
- cal_days = ((float)(adjtime_p->last_adj_time - adjtime_p->last_calib_time)
- + adjtime_p->not_adjusted) / (sec_per_day * atime_per_htime)
- + adj_days;
- factor_adjust = unc_drift / cal_days;
-
- if (unc_drift > 30*60.0) {
- if (debug)
- printf("Not adjusting drift factor because we calculated the \n"
- "uncorrected drift as %.0f seconds, which is so large that \n"
- "it probably is not drift at all, but rather some \n"
- "clock setting anomaly.\n\n", unc_drift);
- } else {
- if (debug)
- printf("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",
- unc_drift,
- (int) (actual_time - adjtime_p->last_calib_time),
- adjtime_p->drift_factor,
- factor_adjust );
-
- adjtime_p->drift_factor += factor_adjust;
- }
- }
- adjtime_p->last_calib_time = actual_time;
-
- adjtime_p->last_adj_time = actual_time;
-
- adjtime_p->not_adjusted = 0;
-
- adjtime_p->dirty = TRUE;
-}
-
-
-
-static void
-calculate_adjustment(
- const float factor,
- const time_t last_time,
- const float not_adjusted,
- const time_t systime,
- int *adjustment_p,
- float *retro_p,
- const int debug ) {
-/*----------------------------------------------------------------------------
- Do the drift adjustment calculation.
-
- The way we have to set the clock, we need the adjustment in two parts:
-
- 1) an integer number of seconds (return as *adjustment_p)
-
- 2) a positive fraction of a second (less than 1) (return as *retro_p)
-
- The sum of these two values is the adjustment needed. Positive means to
- advance the clock or insert seconds. Negative means to retard the clock
- or remove seconds.
-----------------------------------------------------------------------------*/
- float exact_adjustment;
-
- exact_adjustment = ((float) (systime - last_time)) * factor / (24 * 60 * 60)
- + not_adjusted;
- *adjustment_p = FLOOR(exact_adjustment);
-
- *retro_p = exact_adjustment - (float) *adjustment_p;
- if (debug) {
- printf ("Time since last adjustment is %d seconds\n",
- (int) (systime - last_time));
- printf ("Need to insert %d seconds and refer time back "
- "%.6f seconds ago\n",
- *adjustment_p, *retro_p);
- }
-}
-
-
-
-static void
-save_adjtime(const struct adjtime adjtime, const bool testing) {
-/*-----------------------------------------------------------------------------
- Write the contents of the <adjtime> structure to its disk file.
-
- But if the contents are clean (unchanged since read from disk), don't
- bother.
------------------------------------------------------------------------------*/
- char newfile[506]; /* Stuff to write to disk file */
- /* snprintf is not always available, but this is safe
- as long as libc does not use more than 100 positions for %ld or %f
- */
-
- int rc; /* locally used: return code from a function */
-
- if (adjtime.dirty) {
- /* We'd use snprintf here, but apparently, it isn't always available. */
- sprintf(newfile, "%f %ld %f\n%ld\n%s\n",
- adjtime.drift_factor,
- (long) adjtime.last_adj_time,
- adjtime.not_adjusted,
- (long) adjtime.last_calib_time,
- (adjtime.local_utc == UTC) ? "UTC" : "LOCAL"
- );
-
- if (testing) {
- printf("Not updating adjtime file because of testing mode.\n");
- printf("Would have written the following to %s:\n%s",
- ADJPATH, newfile);
- } else {
- FILE *adjfile;
-
- adjfile = fopen(ADJPATH, "w");
- if (adjfile == NULL) {
- const int fopen_errno = errno;
- printf("Could not open file with the clock adjustment parameters "
- "in it (%s) for output.\n"
- "fopen() returned errno %d: %s.\n"
- "Drift adjustment parameters not updated.\n",
- ADJPATH, fopen_errno, strerror(errno));
- } else {
- rc = fprintf(adjfile, newfile);
- if (rc < 0) {
- const int fprintf_errno = errno;
- printf("Could not update file (%s) "
- "with the clock adjustment parameters in it.\n"
- "fprintf() returned errno %d: %s.\n"
- "Drift adjustment parameters not updated.\n",
- ADJPATH, fprintf_errno, strerror(errno));
- }
- rc = fclose(adjfile);
- if (rc < 0) {
- const int fclose_errno = errno;
- printf("Could not update file (%s) "
- "with the clock adjustment parameters in it.\n"
- "fclose() returned errno %d: %s.\n"
- "Drift adjustment parameters not updated.\n",
- ADJPATH, fclose_errno, strerror(errno));
- }
- }
- }
- } else if (debug)
- printf("Skipping update of adjtime file because nothing has changed.\n");
-}
-
-
-
-static void
-do_adjustment(struct adjtime *adjtime_p,
- const bool hclock_valid, const time_t hclocktime,
- const struct timeval read_time,
- const enum clock_access_method clock_access,
- const int dev_port, const bool universal,
- const int hc_zero_year,
- const bool badyear, const bool testing) {
-/*---------------------------------------------------------------------------
- Do the adjustment requested, by 1) setting the Hardware Clock (if
- necessary), and 2) updating the last-adjusted time in the adjtime
- structure.
-
- Do not update anything if the Hardware Clock does not currently present
- a valid time.
-
- arguments 'factor' and 'last_time' are current values from the adjtime
- file.
-
- 'hclock_valid' means the Hardware Clock contains a valid time, and that
- time is 'hclocktime'.
-
- 'read_time' is the current system time (to be precise, it is the system
- time at the time 'hclocktime' was read, which due to computational delay
- could be a short time ago).
-
- 'universal': the Hardware Clock is kept in UTC.
-
- 'badyear': the Hardware Clock is incapable of storing years outside
- the range 1994-1999.
-
- 'testing': We are running in test mode (no updating of clock).
-
- We do not bother to update the clock if the adjustment would be less than
- one second. This is to avoid cumulative error and needless CPU hogging
- (remember we use an infinite loop for some timing) if the user runs us
- frequently.
-
-----------------------------------------------------------------------------*/
- if (!hclock_valid) {
- fprintf(stderr, "%s: The Hardware Clock does not contain a valid time, "
- "so we cannot adjust it.\n", MYNAME);
- /* Any previous calibration had to be before the clock got hosed, so
- wipe out the record of it so it won't be used in the future.
- */
- adjtime_p->last_calib_time = 0;
- adjtime_p->last_adj_time = 0;
- adjtime_p->not_adjusted = 0;
- adjtime_p->dirty = TRUE;
- } else if (adjtime_p->last_adj_time == 0) {
- if (debug)
- printf("Not adjusting clock because we have no information about \n"
- "the previous calibration (i.e. the adjtime file is \n"
- "nonexistent or contains zero in the last calibrated time \n"
- "field).\n");
- } else {
- int adjustment;
- /* Number of seconds we must insert in the Hardware Clock */
- float retro;
- /* Fraction of second we have to remove from clock after inserting
- <adjustment> whole seconds.
- */
- calculate_adjustment(adjtime_p->drift_factor,
- adjtime_p->last_adj_time,
- adjtime_p->not_adjusted,
- hclocktime,
- &adjustment, &retro,
- debug );
- if (adjustment > 0 || adjustment < -1) {
- set_hardware_clock_exact(hclocktime + adjustment,
- time_inc(read_time, -retro),
- clock_access, dev_port, universal,
- hc_zero_year, badyear, testing);
- adjtime_p->last_adj_time = hclocktime + adjustment;
- adjtime_p->not_adjusted = 0;
- adjtime_p->dirty = TRUE;
- } else
- if (debug)
- printf("Needed adjustment is less than one second, "
- "so not setting clock.\n");
- }
-}
-
-
-static void
-determine_clock_access_method(const bool user_requests_ISA,
- const bool user_says_jensen,
- enum clock_access_method *clock_access_p) {
-/*----------------------------------------------------------------------------
- Figure out how we're going to access the hardware clock, by seeing
- what facilities are available, looking at invocation options, and
- using compile-time constants.
-
- 'user_requests_ISA' means the user explicitly asked for the ISA method,
- so we'll use that (even if we know it will fail because the machine
- is incapable!).
------------------------------------------------------------------------------*/
- const bool jensen =
- user_says_jensen ||
- (alpha_machine && is_in_cpuinfo("system type", "Jensen"));
- /* See comments at top of program for how Jensen is a special case. */
- bool rtc_works;
- /* The /dev/rtc method is available and seems to work on this machine */
- bool kdghwclk_works;
- /* The KDHWCLK method is available and seems to work on this machine. */
-
- see_if_rtc_works(&rtc_works); /* May issue error messages */
- see_if_kdghwclk_works(&kdghwclk_works); /* May issue error messages */
-
- if (user_requests_ISA) *clock_access_p = ISA;
- else if (rtc_works) *clock_access_p = RTC_IOCTL;
- else if (kdghwclk_works) *clock_access_p = KD;
- else if (got_kdghwclk) *clock_access_p = ISA;
- /* I don't know on what machine the above line makes any sense, but the
- code has always been this way. -BJH 99.03.31
- */
- else if (isa_machine) *clock_access_p = ISA;
- else if (jensen) *clock_access_p = DEV_PORT;
- else if (alpha_machine) *clock_access_p = ISA;
- else *clock_access_p = NOCLOCK;
- if (debug) {
- switch (*clock_access_p) {
- case ISA: printf("Using direct I/O instructions to ISA clock.\n"); break;
- case KD: printf("Using KDGHWCLK interface to m68k clock.\n"); break;
- case RTC_IOCTL: printf("Using /dev/rtc interface to clock.\n"); break;
- case DEV_PORT: printf("Using /dev/port interface to clock.\n"); break;
- case NOCLOCK: printf("Unable to find a usable clock access method.\n");
- break;
- default:
- printf("determine_clock_access_method() returned invalid value: %d.\n",
- *clock_access_p);
- }
- }
-}
-
-
-
-static void
-do_systohc(const enum clock_access_method clock_access,
- const int dev_port,
- const time_t hclocktime, const bool hclock_valid,
- const struct timeval read_time,
- const bool universal, const int hc_zero_year,
- const bool badyear, const bool testing,
- struct adjtime * const adjtime_p) {
-/*----------------------------------------------------------------------------
- Perform the specifics of the hwclock --systohc function.
------------------------------------------------------------------------------*/
- struct timeval nowtime, reftime;
- /* We can only set_hardware_clock_exact to a whole seconds
- time, so we set it with reference to the most recent
- whole seconds time.
- */
- gettimeofday(&nowtime, NULL);
- reftime.tv_sec = nowtime.tv_sec;
- reftime.tv_usec = 0;
-
- set_hardware_clock_exact((time_t) reftime.tv_sec, reftime,
- clock_access, dev_port, universal,
- hc_zero_year, badyear, testing);
- adjust_drift_factor(adjtime_p, (time_t) reftime.tv_sec, hclock_valid,
- time_inc(t2tv(hclocktime),
- - time_diff(read_time, reftime)
- )
- );
-}
-
-
-static void
-manipulate_clock(const bool show, const bool adjust,
- const bool set, const time_t set_time,
- const bool hctosys, const bool systohc,
- const struct timeval startup_time,
- const enum clock_access_method clock_access,
- const bool utc, const bool local_opt,
- const bool badyear, const bool arc_opt, const bool srm_opt,
- const bool user_wants_uf,
- const bool testing,
- int *retcode_p
- ) {
-/*---------------------------------------------------------------------------
- Do all the normal work of hwclock - read, set clock, etc.
-
- Issue output to stdout and error message to stderr where appropriate.
-
- Return rc == 0 if everything went OK, rc != 0 if not.
-----------------------------------------------------------------------------*/
- struct adjtime adjtime;
- /* Contents of the adjtime file, or what they should be. */
- int rc; /* local return code */
- bool no_auth; /* User lacks necessary authorization to access the clock */
- int dev_port;
- /* File descriptor for /dev/port, if we're using it. -1 if we
- couldn't open it. 0 if we aren't using it.
- */
- get_inb_outb_privilege(clock_access, &no_auth);
-
- if (no_auth) *retcode_p = 1;
- else {
- get_dev_port_access(clock_access, &dev_port);
-
- if (dev_port < 0) *retcode_p = 3;
- else {
- read_adjtime(&adjtime, &rc);
- if (rc != 0) *retcode_p = 2;
- else {
- const bool use_uf_bit = uf_bit_needed(user_wants_uf);
- const int hc_zero_year = zero_year(arc_opt, srm_opt);
- /* year of century to which a value of zero corresponds in the
- Hardware Clock's year register.
- */
- const bool universal = hw_clock_is_utc(utc, local_opt, adjtime);
- /* The hardware clock is kept in Coordinated Universal Time. */
-
- if ((set || systohc || adjust) &&
- (adjtime.local_utc == UTC) != universal) {
- adjtime.local_utc = universal ? UTC : LOCAL;
- adjtime.dirty = TRUE;
- }
-
- synchronize_to_clock_tick(clock_access, dev_port, use_uf_bit,
- retcode_p);
- /* this takes up to 1 second */
- if (*retcode_p == 0) {
- struct timeval read_time;
- /* The time at which we read the Hardware Clock */
-
- bool hclock_valid;
- /* The Hardware Clock gives us a valid time, or at least something
- close enough to fool mktime().
- */
-
- time_t hclocktime;
- /* The time the hardware clock had just after we
- synchronized to its next clock tick when we started up.
- Defined only if hclock_valid is true.
- */
-
- gettimeofday(&read_time, NULL);
- read_hardware_clock(clock_access, dev_port, universal,
- hc_zero_year, badyear,
- adjtime.last_calib_time,
- &hclock_valid, &hclocktime);
-
- if (show) {
- display_time(hclock_valid, hclocktime,
- time_diff(read_time, startup_time), !badyear);
- *retcode_p = 0;
- } else if (set) {
- set_hardware_clock_exact(set_time, startup_time,
- clock_access, dev_port, universal,
- hc_zero_year,
- badyear, testing);
- adjust_drift_factor(&adjtime, set_time, hclock_valid,
- time_inc(t2tv(hclocktime),
- - time_diff(read_time, startup_time)
- )
- );
- *retcode_p = 0;
- } else if (adjust) {
- do_adjustment(&adjtime, hclock_valid, hclocktime,
- read_time, clock_access, dev_port,
- universal, hc_zero_year,
- badyear, testing);
- *retcode_p = 0;
- } else if (systohc) {
- do_systohc(clock_access, dev_port,
- hclocktime, hclock_valid, read_time,
- universal, hc_zero_year, badyear, testing,
- &adjtime);
- *retcode_p = 0;
- } else if (hctosys) {
- rc = set_system_clock(hclock_valid, hclocktime, testing);
- if (rc != 0) {
- printf("Unable to set system clock.\n");
- *retcode_p = 1;
- } else *retcode_p = 0;
- }
- save_adjtime(adjtime, testing);
- }
- }
- }
- if (clock_access == DEV_PORT && dev_port >= 0) close(dev_port);
- }
-}
-
-
-
-static void
-report_version(void) {
-
- char *additional_version; /* malloc'ed */
- /* Stuff to add on to the version report, after the basic version.
- If this is hwclock packaged with util-linux, this is the
- util-linux version. Otherwise, it's nothing.
- */
-
-#ifdef UTIL_LINUX
- additional_version = malloc(strlen(util_linux_version) + 5);
- sprintf(additional_version, "/%s", util_linux_version);
-#else
- additional_version = strdup("");
-#endif
- printf(MYNAME " " VERSION "%s\n", additional_version);
- free(additional_version);
-}
-
-
-
-static void
-manipulate_epoch(const bool getepoch, const bool setepoch,
- const int epoch_opt, const bool testing) {
-/*----------------------------------------------------------------------------
- Get or set the Hardware Clock epoch value in the kernel, as appropriate.
- 'getepoch', 'setepoch', and 'epoch' are hwclock invocation options.
-
- 'epoch' == -1 if the user did not specify an "epoch" option.
-
------------------------------------------------------------------------------*/
- /*
- Maintenance note: This should work on non-Alpha machines, but the
- evidence today (98.03.04) indicates that the kernel only keeps the
- epoch value on Alphas. If that is ever fixed, this function should be
- changed.
- */
-
- if (!alpha_machine)
- fprintf(stderr,
- "%s: The kernel keeps an epoch value for the Hardware Clock "
- "only on an Alpha machine.\nThis 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", MYNAME);
- else {
- if (getepoch) {
- unsigned long epoch;
- char *reason; /* malloc'ed */
-
- get_epoch(&epoch, &reason);
- if (reason != NULL) {
- printf("Unable to get the epoch value from the kernel. %s\n",
- reason);
- free(reason);
- } else
- printf("Kernel is assuming an epoch value of %lu\n", epoch);
- } else if (setepoch) {
- if (epoch_opt == -1)
- fprintf(stderr, "%s: To set the epoch value, you must use the 'epoch' "
- "option to tell to what value to set it.\n", MYNAME);
- else {
- int rc;
- set_epoch(epoch_opt, testing, &rc);
- if (rc != 0)
- printf("Unable to set the epoch value in the kernel.\n");
- }
- }
- }
-}
-
-
-
-int
-main(int argc, char **argv, char **envp) {
-/*----------------------------------------------------------------------------
- MAIN
------------------------------------------------------------------------------*/
- struct timeval startup_time;
- /* The time we started up, in seconds into the epoch, including fractions.
- */
- time_t set_time; /* Time to which user said to set Hardware Clock */
-
- enum clock_access_method clock_access;
- /* The method that we determine is best for accessing Hardware Clock
- on this system.
- */
-
- bool permitted; /* User is permitted to do the function */
- int retcode; /* Our eventual return code */
-
- int rc; /* local return code */
-
- /* option_def is the control table for the option parser. These other
- variables are the results of parsing the options and their meanings
- are given by the option_def. The only exception is <show>, which
- may be modified after parsing is complete to effect an implied option.
- */
- bool show, set, systohc, hctosys, adjust, getepoch, setepoch, version;
- bool utc, local_opt, badyear, testing, directisa;
- bool arc_opt, jensen_opt, srm_opt, funky_opt;
- char *date_opt;
- int epoch_opt;
-
- const optStruct option_def[] = {
- { 'r', (char *) "show", OPT_FLAG, &show, 0 },
- { 0, (char *) "set", OPT_FLAG, &set, 0 },
- { 'w', (char *) "systohc", OPT_FLAG, &systohc, 0 },
- { 's', (char *) "hctosys", OPT_FLAG, &hctosys, 0 },
- { 0, (char *) "getepoch", OPT_FLAG, &getepoch, 0 },
- { 0, (char *) "setepoch", OPT_FLAG, &setepoch, 0 },
- { 'a', (char *) "adjust", OPT_FLAG, &adjust, 0 },
- { 'v', (char *) "version", OPT_FLAG, &version, 0 },
- { 0, (char *) "date", OPT_STRING, &date_opt, 0 },
- { 0, (char *) "epoch", OPT_UINT, &epoch_opt, 0 },
- { 'u', (char *) "utc", OPT_FLAG, &utc, 0 },
- { 0, (char *) "localtime", OPT_FLAG, &local_opt, 0 },
- { 0, (char *) "badyear", OPT_FLAG, &badyear, 0 },
- { 0, (char *) "directisa", OPT_FLAG, &directisa, 0 },
- { 0, (char *) "test", OPT_FLAG, &testing, 0 },
- { 'D', (char *) "debug", OPT_FLAG, &debug, 0 },
- { 'A', (char *) "arc", OPT_FLAG, &arc_opt, 0 },
- { 'J', (char *) "jensen", OPT_FLAG, &jensen_opt,0 },
- { 'S', (char *) "srm", OPT_FLAG, &srm_opt, 0 },
- { 'F', (char *) "funky-toy", OPT_FLAG, &funky_opt, 0 },
- { 0, (char *) NULL, OPT_END, NULL, 0 }
- };
- int argc_parse; /* argc, except we modify it as we parse */
- char **argv_parse; /* argv, except we modify it as we parse */
-
- assume_interrupts_enabled(); /* Since we haven't messed with them yet */
-
- gettimeofday(&startup_time, NULL); /* Remember what time we were invoked */
-
- /* set option defaults */
- show = set = systohc = hctosys = adjust = getepoch = setepoch =
- version = utc = local_opt = badyear =
- directisa = testing = debug =
- jensen_opt = arc_opt = srm_opt = funky_opt = FALSE;
- date_opt = NULL;
- epoch_opt = -1;
-
- argc_parse = argc; argv_parse = argv;
- optParseOptions(&argc_parse, argv_parse, option_def, 0);
- /* Uses and sets argc_parse, argv_parse.
- Sets show, set, systohc, hctosys, adjust, getepoch, setepoch,
- version, utc, localtime, badyear,
- directisa, testing, debug,
- date_opt, epoch_opt,
- jensen_opt, arc_opt, srm_opt, funky_opt
- */
-
- if (argc_parse - 1 > 0) {
- fprintf(stderr, MYNAME " takes no non-option arguments. "
- "You supplied %d. See man page for complete syntax.\n",
- argc_parse - 1);
- exit(100);
- }
-
- if (show + set + systohc + hctosys + adjust +
- getepoch + setepoch + version > 1) {
- fprintf(stderr,
- "You have specified multiple function options to hwclock.\n"
- "You can only perform one function at a time.\n");
- exit(100);
- }
-
- if (set) {
- rc = interpret_date_string(date_opt, &set_time); /* (time-consuming) */
- if (rc != 0) {
- fprintf(stderr, "%s: No usable set-to time given. Cannot set clock.\n",
- MYNAME);
- exit(100);
- }
- }
-
- if (jensen_opt && !alpha_machine) {
- fprintf(stderr, "%s: Your options indicate that this is a Jensen model of "
- "DEC Alpha, but this is not an Alpha machine!\n", MYNAME);
- exit(100);
- }
-
- if (srm_opt && alpha_machine) {
- fprintf(stderr, "%s: Your options indicate that this machine keeps SRM "
- "console time, but only DEC Alphas have such a clock and this is "
- "not an Alpha!\n", MYNAME);
- exit(100);
- }
- if (arc_opt && alpha_machine) {
- fprintf(stderr, "%s: Your options indicate that this machine's clock"
- "keeps ARC console time, "
- "but only DEC Alphas have such a clock and this is "
- "not an Alpha!\n", MYNAME);
- exit(100);
- }
-
- if (directisa && !(isa_machine || alpha_machine)) {
- fprintf(stderr, "%s: You have requested direct access to the ISA Hardware "
- "Clock using machine instructions from the user process. "
- "But this method only works on an ISA machine with an x86 "
- "CPU, or a similar machine such as DEC Alpha. "
- "This is not one.\n", MYNAME);
- exit(100);
- }
-
- if (utc && local_opt) {
- fprintf(stderr, "%s: The --utc and --localtime options are mutually "
- "exclusive. You specified both.\n", MYNAME);
- exit(100);
- }
-
-
- if (!(show | set | systohc | hctosys | adjust | getepoch | setepoch |
- version))
- show = TRUE; /* default to show */
-
-
- if (getuid() == 0) permitted = TRUE;
- else {
- /* program is designed to run setuid (in some situations) -- be secure! */
- if (set || hctosys || systohc || adjust) {
- fprintf(stderr,
- "%s: Sorry, only the superuser can change the "
- "Hardware Clock.\n", MYNAME);
- permitted = FALSE;
- } else if (setepoch) {
- fprintf(stderr,
- "%s: Sorry, only the superuser can change "
- "the Hardware Clock epoch in the kernel.\n", MYNAME);
- permitted = FALSE;
- } else permitted = TRUE;
- }
-
- if (!permitted) retcode = 2;
- else {
- retcode = 0;
- if (version) {
- report_version();
- } else if (getepoch || setepoch) {
- manipulate_epoch(getepoch, setepoch, epoch_opt, testing);
- } else {
- determine_clock_access_method(directisa, jensen_opt, &clock_access);
- if (clock_access == NOCLOCK)
- fprintf(stderr, "%s: Cannot access the Hardware Clock via any known "
- "method. Use --debug option to see the details of our "
- "search for an access method.\n", MYNAME);
- else
- manipulate_clock(show, adjust, set, set_time, hctosys, systohc,
- startup_time, clock_access, utc, local_opt, badyear,
- arc_opt, srm_opt, funky_opt, testing, &rc);
- }
- }
- exit(retcode);
-}
-
-
-/****************************************************************************
-
- History of this program:
-
- 99.04.08 BJH Version 2.5
-
- Make it work on Alphas without /dev/rtc. Thanks to David Mosberger
- <davidm@azstarnet.com>, Jay Estabrook <jestabro@amt.tay1.dec.com>,
- Martin Ostermann <ost@coments.rwth-aachen.de>, Andries Brouwer
- <aeb@cwi.nl>. Most of this code is lifted from another program
- called "clock" (not the original ancestor of hwclock) that has
- circulated for use on Alpha.
-
- Make it work on Sparc.
-
- Add --badyear option. Thanks to David J Coffin (dcoffin@shore.net)
- for the design of this.
-
- Add --localtime option, local/UTC value in adjtime file, and defaults
- for local/utc.
-
- Don't set CMOS memory Byte 50 (century byte). On some machines,
- that byte not only isn't used as a century byte, but it is used for
- something else.
-
- Don't update the drift factor if the variation is so huge that it
- probably wasn't due to drift.
-
- Compute drift factor with better precision.
-
- 98.08.12 BJH Version 2.4
-
- Don't use century byte from Hardware Clock. Add comments telling why.
-
-
- 98.06.20 BJH Version 2.3.
-
- Make --hctosys set the kernel timezone from TZ environment variable
- and/or /usr/lib/zoneinfo. From Klaus Ripke (klaus@ripke.com).
-
- 98.03.05 BJH. Version 2.2.
-
- Add --getepoch and --setepoch.
-
- Fix some word length things so it works on Alpha.
-
- Make it work when /dev/rtc doesn't have the interrupt functions.
- In this case, busywait for the top of a second instead of blocking and
- waiting for the update complete interrupt.
-
- Fix a bunch of bugs too numerous to mention.
-
- 97.06.01: BJH. Version 2.1. Read and write the century byte (Byte
- 50) of the ISA Hardware Clock when using direct ISA I/O. Problem
- discovered by job (jei@iclnl.icl.nl).
-
- Use the rtc clock access method in preference to the KDGHWCLK method.
- Problem discovered by Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>.
-
- November 1996: Version 2.0.1. Modifications by Nicolai Langfeldt
- (janl@math.uio.no) to make it compile on linux 1.2 machines as well
- as more recent versions of the kernel. Introduced the NO_CLOCK
- access method and wrote feature test code to detect absense of rtc
- headers.
-
-
- Bryan Henderson based hwclock on the program "clock", in September
- 1996. While remaining mostly backward compatible with clock,
- hwclock added the following:
-
- - You can set the hardware clock without also modifying the Linux
- system clock.
-
- - You can read and set the clock with finer than 1 second precision.
-
- - When you set the clock, hwclock automatically refigures the drift
- rate, based on how far off the clock was before you set it. (This
- is the drift rate that is used with the --adjust function to
- automatically adjust the clock periodically to compensate for drift).
-
- - More mnemonic GNU-style command line options.
-
- - Comments describing how the clock and program work to improve
- maintainability.
-
- - Removed the old dead I/O code that worked without the inb/outb
- instructions and without the asm/io.h definitions.
-
- The first version of hwclock was Version 2.
-
- Here is the history section from the "clock" program at the time it was
- used as a basis for hwclock:
-
- V1.0
-
-
- V1.0 by Charles Hedrick, hedrick@cs.rutgers.edu, April 1992.
-
- ********************
- V1.1
- Modified for clock adjustments - Rob Hooft, hooft@chem.ruu.nl, Nov 1992
- Also moved error messages to stderr. The program now uses getopt.
- Changed some exit codes. Made 'gcc 2.3 -Wall' happy.
-
- *****
- V1.2
-
- Applied patches by Harald Koenig (koenig@nova.tat.physik.uni-tuebingen.de)
- Patched and indented by Rob Hooft (hooft@EMBL-Heidelberg.DE)
-
- A free quote from a MAIL-message (with spelling corrections):
-
- "I found the explanation and solution for the CMOS reading 0xff problem
- in the 0.99pl13c (ALPHA) kernel: the RTC goes offline for a small amount
- of time for updating. Solution is included in the kernel source
- (linux/kernel/time.c)."
-
- "I modified clock.c to fix this problem and added an option (now default,
- look for USE_INLINE_ASM_IO) that I/O instructions are used as inline
- code and not via /dev/port (still possible via #undef ...)."
-
- With the new code, which is partially taken from the kernel sources,
- the CMOS clock handling looks much more "official".
- Thanks Harald (and Torsten for the kernel code)!
-
- *****
- V1.3
- Canges from alan@spri.levels.unisa.edu.au (Alan Modra):
- a) Fix a few typos in comments and remove reference to making
- clock -u a cron job. The kernel adjusts cmos time every 11
- minutes - see kernel/sched.c and kernel/time.c set_rtc_mmss().
- This means we should really have a cron job updating
- /etc/adjtime every 11 mins (set last_time to the current time
- and not_adjusted to ???).
- b) Swapped arguments of outb() to agree with asm/io.h macro of the
- same name. Use outb() from asm/io.h as it's slightly better.
- c) Changed CMOS_READ and CMOS_WRITE to inline functions. Inserted
- cli()..sti() pairs in appropriate places to prevent possible
- errors, and changed ioperm() call to iopl() to allow cli.
- d) Moved some variables around to localise them a bit.
- e) Fixed bug with clock -ua or clock -us that cleared environment
- variable TZ. This fix also cured the annoying display of bogus
- day of week on a number of machines. (Use mktime(), ctime()
- rather than asctime() )
- f) Use settimeofday() rather than stime(). This one is important
- as it sets the kernel's timezone offset, which is returned by
- gettimeofday(), and used for display of MSDOS and OS2 file
- times.
- g) faith@cs.unc.edu added -D flag for debugging
-
- V1.4: alan@SPRI.Levels.UniSA.Edu.Au (Alan Modra)
- Wed Feb 8 12:29:08 1995, fix for years > 2000.
- faith@cs.unc.edu added -v option to print version. */
-
-
diff --git a/clockB/hwclock.h b/clockB/hwclock.h
deleted file mode 100644
index 6a3ab14bd..000000000
--- a/clockB/hwclock.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-typedef int bool;
-#define TRUE 1
-#define FALSE 0
-
-#define MYNAME "hwclock"
-#define VERSION "2.5"
-
-
-enum clock_access_method {ISA, RTC_IOCTL, KD, DEV_PORT, NOCLOCK};
- /* A method for accessing (reading, writing) the hardware clock:
-
- ISA:
- via direct CPU I/O instructions that work on an ISA family
- machine (IBM PC compatible) or most DEC Alphas, which implement
- enough of ISA to get by.
-
- RTC_IOCTL:
- via the rtc device driver, using device special file /dev/rtc.
-
- KD:
- via the console driver, using device special file /dev/tty1.
- This is the m68k ioctl interface, known as KDGHWCLK.
-
- DEV_PORT:
- via the /dev/port device, which is almost the same thing as
- direct I/O instructions via the ISA method, but works on a Jensen
- model of Alpha, whereas ISA does not. Also, use I/O addresses
- 0x170 and 0x171 instead of the ISA 0x70 and 0x71.
-
- NO_CLOCK:
- Unable to determine a usable access method for the system clock.
- */
-
-
-
-
-/* hwclock.c */
-extern int debug;
-extern const bool alpha_machine;
-extern const bool isa_machine;
-
-/* directio.c */
-
-extern void
-assume_interrupts_enabled(void);
-
-extern void
-synchronize_to_clock_tick_ISA(int *retcode_p, const int dev_port,
- const bool use_uf_bit);
-
-extern void
-read_hardware_clock_isa(struct tm *tm, const int dev_port,
- int hc_zero_year);
-
-extern void
-set_hardware_clock_isa(const struct tm new_tm,
- const int hc_zero_year,
- const int dev_port,
- const bool testing);
-
-extern void
-get_inb_outb_privilege(const enum clock_access_method clock_access,
- bool * const no_auth_p);
-
-extern void
-get_dev_port_access(const enum clock_access_method clock_access,
- int * dev_port_p);
-
-extern bool
-uf_bit_needed(const bool user_wants_uf);
-
-extern int
-zero_year(const bool arc_opt, const bool srm_opt);
-
-
-/* rtc.c */
-extern void
-synchronize_to_clock_tick_RTC(int *retcode_p);
-
-extern void
-read_hardware_clock_rtc_ioctl(struct tm *tm);
-
-extern void
-set_hardware_clock_rtc_ioctl(const struct tm new_broken_time,
- const bool testing);
-extern void
-see_if_rtc_works(bool * const rtc_works_p);
-
-extern void
-get_epoch(unsigned long *epoch_p, char **reason_p);
-
-extern void
-set_epoch(unsigned long epoch, const bool testing, int *retcode_p);
-
-
-/* kd.c */
-
-extern void
-synchronize_to_clock_tick_KD(int *retcode_p);
-
-extern void
-read_hardware_clock_kd(struct tm *tm);
-
-extern void
-set_hardware_clock_kd(const struct tm new_broken_time,
- const bool testing);
-
-extern void
-see_if_kdghwclk_works(bool * const kdghwclk_works_p);
-
-extern const bool got_kdghwclk;
-
-/* util.c */
-extern bool
-is_in_cpuinfo(const char * const fmt, const char * const str);
-
-extern char *
-ctime2(const time_t time);
-
-extern struct timeval
-t2tv(time_t argument);
-
-extern struct timeval
-t2tv(time_t argument);
-
-extern float
-time_diff(struct timeval subtrahend, struct timeval subtractor);
-
-extern struct timeval
-time_inc(struct timeval addend, float increment);
-
-
-
-
-
diff --git a/clockB/kd.c b/clockB/kd.c
deleted file mode 100644
index 68287cb54..000000000
--- a/clockB/kd.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**************************************************************************
-
- This is a component of the hwclock program.
-
- This file contains the code for accessing the hardware clock via
- the KDHWCLK facility of M68k machines.
-
-****************************************************************************/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/ioctl.h>
-
-#include "hwclock.h"
-
-
-
-#if defined(KDGHWCLK)
-const bool got_kdghwclk = TRUE;
-static const int kdghwclk_ioctl = KDGHWCLK;
-static const int kdshwclk_ioctl = KDSHWCLK;
-#else
-const bool got_kdghwclk = FALSE;
-static const int kdghwclk_ioctl; /* Never used; just to make compile work */
-struct hwclk_time {int sec;};
- /* Never used; just to make compile work */
-#endif
-
-
-void
-synchronize_to_clock_tick_KD(int *retcode_p) {
-/*----------------------------------------------------------------------------
- Wait for the top of a clock tick by calling KDGHWCLK in a busy loop until
- we see it.
------------------------------------------------------------------------------*/
- int con_fd;
-
- if (debug)
- printf("Waiting in loop for time from KDGHWCLK to change\n");
-
- con_fd = open("/dev/tty1", O_RDONLY);
- if (con_fd < 0) {
- fprintf(stderr, "%s: open() failed to open /dev/tty1, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else {
- int rc; /* return code from ioctl() */
- int i; /* local loop index */
- /* The time when we were called (and started waiting) */
- struct hwclk_time start_time, nowtime;
-
- rc = ioctl(con_fd, kdghwclk_ioctl, &start_time);
- if (rc == -1) {
- fprintf(stderr, "%s: KDGHWCLK to read time failed, "
- "errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- *retcode_p = 3;
- }
-
- for (i = 0;
- (rc = ioctl(con_fd, kdghwclk_ioctl, &nowtime)) != -1
- && start_time.sec == nowtime.sec && i < 1000000;
- i++);
- if (i >= 1000000) {
- fprintf(stderr, "%s: Timed out waiting for time change.\n", MYNAME);
- *retcode_p = 2;
- } else if (rc == -1) {
- fprintf(stderr, "%s: KDGHWCLK to read time failed, "
- "errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- *retcode_p = 3;
- } else *retcode_p = 0;
- close(con_fd);
- }
-}
-
-
-
-void
-read_hardware_clock_kd(struct tm *tm) {
-/*----------------------------------------------------------------------------
- Read the hardware clock and return the current time via <tm>
- argument. Use ioctls to /dev/tty1 on what we assume is an m68k
- machine.
-
- Note that we don't use /dev/console here. That might be a serial
- console.
------------------------------------------------------------------------------*/
-#ifdef KDGHWCLK
- int con_fd;
- struct hwclk_time t;
-
- con_fd = open("/dev/tty1", O_RDONLY);
- if (con_fd < 0) {
- fprintf(stderr, "%s: open() failed to open /dev/tty1, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- exit(5);
- } else {
- int rc; /* return code from ioctl() */
-
- rc = ioctl(con_fd, kdghwclk_ioctl, &t);
- if (rc == -1) {
- fprintf(stderr, "%s: ioctl() failed to read time from /dev/tty1, "
- "errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- exit(5);
- }
- close(con_fd);
- }
-
- tm->tm_sec = t.sec;
- tm->tm_min = t.min;
- tm->tm_hour = t.hour;
- tm->tm_mday = t.day;
- tm->tm_mon = t.mon;
- tm->tm_year = t.year;
- tm->tm_wday = t.wday;
- tm->tm_isdst = -1; /* Don't know if it's Daylight Savings Time */
-#else
- /* This routine should never be invoked. It is here just to make the
- program compile.
- */
-#endif
-}
-
-
-
-void
-set_hardware_clock_kd(const struct tm new_broken_time,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock to the time <new_broken_time>. Use ioctls to
- /dev/tty1 on what we assume is an m68k machine.
-
- Note that we don't use /dev/console here. That might be a serial console.
-----------------------------------------------------------------------------*/
-#ifdef KDGHWCLK
- int con_fd; /* File descriptor of /dev/tty1 */
- struct hwclk_time t;
-
- con_fd = open("/dev/tty1", O_RDONLY);
- if (con_fd < 0) {
- fprintf(stderr, "%s: Error opening /dev/tty1. Errno: %s (%d)\n",
- MYNAME, strerror(errno), errno);
- exit(1);
- } else {
- int rc; /* locally used return code */
-
- t.sec = new_broken_time.tm_sec;
- t.min = new_broken_time.tm_min;
- t.hour = new_broken_time.tm_hour;
- t.day = new_broken_time.tm_mday;
- t.mon = new_broken_time.tm_mon;
- t.year = new_broken_time.tm_year;
- t.wday = new_broken_time.tm_wday;
-
- if (testing)
- printf("Not setting Hardware Clock because running in test mode.\n");
- else {
- rc = ioctl(con_fd, kdshwclk_ioctl, &t );
- if (rc < 0) {
- fprintf(stderr, "%s: ioctl() to open /dev/tty1 failed. "
- "Errno: %s (%d)\n",
- MYNAME, strerror(errno), errno);
- exit(1);
- }
- }
- close(con_fd);
- }
-#else
- /* This function should never be invoked. It is here just to make the
- program compile.
- */
-#endif
-}
-
-
-
-void
-see_if_kdghwclk_works(bool * const kdghwclk_works_p) {
-/*----------------------------------------------------------------------------
- Find out if we are capable of accessing the Hardware Clock via the
- KDHWCLK facility (ioctl to /dev/tty1).
------------------------------------------------------------------------------*/
- if (got_kdghwclk) {
- int con_fd;
- struct hwclk_time t;
-
- con_fd = open("/dev/tty1", O_RDONLY);
- if (con_fd >= 0) {
- if (ioctl( con_fd, kdghwclk_ioctl, &t ) >= 0)
- *kdghwclk_works_p = TRUE;
- else {
- if (errno == EINVAL) {
- /* KDGHWCLK not implemented in this kernel... */
- *kdghwclk_works_p = FALSE;
- if (debug)
- printf(MYNAME "was built with KDGHWCLK capability, but the "
- "ioctl does not exist in the kernel. The ioctl (to "
- "/dev/tty1) failed with errno EINVAL.\n");
- } else {
- *kdghwclk_works_p = FALSE;
- fprintf(stderr,
- "%s: KDGHWCLK ioctl failed, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- }
- }
- } else {
- *kdghwclk_works_p = FALSE;
- fprintf(stderr,
- "%s: Can't open /dev/tty1. open() errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- }
- close(con_fd);
- } else *kdghwclk_works_p = FALSE;
-}
-
-
-
diff --git a/clockB/rtc.c b/clockB/rtc.c
deleted file mode 100644
index 46041b297..000000000
--- a/clockB/rtc.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/**************************************************************************
-
- This is a component of the hwclock program.
-
- This file contains the code for accessing the hardware clock via
- the rtc device driver (usually hooked up to the /dev/rtc device
- special file).
-
-****************************************************************************/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-#include "hwclock.h"
-
-/*
- Get defines for rtc stuff.
-
- Getting the rtc defines is nontrivial. The obvious way is by
- including <linux/mc146818rtc.h> but that again includes <asm/io.h>
- which again includes ... and on sparc and alpha this gives
- compilation errors for many kernel versions. So, we give the defines
- ourselves here. Moreover, some Sparc person decided to be
- incompatible, and used a struct rtc_time different from that used in
- mc146818rtc.h.
-*/
-
-/* On Sparcs, there is a <asm/rtc.h> that defines different ioctls
- (that are required on my machine). However, this include file
- does not exist on other architectures. */
-/* One might do:
-#ifdef __sparc__
-#include <asm/rtc.h>
-#endif
- */
-
-/* The following is roughly equivalent */
-struct sparc_rtc_time
-{
- int sec; /* Seconds (0-59) */
- int min; /* Minutes (0-59) */
- int hour; /* Hour (0-23) */
- int dow; /* Day of the week (1-7) */
- int dom; /* Day of the month (1-31) */
- int month; /* Month of year (1-12) */
- int year; /* Year (0-99) */
-};
-
-
-#define RTCGET _IOR('p', 20, struct sparc_rtc_time)
-#define RTCSET _IOW('p', 21, struct sparc_rtc_time)
-
-
-#include <linux/version.h>
-/* Check if the /dev/rtc interface is available in this version of
- the system headers. 131072 is linux 2.0.0. Might need to make
- it conditional on i386 or something too -janl */
-#if LINUX_VERSION_CODE >= 131072
-#include <linux/kd.h>
-static const bool got_rtc = TRUE;
-#else
-static const bool got_rtc = FALSE;
-#endif
-
-/* struct linux_rtc_time is present since Linux 1.3.99 */
-/* Earlier (since 1.3.89), a struct tm was used. */
-struct linux_rtc_time {
- int tm_sec;
- int tm_min;
- int tm_hour;
- int tm_mday;
- int tm_mon;
- int tm_year;
- int tm_wday;
- int tm_yday;
- int tm_isdst;
-};
-
-/* RTC_RD_TIME etc have this definition since Linux 1.99.9 (pre2.0-9) */
-#ifndef RTC_RD_TIME
-#define RTC_RD_TIME _IOR('p', 0x09, struct linux_rtc_time)
-#define RTC_SET_TIME _IOW('p', 0x0a, struct linux_rtc_time)
-#define RTC_UIE_ON _IO('p', 0x03) /* Update int. enable on */
-#define RTC_UIE_OFF _IO('p', 0x04) /* Update int. enable off */
-#endif
-/* RTC_EPOCH_READ and RTC_EPOCH_SET ioctls are in kernels since
- Linux 2.0.34 and 2.1.89
- */
-#ifndef RTC_EPOCH_READ
-#define RTC_EPOCH_READ _IOR('p', 0x0d, unsigned long) /* Read epoch */
-#define RTC_EPOCH_SET _IOW('p', 0x0e, unsigned long) /* Set epoch */
-#endif
-
-
-
-static void
-do_rtc_read_ioctl(int rtc_fd, struct tm *tm, int *retcode_p) {
-/*----------------------------------------------------------------------------
- Do the ioctl to read the time. This is, unfortunately, a slightly
- different function for Sparc than for everything else. But we
- return the standard 'tm' structure result in spite of the fact that
- the Sparc ioctl returns something else.
-
- If the ioctl fails, issue message to stderr and return rc = 1;
- else, no message and rc = 0.
------------------------------------------------------------------------------*/
- int rc;
-
-#ifdef __sparc__
- struct sparc_rtc_time stm;
-
- rc = ioctl(rtc_fd, RTCGET, &stm);
- tm->tm_sec = stm.sec;
- tm->tm_min = stm.min;
- tm->tm_hour = stm.hour;
- tm->tm_mday = stm.dom;
- tm->tm_mon = stm.month - 1;
- tm->tm_year = stm.year - 1900;
- tm->tm_wday = stm.dow - 1;
- tm->tm_yday = -1; /* day in the year */
-#else
- rc = ioctl(rtc_fd, RTC_RD_TIME, tm);
-#endif
- if (rc == -1) {
- fprintf(stderr, "%s: ioctl() to /dev/rtc to read the time failed. "
- "errno = %s (%d)\n", MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else *retcode_p = 0;
- tm->tm_isdst = -1; /* don't know whether it's daylight */
- return;
-}
-
-
-
-void
-get_epoch(unsigned long *epoch_p, char **reason_p){
-/*----------------------------------------------------------------------------
- Get the Hardware Clock epoch setting from the kernel.
-
- If we succeed, return the setting (number of year A.D.) as
- *epoch_p and *reason_p == NULL.
-
- If we fail, return and English description of what went wrong as a
- null-terminated string in newly malloc'ed storage and the pointer to
- it as *reason_p.
-----------------------------------------------------------------------------*/
- int rtc_fd;
-
- rtc_fd = open("/dev/rtc", O_RDONLY);
- if (rtc_fd < 0) {
- if (errno == ENOENT)
- *reason_p =
- strdup("To manipulate the epoch value in the kernel, we must "
- "access the Linux 'rtc' device driver via the device special "
- "file /dev/rtc. This file does not exist on this system.\n");
- else {
- *reason_p = malloc(200);
- sprintf(*reason_p, "Unable to open /dev/rtc, open() errno = %s (%d)\n",
- strerror(errno), errno);
- }
- } else {
- int rc; /* return code from ioctl */
- rc = ioctl(rtc_fd, RTC_EPOCH_READ, epoch_p);
- if (rc == -1) {
- *reason_p = malloc(200);
- sprintf(*reason_p, "ioctl(RTC_EPOCH_READ) to /dev/rtc failed, "
- "errno = %s (%d).\n", strerror(errno), errno);
- } else {
- *reason_p = NULL;
- if (debug) printf("we have read epoch %ld from /dev/rtc "
- "with RTC_EPOCH_READ ioctl.\n", *epoch_p);
- }
- close(rtc_fd);
- }
- return;
-}
-
-
-
-static void
-busywait_for_rtc_clock_tick(const int rtc_fd, int *retcode_p) {
-/*----------------------------------------------------------------------------
- Wait for the top of a clock tick by reading /dev/rtc in a busy loop until
- we see it.
------------------------------------------------------------------------------*/
- struct tm start_time;
- /* The time when we were called (and started waiting) */
- int rc;
-
- if (debug)
- printf("Waiting in loop for time from /dev/rtc to change\n");
-
- do_rtc_read_ioctl(rtc_fd, &start_time, &rc);
- if (rc != 0) *retcode_p = 1;
- else {
- /* Wait for change. Should be within a second, but in case something
- weird happens, we have a limit on this loop to reduce the impact
- of this failure.
- */
- struct tm nowtime;
- int iterations; /* how many time's we've spun through the loop */
- int rc; /* Return code from do_rtc_read_ioctl */
-
- iterations = 0;
- do {
- do_rtc_read_ioctl(rtc_fd, &nowtime, &rc);
- } while (rc == 0 && start_time.tm_sec == nowtime.tm_sec
- && iterations++ < 1000000);
-
- if (iterations >= 1000000) {
- fprintf(stderr, "%s: Timed out waiting for time change.\n", MYNAME);
- *retcode_p = 2;
- } else if (rc != 0) *retcode_p = 3;
- else *retcode_p = 0;
- }
-}
-
-
-
-void
-synchronize_to_clock_tick_RTC(int *retcode_p) {
-/*----------------------------------------------------------------------------
- Same as synchronize_to_clock_tick(), but just for /dev/rtc.
------------------------------------------------------------------------------*/
- int rtc_fd; /* File descriptor of /dev/rtc */
-
- rtc_fd = open("/dev/rtc", O_RDONLY);
-
- if (rtc_fd == -1) {
- fprintf(stderr, "%s: open() of /dev/rtc failed, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else {
- int rc; /* Return code from ioctl */
- /* Turn on update interrupts (one per second) */
- rc = ioctl(rtc_fd, RTC_UIE_ON, 0);
- if (rc == -1 && errno == EINVAL) {
- /* This rtc device doesn't have interrupt functions. This is typical
- on an Alpha, where the Hardware Clock interrupts are used by the
- kernel for the system clock, so aren't at the user's disposal.
- */
- if (debug) printf("/dev/rtc does not have interrupt functions. \n");
- busywait_for_rtc_clock_tick(rtc_fd, retcode_p);
- } else if (rc != -1) {
- int rc; /* return code from ioctl */
- unsigned long dummy;
-
- /* this blocks until the next update interrupt */
- rc = read(rtc_fd, &dummy, sizeof(dummy));
- if (rc == -1) {
- fprintf(stderr, "%s: read() to /dev/rtc to wait for clock tick "
- "failed, errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else {
- *retcode_p = 0;
- }
- /* Turn off update interrupts */
- rc = ioctl(rtc_fd, RTC_UIE_OFF, 0);
- if (rc == -1) {
- fprintf(stderr,
- "%s: ioctl() to /dev/rtc to turn off update interrupts "
- "failed, errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- }
- } else {
- fprintf(stderr, "%s: ioctl() to /dev/rtc to turn on update interrupts "
- "failed unexpectedly, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- }
- close(rtc_fd);
- }
-}
-
-
-
-void
-read_hardware_clock_rtc_ioctl(struct tm *tm) {
-/*----------------------------------------------------------------------------
- Read the hardware clock and return the current time via <tm>
- argument. Use ioctls to "rtc" device /dev/rtc.
------------------------------------------------------------------------------*/
- int rc; /* Local return code */
- int rtc_fd; /* File descriptor of /dev/rtc */
-
- rtc_fd = open("/dev/rtc",O_RDONLY);
-if (rtc_fd == -1) {
-fprintf(stderr, "%s: open() of /dev/rtc failed, errno = %s (%d).\n",
- MYNAME, strerror(errno), errno);
-exit(5);
- } else {
- /* Read the RTC time/date */
-
- rc = ioctl(rtc_fd, RTC_RD_TIME, tm);
- if (rc == -1) {
- fprintf(stderr, "%s: ioctl() to /dev/rtc to read the time failed, "
- "errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- exit(5);
- }
- close(rtc_fd);
- }
- tm->tm_isdst = -1; /* don't know whether it's daylight */
-}
-
-
-
-void
-set_hardware_clock_rtc_ioctl(const struct tm new_broken_time,
- const bool testing) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock to the broken down time <new_broken_time>.
- Use ioctls to "rtc" device /dev/rtc.
-----------------------------------------------------------------------------*/
- int rc;
- int rtc_fd;
-
- rtc_fd = open("/dev/rtc", O_RDONLY);
- if (rtc_fd < 0) {
- fprintf(stderr, "%s: Unable to open /dev/rtc, open() errno = %s (%d)\n",
- MYNAME, strerror(errno), errno);
- exit(5);
- } else {
- if (testing)
- printf("Not setting Hardware Clock because running in test mode.\n");
- else {
- rc = ioctl(rtc_fd, RTC_SET_TIME, &new_broken_time);
- if (rc == -1) {
- fprintf(stderr,
- "%s: ioctl() (RTC_SET_TIME) to /dev/rtc to set time failed, "
- "errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- exit(5);
- } else {
- if (debug)
- printf("ioctl(RTC_SET_TIME) was successful.\n");
- }
- }
- close(rtc_fd);
- }
-}
-
-
-
-void
-set_epoch(unsigned long epoch, const bool testing, int *retcode_p) {
-/*----------------------------------------------------------------------------
- Set the Hardware Clock epoch in the kernel.
-----------------------------------------------------------------------------*/
- if (epoch < 1900)
- /* kernel would not accept this epoch value */
- fprintf(stderr, "%s: The epoch value may not be less than 1900. "
- "You requested %ld\n", MYNAME, epoch);
- else {
- int rtc_fd;
-
- rtc_fd = open("/dev/rtc", O_RDONLY);
- if (rtc_fd < 0) {
- if (errno == ENOENT)
- fprintf(stderr,
- "%s: To manipulate the epoch value in the kernel, we must "
- "access the Linux 'rtc' device driver via the device special "
- "file /dev/rtc. This file does not exist on this system.\n",
- MYNAME);
- fprintf(stderr, "%s: Unable to open /dev/rtc, open() errno = %s (%d)\n",
- MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else {
- if (debug) printf("setting epoch to %ld "
- "with RTC_EPOCH_SET ioctl to /dev/rtc.\n", epoch);
- if (testing) {
- printf("Not setting epoch because running in test mode.\n");
- *retcode_p = 0;
- } else {
- int rc; /* return code from ioctl */
- rc = ioctl(rtc_fd, RTC_EPOCH_SET, epoch);
- if (rc == -1) {
- if (errno == EINVAL)
- fprintf(stderr, "%s: The kernel (specifically, the device driver "
- "for /dev/rtc) does not have the RTC_EPOCH_SET ioctl. "
- "Get a newer driver.\n", MYNAME);
- else
- fprintf(stderr, "%s: ioctl(RTC_EPOCH_SET) to /dev/rtc failed, "
- "errno = %s (%d).\n", MYNAME, strerror(errno), errno);
- *retcode_p = 1;
- } else *retcode_p = 0;
- }
- close(rtc_fd);
- }
- }
-}
-
-
-
-void
-see_if_rtc_works(bool * const rtc_works_p) {
-/*----------------------------------------------------------------------------
- Find out if we are capable of accessing the Hardware Clock via the rtc
- driver (via device file /dev/rtc).
------------------------------------------------------------------------------*/
- if (got_rtc) {
- int rtc_fd = open("/dev/rtc", O_RDONLY);
- if (rtc_fd > 0) {
- *rtc_works_p = TRUE;
- close(rtc_fd);
- } else {
- *rtc_works_p = FALSE;
- if (debug)
- printf("Open of /dev/rtc failed, errno = %s (%d). "
- "falling back to more primitive clock access method.\n",
- strerror(errno), errno);
- }
- } else {
- if (debug)
- printf("The Linux kernel for which this copy of hwclock() was built "
- "is too old to have /dev/rtc\n");
- *rtc_works_p = FALSE;
- }
-}
-
-
-
-
diff --git a/clockB/shhopt.c b/clockB/shhopt.c
deleted file mode 100644
index 6d31225c8..000000000
--- a/clockB/shhopt.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/* $Id: shhopt.c,v 2.2 1997/07/06 23:11:55 aebr Exp $ */
-/**************************************************************************
- *
- * FILE shhopt.c
- *
- * DESCRIPTION Functions for parsing command line arguments. Values
- * of miscellaneous types may be stored in variables,
- * or passed to functions as specified.
- *
- * REQUIREMENTS Some systems lack the ANSI C -function strtoul. If your
- * system is one of those, you'll ned to write one yourself,
- * or get the GNU liberty-library (from prep.ai.mit.edu).
- *
- * WRITTEN BY Sverre H. Huseby <sverrehu@ifi.uio.no>
- *
- **************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <errno.h>
-
-#include "shhopt.h"
-
-/**************************************************************************
- * *
- * P R I V A T E D A T A *
- * *
- **************************************************************************/
-
-static void optFatalFunc(const char *, ...);
-static void (*optFatal)(const char *format, ...) = optFatalFunc;
-
-
-
-/**************************************************************************
- * *
- * P R I V A T E F U N C T I O N S *
- * *
- **************************************************************************/
-
-/*-------------------------------------------------------------------------
- *
- * NAME optFatalFunc
- *
- * FUNCTION Show given message and abort the program.
- *
- * INPUT format, ...
- * Arguments used as with printf().
- *
- * RETURNS Never returns. The program is aborted.
- *
- */
-void optFatalFunc(const char *format, ...)
-{
- va_list ap;
-
- fflush(stdout);
- va_start(ap, format);
- vfprintf(stderr, format, ap);
- va_end(ap);
- exit(99);
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optStructCount
- *
- * FUNCTION Get number of options in a optStruct.
- *
- * INPUT opt array of possible options.
- *
- * RETURNS Number of options in the given array.
- *
- * DESCRIPTION Count elements in an optStruct-array. The strcture must
- * be ended using an element of type OPT_END.
- *
- */
-static int optStructCount(const optStruct opt[])
-{
- int ret = 0;
-
- while (opt[ret].type != OPT_END)
- ++ret;
- return ret;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optMatch
- *
- * FUNCTION Find a matching option.
- *
- * INPUT opt array of possible options.
- * s string to match, without `-' or `--'.
- * lng match long option, otherwise short.
- *
- * RETURNS Index to the option if found, -1 if not found.
- *
- * DESCRIPTION Short options are matched from the first character in
- * the given string.
- *
- */
-static int optMatch(const optStruct opt[], const char *s, int lng)
-{
- int nopt, q, matchlen = 0;
- char *p;
-
- nopt = optStructCount(opt);
- if (lng) {
- if ((p = strchr(s, '=')) != NULL)
- matchlen = p - s;
- else
- matchlen = strlen(s);
- }
- for (q = 0; q < nopt; q++) {
- if (lng) {
- if (!opt[q].longName)
- continue;
- if (strncmp(s, opt[q].longName, matchlen) == 0)
- return q;
- } else {
- if (!opt[q].shortName)
- continue;
- if (*s == opt[q].shortName)
- return q;
- }
- }
- return -1;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optString
- *
- * FUNCTION Return a (static) string with the option name.
- *
- * INPUT opt the option to stringify.
- * lng is it a long option?
- *
- * RETURNS Pointer to static string.
- *
- */
-static char *optString(const optStruct *opt, int lng)
-{
- static char ret[31];
-
- if (lng) {
- strcpy(ret, "--");
- strncpy(ret + 2, opt->longName, 28);
- } else {
- ret[0] = '-';
- ret[1] = opt->shortName;
- ret[2] = '\0';
- }
- return ret;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optNeedsArgument
- *
- * FUNCTION Check if an option requires an argument.
- *
- * INPUT opt the option to check.
- *
- * RETURNS Boolean value.
- *
- */
-static int optNeedsArgument(const optStruct *opt)
-{
- return opt->type == OPT_STRING
- || opt->type == OPT_INT
- || opt->type == OPT_UINT
- || opt->type == OPT_LONG
- || opt->type == OPT_ULONG;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME argvRemove
- *
- * FUNCTION Remove an entry from an argv-array.
- *
- * INPUT argc pointer to number of options.
- * argv array of option-/argument-strings.
- * i index of option to remove.
- *
- * OUTPUT argc new argument count.
- * argv array with given argument removed.
- *
- */
-static void argvRemove(int *argc, char *argv[], int i)
-{
- if (i >= *argc)
- return;
- while (i++ < *argc)
- argv[i - 1] = argv[i];
- --*argc;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optExecute
- *
- * FUNCTION Perform the action of an option.
- *
- * INPUT opt array of possible options.
- * arg argument to option, if it applies.
- * lng was the option given as a long option?
- *
- * RETURNS Nothing. Aborts in case of error.
- *
- */
-void optExecute(const optStruct *opt, char *arg, int lng)
-{
- switch (opt->type) {
- case OPT_FLAG:
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(void)) opt->arg)();
- else
- *((int *) opt->arg) = 1;
- break;
-
- case OPT_STRING:
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(char *)) opt->arg)(arg);
- else
- *((char **) opt->arg) = arg;
- break;
-
- case OPT_INT:
- case OPT_LONG: {
- long tmp;
- char *e;
-
- tmp = strtol(arg, &e, 10);
- if (*e)
- optFatal("invalid number `%s'\n", arg);
- if (errno == ERANGE
- || (opt->type == OPT_INT && (tmp > INT_MAX || tmp < INT_MIN)))
- optFatal("number `%s' to `%s' out of range\n",
- arg, optString(opt, lng));
- if (opt->type == OPT_INT) {
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(int)) opt->arg)((int) tmp);
- else
- *((int *) opt->arg) = (int) tmp;
- } else /* OPT_LONG */ {
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(long)) opt->arg)(tmp);
- else
- *((long *) opt->arg) = tmp;
- }
- break;
- }
-
- case OPT_UINT:
- case OPT_ULONG: {
- unsigned long tmp;
- char *e;
-
- tmp = strtoul(arg, &e, 10);
- if (*e)
- optFatal("invalid number `%s'\n", arg);
- if (errno == ERANGE
- || (opt->type == OPT_UINT && tmp > UINT_MAX))
- optFatal("number `%s' to `%s' out of range\n",
- arg, optString(opt, lng));
- if (opt->type == OPT_UINT) {
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(unsigned)) opt->arg)((unsigned) tmp);
- else
- *((unsigned *) opt->arg) = (unsigned) tmp;
- } else /* OPT_ULONG */ {
- if (opt->flags & OPT_CALLFUNC)
- ((void (*)(unsigned long)) opt->arg)(tmp);
- else
- *((unsigned long *) opt->arg) = tmp;
- }
- break;
- }
-
- default:
- break;
- }
-}
-
-
-
-/**************************************************************************
- * *
- * P U B L I C F U N C T I O N S *
- * *
- **************************************************************************/
-
-/*-------------------------------------------------------------------------
- *
- * NAME optSetFatalFunc
- *
- * FUNCTION Set function used to display error message and exit.
- *
- * SYNOPSIS #include "shhmsg.h"
- * void optSetFatalFunc(void (*f)(const char *, ...));
- *
- * INPUT f function accepting printf()'like parameters,
- * that _must_ abort the program.
- *
- */
-void optSetFatalFunc(void (*f)(const char *, ...))
-{
- optFatal = f;
-}
-
-
-
-/*-------------------------------------------------------------------------
- *
- * NAME optParseOptions
- *
- * FUNCTION Parse commandline options.
- *
- * SYNOPSIS #include "shhopt.h"
- * void optParseOptions(int *argc, char *argv[],
- * const optStruct opt[], int allowNegNum);
- *
- * INPUT argc Pointer to number of options.
- * argv Array of option-/argument-strings.
- * opt Array of possible options.
- * allowNegNum
- * a negative number is not to be taken as
- * an option.
- *
- * OUTPUT argc new argument count.
- * argv array with arguments removed.
- *
- * RETURNS Nothing. Aborts in case of error.
- *
- * DESCRIPTION This function checks each option in the argv-array
- * against strings in the opt-array, and `executes' any
- * matching action. Any arguments to the options are
- * extracted and stored in the variables or passed to
- * functions pointed to by entries in opt.
- *
- * Options and arguments used are removed from the argv-
- * array, and argc is decreased accordingly.
- *
- * Any error leads to program abortion.
- *
- */
-void optParseOptions(int *argc, char *argv[],
- const optStruct opt[], int allowNegNum)
-{
- int ai, /* argv index. */
- optarg, /* argv index of option argument, or -1 if none. */
- mi, /* Match index in opt. */
- done;
- char *arg, /* Pointer to argument to an option. */
- *o, /* pointer to an option character */
- *p;
-
- /*
- * Loop through all arguments.
- */
- for (ai = 0; ai < *argc; ) {
- /*
- * "--" indicates that the rest of the argv-array does not
- * contain options.
- */
- if (strcmp(argv[ai], "--") == 0) {
- argvRemove(argc, argv, ai);
- break;
- }
-
- if (allowNegNum && argv[ai][0] == '-' && isdigit(argv[ai][1])) {
- ++ai;
- continue;
- } else if (strncmp(argv[ai], "--", 2) == 0) {
- /* long option */
- /* find matching option */
- if ((mi = optMatch(opt, argv[ai] + 2, 1)) < 0)
- optFatal("unrecognized option `%s'\n", argv[ai]);
-
- /* possibly locate the argument to this option. */
- arg = NULL;
- if ((p = strchr(argv[ai], '=')) != NULL)
- arg = p + 1;
-
- /* does this option take an argument? */
- optarg = -1;
- if (optNeedsArgument(&opt[mi])) {
- /* option needs an argument. find it. */
- if (!arg) {
- if ((optarg = ai + 1) == *argc)
- optFatal("option `%s' requires an argument\n",
- optString(&opt[mi], 1));
- arg = argv[optarg];
- }
- } else {
- if (arg)
- optFatal("option `%s' doesn't allow an argument\n",
- optString(&opt[mi], 1));
- }
- /* perform the action of this option. */
- optExecute(&opt[mi], arg, 1);
- /* remove option and any argument from the argv-array. */
- if (optarg >= 0)
- argvRemove(argc, argv, ai);
- argvRemove(argc, argv, ai);
- } else if (*argv[ai] == '-') {
- /* A dash by itself is not considered an option. */
- if (argv[ai][1] == '\0') {
- ++ai;
- continue;
- }
- /* Short option(s) following */
- o = argv[ai] + 1;
- done = 0;
- optarg = -1;
- while (*o && !done) {
- /* find matching option */
- if ((mi = optMatch(opt, o, 0)) < 0)
- optFatal("unrecognized option `-%c'\n", *o);
-
- /* does this option take an argument? */
- optarg = -1;
- arg = NULL;
- if (optNeedsArgument(&opt[mi])) {
- /* option needs an argument. find it. */
- arg = o + 1;
- if (!*arg) {
- if ((optarg = ai + 1) == *argc)
- optFatal("option `%s' requires an argument\n",
- optString(&opt[mi], 0));
- arg = argv[optarg];
- }
- done = 1;
- }
- /* perform the action of this option. */
- optExecute(&opt[mi], arg, 0);
- ++o;
- }
- /* remove option and any argument from the argv-array. */
- if (optarg >= 0)
- argvRemove(argc, argv, ai);
- argvRemove(argc, argv, ai);
- } else {
- /* a non-option argument */
- ++ai;
- }
- }
-}
diff --git a/clockB/shhopt.h b/clockB/shhopt.h
deleted file mode 100644
index 3f87c138b..000000000
--- a/clockB/shhopt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Id: shhopt.h,v 1.2 1996/06/06 00:06:35 sverrehu Exp $ */
-#ifndef SHHOPT_H
-#define SHHOPT_H
-
-/* constants for recognized option types. */
-typedef enum {
- OPT_END, /* nothing. used as ending element. */
- OPT_FLAG, /* no argument following. sets variable to 1. */
- OPT_STRING, /* string argument. */
- OPT_INT, /* signed integer argument. */
- OPT_UINT, /* unsigned integer argument. */
- OPT_LONG, /* signed long integer argument. */
- OPT_ULONG, /* unsigned long integer argument. */
-} optArgType;
-
-/* flags modifying the default way options are handeled. */
-#define OPT_CALLFUNC 1 /* pass argument to a function. */
-
-typedef struct {
- char shortName; /* Short option name. */
- char *longName; /* Long option name, no including '--'. */
- optArgType type; /* Option type. */
- void *arg; /* Pointer to variable to fill with argument,
- * or pointer to function if Type == OPT_FUNC. */
- int flags; /* Modifier flags. */
-} optStruct;
-
-
-void optSetFatalFunc(void (*f)(const char *, ...));
-void optParseOptions(int *argc, char *argv[],
- const optStruct opt[], const int allowNegNum);
-
-#endif
diff --git a/clockB/util.c b/clockB/util.c
deleted file mode 100644
index 8a1a6060c..000000000
--- a/clockB/util.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/**************************************************************************
-
- This is a component of the hwclock program.
-
- This file contains the code for various basic utility routines
- needed by the other modules.
-
-****************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-
-#include "hwclock.h"
-
-bool
-is_in_cpuinfo(const char * const fmt, const char * const str) {
-/*----------------------------------------------------------------------------
- Return true iff the /proc/cpuinfo file shows the value 'str' for the
- keyword 'fmt'. Both arguments are null-terminated strings.
-
- If for any reason we can't read /proc/cpuinfo, return false.
------------------------------------------------------------------------------*/
- FILE *cpuinfo;
- char field[256];
- char format[256];
- bool found;
-
- sprintf(format, "%s : %s", fmt, "%255s");
-
- found = FALSE; /* initial value */
- if ((cpuinfo = fopen ("/proc/cpuinfo", "r")) != NULL) {
- while (!feof(cpuinfo)) {
- if (fscanf (cpuinfo, format, field) == 1) {
- if (strncmp(field, str, strlen(str)) == 0)
- found = TRUE;
- break;
- }
- fgets (field, 256, cpuinfo);
- }
- fclose(cpuinfo);
- }
- return found;
-}
-
-
-
-char *
-ctime2(const time_t time) {
-/*----------------------------------------------------------------------------
- Same as ctime() from the standard C library, except it takes a time_t
- as an argument instead of a pointer to a time_t, so it is much more
- useful.
-
- Also, don't include a newline at the end of the returned string. If
- the user wants a newline, he can provide it himself.
-
- return value is in static storage within.
------------------------------------------------------------------------------*/
- static char retval[30];
-
- strncpy(retval, ctime(&time), sizeof(retval));
- retval[sizeof(retval)-1] = '\0';
-
- /* Now chop off the last character, which is the newline */
- if (strlen(retval) >= 1) /* for robustness */
- retval[strlen(retval)-1] = '\0';
- return(retval);
-
-}
-
-
-
-struct timeval
-t2tv(time_t argument) {
-/*----------------------------------------------------------------------------
- Convert from "time_t" format to "timeval" format.
------------------------------------------------------------------------------*/
- struct timeval retval;
-
- retval.tv_sec = argument;
- retval.tv_usec = 0;
- return(retval);
-}
-
-
-
-float
-time_diff(struct timeval subtrahend, struct timeval subtractor) {
-/*---------------------------------------------------------------------------
- The difference in seconds between two times in "timeval" format.
-----------------------------------------------------------------------------*/
- return( (subtrahend.tv_sec - subtractor.tv_sec)
- + (subtrahend.tv_usec - subtractor.tv_usec) / 1E6 );
-}
-
-
-struct timeval
-time_inc(struct timeval addend, float increment) {
-/*----------------------------------------------------------------------------
- The time, in "timeval" format, which is <increment> seconds after
- the time <addend>. Of course, <increment> may be negative.
------------------------------------------------------------------------------*/
- struct timeval newtime;
-
- newtime.tv_sec = addend.tv_sec + (int) increment;
- newtime.tv_usec = addend.tv_usec + (increment - (int) increment) * 1E6;
-
- /* Now adjust it so that the microsecond value is between 0 and 1 million */
- if (newtime.tv_usec < 0) {
- newtime.tv_usec += 1E6;
- newtime.tv_sec -= 1;
- } else if (newtime.tv_usec >= 1E6) {
- newtime.tv_usec -= 1E6;
- newtime.tv_sec += 1;
- }
- return(newtime);
-}
-
-
-
diff --git a/configure b/configure
index 75f754642..6b5d6b6ad 100755
--- a/configure
+++ b/configure
@@ -3,31 +3,49 @@
#
# We need to find out the following things:
#
-# 1. For mount/nfsmount.c: is inet_aton() available?
-# 2. For fdisk/fdisksunlabel.c: is there a <scsi/scsi.h>?
-# For fdisk/fdisk.c: is there a <linux/blkpg.h>?
-# 3. For sys-utils/ipcs.c: do we need __KERNEL__ and <linux/linkage.h>?
-# 4. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
-# 5. For sys-utils/kbd_rate.c: does <linux/kd.h> exist?
-# 6. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
-# For more: do we have libtermcap?
-# 7. For chfn, chsh, login, newgrp, passwd: do we need -lcrypt?
-# 8. For sln: does static compilation work?
+# 1. For mount/nfsmount.c: is inet_aton() available?
+# 2. For fdisk/fdisksunlabel.c: is there a <scsi/scsi.h>?
+# For fdisk/fdisk.c: is there a <linux/blkpg.h>?
+# 4. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
+# 5. For sys-utils/kbd_rate.c: does <linux/kd.h> exist?
+# 6. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
+# For more: do we have libtermcap?
+# 7. For chfn, chsh, login, newgrp, passwd: do we need -lcrypt?
+# 8. For sln: does static compilation work?
# 9. For lib/nls.h: do we have <locale.h>?
# 10. For lib/nls.h: do we have <libintl.h> and gettext()?
# 11. For xgettext: does it take the option --foreign-user?
# 12. For cal.c: do we have <langinfo.h>?
# 13. For err.c: do we have __progname?
# 14. For script.c: do we have <pty.h> and openpty()?
+# 15. For lib/widechar.h: do we have wide character support?
+# 16. For clock/kd.c: do we have nanosleep()?
+
+rm -f make_include defines.h
+
+VERSION=`cat VERSION`
+echo
+echo configuring util-linux-$VERSION
+echo
+echo "VERSION=$VERSION" > make_include
+echo '#define UTIL_LINUX_VERSION "'$VERSION'"' > defines.h
+echo '#define util_linux_version "util-linux-'$VERSION'"' >> defines.h
+echo >> defines.h
-if test "$RANDOM" = "$RANDOM"; then
- # Plain old Bourne shell.
- echo checking for gcc
- test -z "$CC" -a -n "`gcc 2>&1`" && CC="gcc -O"
+if test -z "$CC"
+then
+ if test "$RANDOM" = "$RANDOM"; then
+ # Plain old Bourne shell.
+ echo checking for gcc
+ test -z "$CC" -a -n "`gcc 2>&1`" && CC="gcc -O"
+ else
+ # ksh, bash or zsh. ksh and zsh write "command not found" to stderr.
+ echo checking for gcc
+ test -z "$CC" && type gcc && CC="gcc -O"
+ fi
else
- # ksh, bash or zsh. ksh and zsh write "command not found" to stderr.
- echo checking for gcc
- test -z "$CC" && type gcc && CC="gcc -O"
+ echo "Using CC=\"$CC\""
+ echo
fi
CC=${CC-cc}
@@ -36,8 +54,10 @@ DEFS=
LIBS=
compile='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
static_compile='$CC -static $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
+eval COMPILE='"'$compile'"'
+export COMPILE
-rm -f make_include defines.h conftest.c conftest
+rm -f conftest.c conftest
#
# 1. For mount/nfsmount.c: is inet_aton() available?
@@ -84,35 +104,9 @@ rm -f conftest conftest.c
#
# 2A. For fdisk/fdisk.c: is <linux/blkpg.h> available?
#
-echo "
-#include <linux/blkpg.h>
-main(){ exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if ./testincl "linux/blkpg.h"; then
echo "#define HAVE_blkpg_h" >> defines.h
- echo "You have <linux/blkpg.h>"
-else
- echo "You don't have <linux/blkpg.h>"
-fi
-rm -f conftest conftest.c
-
-#
-# 3. ipcs.c includes <sys/shm.h> and family
-# Do we need __KERNEL__ and asmlinkage for SHM_DEST?
-#
-echo "
-#include <sys/shm.h>
-main(){ int i=SHM_DEST; exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
- echo "You don't need <linux/linkage.h>"
-else
- echo "#define NEED_linkage_h" >> defines.h
- echo "You need <linux/linkage.h>"
fi
-rm -f conftest conftest.c
#
# 4. cytune.c may need struct tq_struct
@@ -134,29 +128,22 @@ rm -f conftest conftest.c
#
# 5. Does <linux/kd.h> exist?
#
-echo "
-#include <linux/kd.h>
-main(){ exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if ./testincl "linux/kd.h"; then
echo "#define HAVE_kd_h" >> defines.h
- echo "You have <linux/kd.h>"
-else
- echo "You don't have <linux/kd.h>"
fi
-rm -f conftest conftest.c
#
# 6. How is [n]curses installed?
#
test_curses_h=0
have_ncurses=1
-if [ -f /usr/include/ncurses/curses.h ]; then
+if ! ./testincl "term.h"; then
+ have_ncurses=0
+elif ./testincl -q "ncurses/curses.h"; then
echo "HAVE_NCURSES=yes" >> make_include
echo "CURSESFLAGS=-I/usr/include/ncurses -DNCH=0" >> make_include
echo "You have ncurses. Using <ncurses/curses.h>."
-elif [ -f /usr/include/ncurses.h ]; then
+elif ./testincl -q "ncurses.h"; then
echo "HAVE_NCURSES=yes" >> make_include
echo "CURSESFLAGS=-DNCH=1" >> make_include
echo "You have ncurses. Using <ncurses.h>."
@@ -164,7 +151,7 @@ elif [ -f /usr/local/include/ncurses.h ]; then
echo "HAVE_NCURSES=yes" >> make_include
echo "CURSESFLAGS=-I/usr/local/include -DNCH=1" >> make_include
echo "You have ncurses. Using /usr/local/include/ncurses.h."
-elif [ -f /usr/include/curses.h ]; then
+elif ./testincl -q "curses.h"; then
test_curses_h=1
else
have_ncurses=0
@@ -214,7 +201,11 @@ if test -s conftest && ./conftest 2>/dev/null; then
echo "You have termcap"
else
echo "HAVE_TERMCAP=no" >> make_include
- echo "You don't have termcap"
+ if [ $have_ncurses = 0 ]; then
+ echo "You don't have termcap - I will not make more."
+ else
+ echo "You don't have termcap"
+ fi
fi
rm -f conftest conftest.c
@@ -253,18 +244,9 @@ fi
#
# 9. For lib/nls.h: do we have <locale.h>?
#
-echo "
-#include <locale.h>
-main(){ exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if ./testincl "locale.h"; then
echo "#define HAVE_locale_h" >> defines.h
- echo "You have <locale.h>"
-else
- echo "You don't have <locale.h>"
fi
-rm -f conftest conftest.c
#
@@ -284,7 +266,7 @@ if test -s conftest && ./conftest 2>/dev/null; then
echo "You have <libintl.h> and gettext()"
echo '#define ENABLE_NLS' >> defines.h
echo "Assuming that you want to enable NLS support."
- echo "(Otherwise, edit defines.h)"
+ echo "(Otherwise, edit defines.h and remove the line with ENABLE_NLS)"
ENABLE_NLS=yes
else
echo "You don't have <libintl.h>"
@@ -311,18 +293,9 @@ fi
#
# 12. For cal.c: do we have <langinfo.h>?
#
-echo "
-#include <langinfo.h>
-main(){ exit(0); }
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if ./testincl "langinfo.h"; then
echo "#define HAVE_langinfo_h" >> defines.h
- echo "You have <langinfo.h>"
-else
- echo "You don't have <langinfo.h>"
fi
-rm -f conftest conftest.c
#
@@ -343,7 +316,6 @@ else
fi
rm -f conftest conftest.c
-
#
# 14. For script.c: do we have <pty.h> and openpty()?
#
@@ -360,3 +332,52 @@ else
echo "You don't have <pty.h> and openpty()"
fi
rm -f conftest conftest.c
+
+#
+# 15. For lib/widechar.h: do we have wide character support?
+# [Do we have the headers <wchar.h>, <wctype.h>, the types wchar_t, wint_t
+# and the fgetwc, fputwc, WEOF functions/macros?]
+#
+echo "
+#include <wchar.h>
+#include <wctype.h>
+#include <stdio.h>
+int main () {
+ wchar_t wc;
+ wint_t w;
+ w = fgetwc(stdin);
+ if (w == WEOF) exit(1);
+ wc = w;
+ fputwc(wc,stdout);
+ exit(0);
+}
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest < conftest.c > /dev/null 2>/dev/null; then
+ echo "#define ENABLE_WIDECHAR" >> defines.h
+ echo "You have wide character support"
+else
+ echo "You don't have wide character support"
+fi
+rm -f conftest conftest.c
+
+#
+# 16. For clock/kd.c: do we have nanosleep?
+#
+echo "
+#include <time.h>
+int main () {
+ struct timespec sleep = { 0, 1 };
+ nanosleep( &sleep, NULL );
+ exit(0);
+}
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest 2>/dev/null; then
+ echo "#define HAVE_nanosleep" >> defines.h
+ echo "You have nanosleep()"
+else
+ echo "You don't have nanosleep()"
+fi
+rm -f conftest conftest.c
+
diff --git a/disk-utils/Makefile b/disk-utils/Makefile
index b170e81ee..36f5e616f 100644
--- a/disk-utils/Makefile
+++ b/disk-utils/Makefile
@@ -1,49 +1,53 @@
# Makefile -- Makefile for util-linux Linux utilities
# Created: Sat Dec 26 20:09:40 1992
-# Revised: Fri Oct 6 21:02:21 1995 by r.faith@ieee.org
# Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu)
-#
+
include ../make_include
include ../MCONFIG
# Where to put man pages?
-MAN8= fdformat.8 mkswap.8 setfdprm.8
+MAN8= fdformat.8 mkfs.8 mkswap.8
# Where to put binaries?
# See the "install" rule for the links. . .
-SBIN= mkfs mkswap
+SBIN= mkfs mkswap blockdev
-USRBIN= fdformat setfdprm
+USRBIN= fdformat
ETC= fdprm
ifneq "$(CPU)" "sparc"
# fsck and mkfs will compile, but there is no kernel support on sparc
-MAN8:=$(MAN8) fsck.minix.8 mkfs.8 mkfs.minix.8
-SBIN:=$(SBIN) fsck.minix mkfs.minix
+MAN8:=$(MAN8) fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
+SBIN:=$(SBIN) fsck.minix mkfs.minix mkfs.bfs
endif
-# Where to put datebase files?
+ifneq "$(HAVE_FDUTILS)" "yes"
+USRBIN:=$(USRBIN) setfdprm
+MAN8:=$(MAN8) setfdprm.8
+endif
+
+# raw.c does not compile on 2.2.*.
+# find out later where it does and add tests to config
+ifeq "$(ADD_RAW)" "yes"
+USRBIN:=$(USRBIN) raw
+MAN8:=$(MAN8) raw.8
+endif
all: $(SBIN) $(USRBIN)
-fdformat: fdformat.o
-fsck.minix: fsck.minix.o
-fsck.minix.o: fsck.minix.c bitops.h
-mkfs: mkfs.o
-mkfs.minix: mkfs.minix.o
-mkfs.minix.o: mkfs.minix.c bitops.h
-mkswap: mkswap.o
-setfdprm: setfdprm.o
+fsck.minix.o mkfs.minix.o: bitops.h
install: all
$(INSTALLDIR) $(SBINDIR) $(USRBINDIR) $(ETCDIR)
$(INSTALLBIN) $(SBIN) $(SBINDIR)
$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
+ifneq "$(HAVE_FDUTILS)" "yes"
$(INSTALLDAT) $(ETC) $(ETCDIR)
+endif
$(INSTALLDIR) $(MAN8DIR)
$(INSTALLMAN) $(MAN8) $(MAN8DIR)
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
new file mode 100644
index 000000000..7f1fd7bb8
--- /dev/null
+++ b/disk-utils/blockdev.c
@@ -0,0 +1,220 @@
+/*
+ * blockdev.c --- Do various simple block device ioctls from the command line
+ * aeb, 991028
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <linux/fs.h>
+#include "nls.h"
+
+const char *progname;
+
+struct bdc {
+ char *name;
+ char *iocname;
+ long ioc;
+ int argtype;
+#define ARGNONE 0
+#define ARGINTA 1
+#define ARGINTP 2
+#define ARGINTG 3
+#define ARGLINTG 4
+ long argval;
+ char *argname;
+ char *help;
+} bdcms[] = {
+#ifdef BLKROSET
+ { "--setro", "BLKROSET", BLKROSET, ARGINTP, 1, NULL, N_("set read-only") },
+ { "--setrw", "BLKROSET", BLKROSET, ARGINTP, 0, NULL, N_("set read-write") },
+#endif
+#ifdef BLKROGET
+ { "--getro", "BLKROGET", BLKROGET, ARGINTG, -1, NULL, N_("get read-only") },
+#endif
+#ifdef BLKSSZGET
+ { "--getss", "BLKSSZGET", BLKSSZGET, ARGINTG, -1, NULL, N_("get sectorsize") },
+#endif
+#ifdef BLKGETSIZE
+ { "--getsize", "BLKGETSIZE", BLKGETSIZE, ARGLINTG, -1, NULL, N_("get size") },
+#endif
+#ifdef BLKRASET
+ { "--setra", "BLKRASET", BLKRASET, ARGINTA, 0, "READAHEAD", N_("set readahead") },
+#endif
+#ifdef BLKRAGET
+ { "--getra", "BLKRAGET", BLKRAGET, ARGLINTG, -1, NULL, N_("get readahead") },
+#endif
+#ifdef BLKFLSBUF
+ { "--flushbufs", "BLKFLSBUF", BLKFLSBUF, ARGNONE, 0, NULL, N_("flush buffers") },
+#endif
+#ifdef BLKRRPART
+ { "--rereadpt", "BLKRRPART", BLKRRPART, ARGNONE, 0, NULL,
+ N_("reread partition table") },
+#endif
+};
+
+#define SIZE(a) (sizeof(a)/sizeof((a)[0]))
+
+static void
+usage(void) {
+ int i;
+ fprintf(stderr, _("Usage: %s [-V] [-v|-q] commands devices\n"), progname);
+ fprintf(stderr, _("Available commands:\n"));
+ for (i = 0; i < SIZE(bdcms); i++) {
+ fprintf(stderr, "\t%s", bdcms[i].name);
+ if (bdcms[i].argname)
+ fprintf(stderr, " %s", bdcms[i].argname);
+ if (bdcms[i].help)
+ fprintf(stderr, "\t(%s)", _(bdcms[i].help));
+ fprintf(stderr, "\n");
+ }
+ exit(1);
+}
+
+int
+find_cmd(char *s) {
+ int j;
+
+ for (j = 0; j < SIZE(bdcms); j++)
+ if (!strcmp(s, bdcms[j].name))
+ return j;
+ return -1;
+}
+
+void do_commands(int fd, char **argv, int d);
+
+int
+main(int argc, char **argv) {
+ int fd, d, j, k;
+ char *p;
+
+ /* egcs-2.91.66 is buggy and says:
+ blockdev.c:93: warning: `d' might be used uninitialized */
+ d = 0;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ if (argc < 2)
+ usage();
+
+ /* -V not together with commands */
+ if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
+ printf("%s from %s\n", progname, util_linux_version);
+ exit(0);
+ }
+
+ /* do each of the commands on each of the devices */
+ /* devices start after last command */
+ for (d = 1; d < argc; d++) {
+ j = find_cmd(argv[d]);
+ if (j >= 0) {
+ if (bdcms[j].argtype == ARGINTA)
+ d++;
+ continue;
+ }
+ if (!strcmp(argv[d], "--")) {
+ d++;
+ break;
+ }
+ if (argv[d][0] != '-')
+ break;
+ }
+
+ if (d >= argc)
+ usage();
+
+ for (k = d; k < argc; k++) {
+ fd = open(argv[k], O_RDONLY, 0);
+ if (fd < 0) {
+ perror(argv[k]);
+ exit(1);
+ }
+ do_commands(fd, argv, d);
+ }
+ return 0;
+}
+
+void
+do_commands(int fd, char **argv, int d) {
+ int res, i, j;
+ int iarg;
+ long larg;
+ int verbose = 0;
+
+ for (i = 1; i < d; i++) {
+ if (!strcmp(argv[i], "-v")) {
+ verbose = 1;
+ continue;
+ }
+ if (!strcmp(argv[i], "-q")) {
+ verbose = 0;
+ continue;
+ }
+
+ j = find_cmd(argv[i]);
+ if (j == -1) {
+ fprintf(stderr, _("%s: Unknown command: %s\n"), progname, argv[i]);
+ usage();
+ }
+
+ switch(bdcms[j].argtype) {
+ default:
+ case ARGNONE:
+ res = ioctl(fd, bdcms[j].ioc, 0);
+ break;
+ case ARGINTA:
+ if (i == d-1) {
+ fprintf(stderr, _("%s requires an argument\n"),
+ bdcms[j].name);
+ usage();
+ }
+ iarg = atoi(argv[++i]);
+ res = ioctl(fd, bdcms[j].ioc, iarg);
+ break;
+ case ARGINTP:
+ case ARGINTG:
+ iarg = bdcms[j].argval;
+ res = ioctl(fd, bdcms[j].ioc, &iarg);
+ break;
+ case ARGLINTG:
+ larg = bdcms[j].argval;
+ res = ioctl(fd, bdcms[j].ioc, &larg);
+ break;
+ }
+ if (res == -1) {
+ perror(bdcms[j].iocname);
+ if (verbose)
+ printf("%s failed.\n", _(bdcms[j].help));
+ exit(1);
+ }
+ switch(bdcms[j].argtype) {
+ case ARGINTG:
+ if (verbose)
+ printf("%s: %d\n", _(bdcms[j].help), iarg);
+ else
+ printf("%d\n", iarg);
+ break;
+ case ARGLINTG:
+ if (verbose)
+ printf("%s: %ld\n", _(bdcms[j].help), larg);
+ else
+ printf("%ld\n", larg);
+ break;
+ default:
+ if (verbose)
+ printf("%s succeeded.\n", _(bdcms[j].help));
+ break;
+ }
+ }
+}
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index bb4f0a1f5..6c3ef5c91 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -101,22 +101,31 @@ static void usage(char *name)
int main(int argc,char **argv)
{
int verify;
- char *name;
struct stat st;
+ char *progname, *p;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- name = argv[0];
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), progname, util_linux_version);
+ exit(0);
+ }
+
verify = 1;
if (argc > 1 && argv[1][0] == '-') {
- if (argv[1][1] != 'n') usage(name);
+ if (argv[1][1] != 'n') usage(progname);
verify = 0;
argc--;
argv++;
}
- if (argc != 2) usage(name);
+ if (argc != 2) usage(progname);
if (stat(argv[1],&st) < 0) PERROR(argv[1]);
if (!S_ISBLK(st.st_mode) || MAJOR(st.st_rdev) != FLOPPY_MAJOR) {
fprintf(stderr,_("%s: not a floppy device\n"),argv[1]);
@@ -127,7 +136,8 @@ int main(int argc,char **argv)
if (ioctl(ctrl,FDGETPRM,(long) &param) < 0)
PERROR(_("Could not determine current format type"));
printf(_("%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"),
- param.head ? _("Double") : _("Single"),param.track,param.sect,param.size >> 1);
+ param.head ? _("Double") : _("Single"),
+ param.track, param.sect,param.size >> 1);
format_disk(argv[1]);
if (verify) verify_disk(argv[1]);
return 0;
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 416c178cb..99a8ca853 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -98,7 +98,6 @@
#include <linux/fs.h>
#include <linux/minix_fs.h>
-#include "../version.h"
#include "nls.h"
#ifdef MINIX2_SUPER_MAGIC2
@@ -125,7 +124,6 @@
#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
static char * program_name = "fsck.minix";
-static char * program_version = "1.2 - 11/11/96";
static char * device_name = NULL;
static int IN;
static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0,
@@ -185,17 +183,25 @@ void recursive_check2(unsigned int ino);
#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
-void fatal_error(const char *, int) __attribute__ ((noreturn));
-void fatal_error(const char * fmt_string, int status)
+void leave(int) __attribute__ ((noreturn));
+void leave(int status)
{
- fprintf(stderr,fmt_string,program_name,device_name);
if (termios_set)
tcsetattr(0, TCSANOW, &termios);
exit(status);
}
-#define usage() fatal_error(_("Usage: %s [-larvsmf] /dev/name\n"),16)
-#define die(str) fatal_error(_("%s: " str "\n"),8)
+void usage(void) {
+ fprintf(stderr,
+ _("Usage: %s [-larvsmf] /dev/name\n"),
+ program_name);
+ leave(16);
+}
+
+void die(const char *str) {
+ fprintf(stderr, "%s: %s\n", program_name, str);
+ leave(8);
+}
/*
* This simply goes through the file-name data and prints out the
@@ -381,7 +387,7 @@ void write_block(unsigned int nr, char * addr)
return;
}
if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET))
- die("seek failed in write_block");
+ die(_("seek failed in write_block"));
if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) {
printf(_("Write error: bad block in file '"));
print_current_name();
@@ -502,9 +508,9 @@ void write_super_block(void)
Super.s_state &= ~MINIX_ERROR_FS;
if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
- die("seek failed in write_super_block");
+ die(_("seek failed in write_super_block"));
if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE))
- die("unable to write super-block");
+ die(_("unable to write super-block"));
return;
}
@@ -514,11 +520,11 @@ void write_tables(void)
write_super_block();
if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE))
- die("Unable to write inode map");
+ die(_("Unable to write inode map"));
if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE))
- die("Unable to write zone map");
+ die(_("Unable to write zone map"));
if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE))
- die("Unable to write inodes");
+ die(_("Unable to write inodes"));
}
void get_dirsize (void)
@@ -547,9 +553,9 @@ void get_dirsize (void)
void read_superblock(void)
{
if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
- die("seek failed");
+ die(_("seek failed"));
if (BLOCK_SIZE != read(IN, super_block_buffer, BLOCK_SIZE))
- die("unable to read super block");
+ die(_("unable to read super block"));
if (MAGIC == MINIX_SUPER_MAGIC) {
namelen = 14;
dirsize = 16;
@@ -569,20 +575,20 @@ void read_superblock(void)
version2 = 1;
#endif
} else
- die("bad magic number in super-block");
+ die(_("bad magic number in super-block"));
if (ZONESIZE != 0 || BLOCK_SIZE != 1024)
- die("Only 1k blocks/zones supported");
+ die(_("Only 1k blocks/zones supported"));
if (IMAPS * BLOCK_SIZE * 8 < INODES + 1)
- die("bad s_imap_blocks field in super-block");
+ die(_("bad s_imap_blocks field in super-block"));
if (ZMAPS * BLOCK_SIZE * 8 < ZONES - FIRSTZONE + 1)
- die("bad s_zmap_blocks field in super-block");
+ die(_("bad s_zmap_blocks field in super-block"));
}
void read_tables(void)
{
inode_map = malloc(IMAPS * BLOCK_SIZE);
if (!inode_map)
- die("Unable to allocate buffer for inode map");
+ die(_("Unable to allocate buffer for inode map"));
zone_map = malloc(ZMAPS * BLOCK_SIZE);
if (!inode_map)
die("Unable to allocate buffer for zone map");
@@ -590,19 +596,19 @@ void read_tables(void)
memset(zone_map,0,sizeof(zone_map));
inode_buffer = malloc(INODE_BUFFER_SIZE);
if (!inode_buffer)
- die("Unable to allocate buffer for inodes");
+ die(_("Unable to allocate buffer for inodes"));
inode_count = malloc(INODES + 1);
if (!inode_count)
- die("Unable to allocate buffer for inode count");
+ die(_("Unable to allocate buffer for inode count"));
zone_count = malloc(ZONES);
if (!zone_count)
- die("Unable to allocate buffer for zone count");
+ die(_("Unable to allocate buffer for zone count"));
if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*BLOCK_SIZE))
- die("Unable to read inode map");
+ die(_("Unable to read inode map"));
if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE))
- die("Unable to read zone map");
+ die(_("Unable to read zone map"));
if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE))
- die("Unable to read inodes");
+ die(_("Unable to read inodes"));
if (NORM_FIRSTZONE != FIRSTZONE) {
printf(_("Warning: Firstzone != Norm_firstzone\n"));
errors_uncorrected = 1;
@@ -723,7 +729,7 @@ void check_root(void)
struct minix_inode * inode = Inode + ROOT_INO;
if (!inode || !S_ISDIR(inode->i_mode))
- die("root inode isn't a directory");
+ die(_("root inode isn't a directory"));
}
#ifdef HAVE_MINIX2
@@ -1065,7 +1071,7 @@ void recursive_check(unsigned int ino)
dir = Inode + ino;
if (!S_ISDIR(dir->i_mode))
- die("internal error");
+ die(_("internal error"));
if (dir->i_size < 2 * dirsize) {
print_current_name();
printf(_(": bad directory: size<32"));
@@ -1100,7 +1106,7 @@ int bad_zone(int i)
char buffer[1024];
if (BLOCK_SIZE*i != lseek(IN, BLOCK_SIZE*i, SEEK_SET))
- die("seek failed in bad_zone");
+ die(_("seek failed in bad_zone"));
return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE));
}
@@ -1234,19 +1240,27 @@ int main(int argc, char ** argv)
struct termios tmp;
int count;
int retcode = 0;
+ char *p;
+
+ program_name = (argc && *argv) ? argv[0] : "fsck.minix";
+ if ((p = strrchr(program_name, '/')) != NULL)
+ program_name = p+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
-
- if (argc && *argv)
- program_name = *argv;
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), program_name, util_linux_version);
+ exit(0);
+ }
+
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
- die("bad inode size");
+ die(_("bad inode size"));
#ifdef HAVE_MINIX2
if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
- die("bad v2 inode size");
+ die(_("bad v2 inode size"));
#endif
while (argc-- > 1) {
argv++;
@@ -1272,11 +1286,11 @@ int main(int argc, char ** argv)
check_mount(); /* trying to check a mounted filesystem? */
if (repair && !automatic) {
if (!isatty(0) || !isatty(1))
- die("need terminal for interactive repairs");
+ die(_("need terminal for interactive repairs"));
}
IN = open(device_name,repair?O_RDWR:O_RDONLY);
if (IN < 0)
- die("unable to open '%s'");
+ die(_("unable to open '%s'"));
for (count=0 ; count<3 ; count++)
sync();
read_superblock();
@@ -1287,8 +1301,6 @@ int main(int argc, char ** argv)
* flags and whether or not the -f switch was specified on the
* command line.
*/
- printf("%s, %s / %s\n", program_name, program_version,
- util_linux_version);
if ( !(Super.s_state & MINIX_ERROR_FS) &&
(Super.s_state & MINIX_VALID_FS) &&
!force ) {
diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8
new file mode 100644
index 000000000..4da40e206
--- /dev/null
+++ b/disk-utils/mkfs.bfs.8
@@ -0,0 +1,48 @@
+.\" Copyright 1999 Andries E. Brouwer (aeb@cwi.nl)
+.\" May be freely distributed.
+.TH MKFS.BFS 8 "12 Sept 1999" "Util-linux 2.9x" "Linux System Administrator's Manual"
+.SH NAME
+mkfs.bfs \- make an SCO bfs filesystem
+.SH SYNOPSIS
+.BR "mkfs.bfs [ \-N"
+nr-of-inodes
+.B ] [ \-V
+volume-name
+.B ] [ \-F
+fsname
+.B ]
+device
+.B [
+size-in-blocks
+.B ]
+.SH DESCRIPTION
+.B mkfs.bfs
+creates an SCO bfs file-system on a block device
+(usually a disk partition or a file accessed via the loop device).
+
+The
+.I size-in-blocks
+parameter is the desired size of the file system, in blocks.
+If nothing is specified, the entire partition will be used.
+
+.SH OPTIONS
+.TP
+.B \-N
+Specify the desired number of inodes (at most 512).
+If nothing is specified some default number in the range 48-512 is picked
+depending on the size of the partition.
+.TP
+.BI \-V " volume-label"
+Specify the volume label. I have no idea if/where this is used.
+.TP
+.BI \-F " fsname"
+Specify the fsname. I have no idea if/where this is used.
+.TP
+.B \-v
+Be verbose.
+.SH "EXIT CODES"
+The exit code returned by
+.B mkfs.bfs
+is 0 when all went well, and 1 when something went wrong.
+.SH "SEE ALSO"
+.BR mkfs (8).
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
new file mode 100644
index 000000000..93cf1e60a
--- /dev/null
+++ b/disk-utils/mkfs.bfs.c
@@ -0,0 +1,284 @@
+/*
+ * mkfs.bfs - Create SCO BFS filesystem - aeb, 1999-09-07
+ *
+ * Usage: mkfs.bfs [-N nr-of-inodes] [-V volume-name] [-F fsname] device
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+
+#include <linux/fs.h> /* for BLKGETSIZE */
+
+#include "../defines.h" /* for util_linux_version */
+
+#define BFS_ROOT_INO 2
+#define BFS_NAMELEN 14
+#define BFS_BLOCKSIZE 512
+#define BFS_SUPER_MAGIC 0x1badface
+
+/* superblock - 512 bytes */
+struct bfssb {
+ unsigned int s_magic;
+ unsigned int s_start; /* byte offset of start of data */
+ unsigned int s_end; /* sizeof(slice)-1 */
+
+ /* for recovery during compaction */
+ int s_from, s_to; /* src and dest block of current transfer */
+ int s_backup_from, s_backup_to;
+
+ /* labels - may well contain garbage */
+ char s_fsname[6];
+ char s_volume[6];
+ char s_pad[472];
+};
+
+/* inode - 64 bytes */
+struct bfsi {
+ unsigned short i_ino;
+ unsigned char i_pad1[2];
+ unsigned long i_first_block;
+ unsigned long i_last_block;
+ unsigned long i_bytes_to_end;
+ unsigned long i_type; /* 1: file, 2: the unique dir */
+ unsigned long i_mode;
+ unsigned long i_uid, i_gid;
+ unsigned long i_nlinks;
+ unsigned long i_atime, i_mtime, i_ctime;
+ unsigned char i_pad2[16];
+};
+
+#define BFS_DIR_TYPE 2
+
+/* directory entry - 16 bytes */
+struct bfsde {
+ unsigned short d_ino;
+ char d_name[BFS_NAMELEN];
+};
+
+
+static char *progname;
+
+static void
+fatal(char *s, ...) {
+ va_list p;
+
+ va_start(p, s);
+ fflush(stdout);
+ fprintf(stderr, "\n%s: ", progname);
+ vfprintf(stderr, s, p);
+ va_end(p);
+ fprintf(stderr, "\n");
+ exit(1);
+}
+
+static void
+usage(void) {
+ fprintf(stderr,
+ "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
+ " [-F fsname] device [block-count]\n",
+ progname);
+ exit(1);
+}
+
+int
+main(int argc, char *argv[]) {
+ char *device, *volume, *fsname;
+ int inodes;
+ unsigned long total_blocks, ino_bytes, ino_blocks, data_blocks;
+ unsigned long user_specified_total_blocks = 0;
+ int verbose = 0;
+ int fd;
+ struct bfssb sb;
+ struct bfsi ri;
+ struct bfsde de;
+ struct stat statbuf;
+ time_t now;
+ int c, i, len;
+ char *p;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+
+ if (argc < 2)
+ usage();
+
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf("%s from %s\n", progname, util_linux_version);
+ exit(0);
+ }
+
+ volume = fsname = " "; /* is there a default? */
+ inodes = 0;
+
+ while (EOF != (c = getopt(argc, argv, "vF:N:V:cl:"))) {
+ switch (c) {
+ case 'N':
+ inodes = atol(optarg);
+ break;
+
+ case 'V':
+ len = strlen(optarg);
+ if (len <= 0 || len > 6)
+ fatal("volume name too long");
+ volume = strdup(optarg);
+ break;
+
+ case 'F':
+ len = strlen(optarg);
+ if (len <= 0 || len > 6)
+ fatal("fsname name too long");
+ fsname = strdup(optarg);
+ break;
+
+ case 'v':
+ verbose = 1;
+ break;
+
+ /* when called via mkfs we may get options c,l,v */
+ case 'c':
+ case 'l':
+ break;
+
+ default:
+ usage();
+ }
+ }
+
+ if (optind == argc)
+ usage();
+
+ device = argv[optind++];
+
+ if (stat(device, &statbuf) == -1) {
+ perror(device);
+ fatal("cannot stat device %s", device);
+ }
+
+ if (!S_ISBLK(statbuf.st_mode))
+ fatal("%s is not a block special device", device);
+
+ fd = open(device, O_RDWR);
+ if (fd == -1) {
+ perror(device);
+ fatal("cannot open %s", device);
+ }
+
+ if (optind == argc-1)
+ user_specified_total_blocks = atoi(argv[optind]);
+ else if (optind != argc)
+ usage();
+
+ if (ioctl(fd, BLKGETSIZE, &total_blocks) == -1) {
+ if (!user_specified_total_blocks) {
+ perror("BLKGETSIZE");
+ fatal("cannot get size of %s", device);
+ }
+ total_blocks = user_specified_total_blocks;
+ } else if (user_specified_total_blocks) {
+ if (user_specified_total_blocks > total_blocks)
+ fatal("blocks argument too large, max is %d",
+ total_blocks);
+ total_blocks = user_specified_total_blocks;
+ }
+
+ if (!inodes) {
+ /* pick some reasonable default */
+ inodes = 8*(total_blocks/800);
+ if (inodes < 48)
+ inodes = 48;
+ if (inodes > 512)
+ inodes = 512;
+ } else {
+ /* believe the user */
+ if (inodes > 512)
+ fatal("too many inodes - max is 512");
+ }
+
+ ino_bytes = inodes * sizeof(struct bfsi);
+ ino_blocks = (ino_bytes + BFS_BLOCKSIZE - 1) / BFS_BLOCKSIZE;
+ data_blocks = total_blocks - ino_blocks - 1;
+
+ /* mimic the behaviour of SCO's mkfs - maybe this limit is needed */
+ if (data_blocks < 32)
+ fatal("not enough space, need at least %d blocks",
+ ino_blocks + 33);
+
+ memset(&sb, 0, sizeof(sb));
+ sb.s_magic = BFS_SUPER_MAGIC;
+ sb.s_start = ino_bytes + sizeof(struct bfssb);
+ sb.s_end = total_blocks * BFS_BLOCKSIZE - 1;
+ sb.s_from = sb.s_to = sb.s_backup_from = sb.s_backup_to = -1;
+ memcpy(sb.s_fsname, fsname, 6);
+ memcpy(sb.s_volume, volume, 6);
+
+ if (verbose) {
+ fprintf(stderr, "Device: %s\n", device);
+ fprintf(stderr, "Volume: <%-6s>\n", volume);
+ fprintf(stderr, "FSname: <%-6s>\n", fsname);
+ fprintf(stderr, "BlockSize: %d\n", BFS_BLOCKSIZE);
+ fprintf(stderr, "Inodes: %d (in %ld block%s)\n",
+ inodes, ino_blocks, (ino_blocks==1) ? "" : "s");
+ fprintf(stderr, "Blocks: %ld\n", total_blocks);
+ fprintf(stderr, "Inode end: %d, Data end: %d\n",
+ sb.s_start-1, sb.s_end);
+ }
+
+ if (write(fd, &sb, sizeof(sb)) != sizeof(sb))
+ fatal("error writing superblock");
+
+ memset(&ri, 0, sizeof(ri));
+ ri.i_ino = BFS_ROOT_INO;
+ ri.i_first_block = 1 + ino_blocks;
+ ri.i_last_block = ri.i_first_block +
+ (inodes * sizeof(de) - 1) / BFS_BLOCKSIZE;
+ ri.i_bytes_to_end = ri.i_first_block * BFS_BLOCKSIZE
+ + 2 * sizeof(struct bfsde) - 1;
+ ri.i_type = BFS_DIR_TYPE;
+ ri.i_mode = S_IFDIR | 0755; /* or just 0755 */
+ ri.i_uid = 0;
+ ri.i_gid = 1; /* random */
+ ri.i_nlinks = 2;
+ time(&now);
+ ri.i_atime = now;
+ ri.i_mtime = now;
+ ri.i_ctime = now;
+
+ if (write(fd, &ri, sizeof(ri)) != sizeof(ri))
+ fatal("error writing root inode");
+
+ memset(&ri, 0, sizeof(ri));
+ for (i=1; i<inodes; i++)
+ if (write(fd, &ri, sizeof(ri)) != sizeof(ri))
+ fatal("error writing inode");
+
+ if (lseek(fd, (1 + ino_blocks)*BFS_BLOCKSIZE, SEEK_SET) == -1)
+ fatal("seek error");
+
+ memset(&de, 0, sizeof(de));
+ de.d_ino = BFS_ROOT_INO;
+ memcpy(de.d_name, ".", 1);
+ if (write(fd, &de, sizeof(de)) != sizeof(de))
+ fatal("error writing . entry");
+
+ memcpy(de.d_name, "..", 2);
+ if (write(fd, &de, sizeof(de)) != sizeof(de))
+ fatal("error writing .. entry");
+
+ if (close(fd) == -1) {
+ perror(device);
+ fatal("error closing %s", device);
+ }
+
+ return 0;
+}
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 9ea27a504..5ca2704c5 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -24,7 +24,6 @@
#include <limits.h>
#include "nls.h"
-#include "../version.h"
#define VERSION UTIL_LINUX_VERSION
#ifndef DEFAULT_FSTYPE
@@ -41,11 +40,22 @@ int main(int argc, char *argv[])
char *fstype = NULL;
int i, more = 0, verbose = 0;
char *oldpath, *newpath;
+ char *program_name, *p;
+
+ program_name = argv[0];
+ if ((p = strrchr(program_name, '/')) != NULL)
+ program_name = p+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), program_name, util_linux_version);
+ exit(0);
+ }
+
/* Check commandline options. */
opterr = 0;
while ((more == 0) && ((i = getopt(argc, argv, "Vt:")) != EOF))
@@ -86,7 +96,7 @@ int main(int argc, char *argv[])
argv[--optind] = progname;
if (verbose) {
- puts(_("mkfs version " VERSION " (" __DATE__ ")"));
+ printf(_("mkfs version %s (%s)\n"), VERSION, __DATE__);
i = optind;
while (argv[i])
printf("%s ", argv[i++]);
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 6a9c7931c..2325805a2 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -1,11 +1,10 @@
.\" Copyright 1992, 1993, 1994 Rickard E. Faith (faith@cs.unc.edu)
.\" May be freely distributed.
-.\" " for emacs hilit19 mode
-.TH MKFS 8 "2 July 1996" "Util-linux 2.6" "Linux System Administrator's Manual"
+.TH MKFS.MINIX 8 "2 July 1996" "Util-linux 2.6" "Linux System Administrator's Manual"
.SH NAME
-mkfs \- make a Linux MINIX filesystem
+mkfs.minix \- make a Linux MINIX filesystem
.SH SYNOPSIS
-.BR "mkfs [ \-c | \-l filename ] [ \-n"
+.BR "mkfs.minix [ \-c | \-l filename ] [ \-n"
namelength
.B ] [ \-i
inodecount
@@ -15,7 +14,7 @@ device
size-in-blocks
.B ]
.SH DESCRIPTION
-.B mkfs
+.B mkfs.minix
creates a Linux MINIX file-system on a device (usually a disk partition).
The
@@ -33,14 +32,11 @@ is usually of the following form:
The
.I size-in-blocks
-parameter is the desired size of the file system, in blocks. This
-information can be determined from the
-.BR fdisk (8)
-or
-.BR cfdisk (8)
-program. If omitted it will be determined automaticaly. Only block
-counts strictly greater than 10 and strictly less than 65536 are
-allowed.
+parameter is the desired size of the file system, in blocks.
+It is present only for backwards compatibility.
+If omitted the size will be determined automatically.
+Only block counts strictly greater than 10 and strictly less than
+65536 are allowed.
.SH OPTIONS
.TP
.B \-c
@@ -50,7 +46,7 @@ are found, the count is printed.
.BI \-n " namelength"
Specify the maximum length of filenames.
Currently, the only allowable values are 14 and 30.
-.B 30 is the default.
+The default is 30.
.TP
.BI \-i " inodecount"
Specify the number of inodes for the filesystem.
@@ -76,24 +72,4 @@ Usage or syntax error
.SH "SEE ALSO"
.BR mkfs (8),
.BR fsck (8),
-.BR mke2fs (8),
-.BR e2fsck (8),
.BR reboot (8)
-.\" .SH AUTHORS
-.\" Linus Torvalds (torvalds@cs.helsinki.fi).
-.\" .br
-.\" Error code values by Rik Faith (faith@cs.unc.edu)
-.\" .br
-.\" Inode request feature by Scott Heavner (sdh@po.cwru.edu)
-.\" .br
-.\" Support for the file system valid flag by Dr. Wettstein
-.\" (greg%wind.uucp@plains.nodak.edu)
-.\" .br
-.\" Check to prevent mkfs of mounted filesystem and boot sector clearing
-.\" by Daniel Quinlan (quinlan@yggdrasil.com)
-.\" .br
-.\" Minix v2 support by Andreas Schwab
-.\" (schwab@issan.informatik.uni-dortmund.de), updated by Nicolai
-.\" Langfeldt (janl@math.uio.no)
-.\" .br
-.\" Portability patch by Russell King.
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index b05960b23..4887f05d1 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -76,7 +76,6 @@
#include <linux/minix_fs.h>
#include "nls.h"
-#include "../version.h"
#ifdef MINIX2_SUPER_MAGIC2
#define HAVE_MINIX2 1
@@ -489,6 +488,7 @@ void setup_tables(void)
ZONESIZE = 0;
MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024;
ZONES = BLOCKS;
+
/* some magic nrs: 1 inode / 3 blocks */
if ( req_nr_inodes == 0 )
inodes = BLOCKS/3;
@@ -507,9 +507,13 @@ void setup_tables(void)
inodes = 65535;
INODES = inodes;
IMAPS = UPPER(INODES + 1,BITS_PER_BLOCK);
- ZMAPS = 0;
- while (ZMAPS != UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK))
- ZMAPS = UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK);
+ ZMAPS = UPPER(BLOCKS - (1+IMAPS+INODE_BLOCKS), BITS_PER_BLOCK+1);
+ /* The old code here
+ * ZMAPS = 0;
+ * while (ZMAPS != UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK))
+ * ZMAPS = UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK);
+ * was no good, since it may loop. - aeb
+ */
FIRSTZONE = NORM_FIRSTZONE;
inode_map = malloc(IMAPS * BLOCK_SIZE);
zone_map = malloc(ZMAPS * BLOCK_SIZE);
@@ -630,9 +634,23 @@ int main(int argc, char ** argv)
char * tmp;
struct stat statbuf;
char * listfile = NULL;
+ char * p;
if (argc && *argv)
program_name = *argv;
+ if ((p = strrchr(program_name, '/')) != NULL)
+ program_name = p+1;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), program_name, util_linux_version);
+ exit(0);
+ }
+
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
die(_("bad inode size"));
#ifdef HAVE_MINIX2
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index c16a89380..368ef3b5c 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -7,7 +7,7 @@
.SH NAME
mkswap \- set up a Linux swap area
.SH SYNOPSIS
-.BI "mkswap [\-c] [\-v" N "] [\-f] " device " [" size "]"
+.BI "mkswap [\-c] [\-v" N "] [\-f] [\-p " PSZ "] "device " [" size "]"
.SH DESCRIPTION
.B mkswap
sets up a Linux swap area on a device or in a file.
@@ -30,6 +30,8 @@ but can also be a file.
The Linux kernel does not look at partition Id's, but
many installation scripts will assume that partitions
of hex type 82 (LINUX_SWAP) are meant to be swap partitions.
+(Warning: Solaris also uses this type. Be careful not to kill
+your Solaris partitions.)
The
.I size
@@ -39,6 +41,18 @@ parameter is superfluous but retained for backwards compatibility.
will use the entire partition or file if it is omitted.
Specifying it is unwise - a typo may destroy your disk.)
+The
+.I PSZ
+parameter specifies the page size to use. It is almost always
+unnecessary (even unwise) to specify it, but certain old libc
+versions lie about the page size, so it is possible that
+.B mkswap
+gets it wrong. The symptom is that a subsequent
+.B swapon
+fails because no swap signature is found. Typical values for
+.I PSZ
+are 4096 or 8192.
+
Linux knows about two styles of swap areas, old style and new style.
The last 10 bytes of the first page of the swap area distinguishes
them: old style has `SWAP_SPACE', new style has `SWAPSPACE2' as
@@ -51,9 +65,9 @@ Also, the last 10 bytes hold the signature. So, if the page
size is S, an old style swap area can describe at most
8*(S-10)-1 pages used for swapping.
With S=4096 (as on i386), the useful area is at most 133890048 bytes
-(almost 128 MB if you believe in 1 MB=2^20 bytes), and the rest is wasted.
+(almost 128 MiB), and the rest is wasted.
On an alpha and sparc64, with S=8192, the useful area is at most
-535560992 bytes (almost 512 MB with the same proviso).
+535560992 bytes (almost 512 MiB).
The old setup wastes most of this bitmap page, because zero bits
denote bad blocks or blocks past the end of the swap space,
@@ -63,12 +77,12 @@ to use a swap space with hundreds of bad blocks. (I would not even
use a swap space with 1 bad block.)
In the new style swap area this is precisely what is done.
The maximum useful size of a swap area now depends on the architecture.
-It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips,
-128GB on alpha and 3TB on sparc64.
+It is roughly 2GiB on i386, PPC, m68k, ARM, 1GiB on sparc, 512MiB on mips,
+128GiB on alpha and 3TiB on sparc64.
Note that before 2.1.117 the kernel allocated one byte for each page,
-while it now allocates two bytes, so that taking a swap area of 2 GB
-in use might require 2 MB of kernel memory.
+while it now allocates two bytes, so that taking a swap area of 2 GiB
+in use might require 2 MiB of kernel memory.
Presently, Linux allows 8 swap areas. The areas in use can be seen
in the file
@@ -114,6 +128,9 @@ Without this option
will refuse to create a v0 swap on a device with a valid SPARC superblock,
as that probably means one is going to erase the partition table.
.TP
+.BI "\-p " PSZ
+Specify the page size to use.
+.TP
.B \-v0
Create an old style swap area.
.TP
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index ef5f58c11..2803587b7 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -77,9 +77,20 @@ linux_version_code(void) {
/*
* The definition of the union swap_header uses the constant PAGE_SIZE.
* Unfortunately, on some architectures this depends on the hardware model,
- * and can only be found at run time -- we use getpagesize().
+ * and can only be found at run time -- we use getpagesize(), so that
+ * we do not need separate binaries e.g. for sun4, sun4c/d/m and sun4u.
+ *
+ * Even more unfortunately, getpagesize() does not always return
+ * the right information. For example, libc4 and libc5 do not use
+ * the system call but invent a value themselves
+ * (EXEC_PAGESIZE or NBPG * CLSIZE or NBPC), and thus it may happen
+ * that e.g. on a sparc PAGE_SIZE=4096 and getpagesize() returns 8192.
+ * What to do? Let us allow the user to specify the pagesize explicitly.
*/
+static int user_pagesize = 0;
+static int kernel_pagesize; /* obtained via getpagesize(); */
+static int defined_pagesize = 0; /* PAGE_SIZE, when that exists */
static int pagesize;
static int *signature_page;
@@ -94,12 +105,31 @@ struct swap_header_v1 {
static void
init_signature_page() {
- pagesize = getpagesize();
-
#ifdef PAGE_SIZE
- if (pagesize != PAGE_SIZE)
- fprintf(stderr, _("Assuming pages of size %d\n"), pagesize);
+ defined_pagesize = PAGE_SIZE;
#endif
+ kernel_pagesize = getpagesize();
+ pagesize = kernel_pagesize;
+
+ if (user_pagesize) {
+ if ((user_pagesize & (user_pagesize-1)) ||
+ user_pagesize < 1024) {
+ fprintf(stderr, _("Bad user-specified page size %d\n"),
+ user_pagesize);
+ exit(1);
+ }
+ pagesize = user_pagesize;
+ }
+
+ if (user_pagesize && user_pagesize != kernel_pagesize &&
+ user_pagesize != defined_pagesize)
+ fprintf(stderr, _("Using user-specified page size %d, "
+ "instead of the system values %d/%d\n"),
+ pagesize, kernel_pagesize, defined_pagesize);
+ else if (defined_pagesize && pagesize != defined_pagesize)
+ fprintf(stderr, _("Assuming pages of size %d (not %d)\n"),
+ pagesize, defined_pagesize);
+
signature_page = (int *) malloc(pagesize);
memset(signature_page,0,pagesize);
p = (struct swap_header_v1 *) signature_page;
@@ -158,8 +188,8 @@ It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips,
#define MAX_BADPAGES ((pagesize-1024-128*sizeof(int)-10)/sizeof(int))
-static void bit_set (unsigned int *addr, unsigned int nr)
-{
+static void
+bit_set (unsigned int *addr, unsigned int nr) {
unsigned int r, m;
addr += nr / (8 * sizeof(int));
@@ -168,8 +198,8 @@ static void bit_set (unsigned int *addr, unsigned int nr)
*addr = r | m;
}
-static int bit_test_and_clear (unsigned int *addr, unsigned int nr)
-{
+static int
+bit_test_and_clear (unsigned int *addr, unsigned int nr) {
unsigned int r, m;
addr += nr / (8 * sizeof(int));
@@ -179,14 +209,19 @@ static int bit_test_and_clear (unsigned int *addr, unsigned int nr)
return (r & m) != 0;
}
-void fatal_error(const char * fmt_string)
-{
- fprintf(stderr,fmt_string,program_name,device_name);
+void
+usage(void) {
+ fprintf(stderr,
+ _("Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"),
+ program_name);
exit(1);
}
-#define usage() fatal_error(_("Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"))
-#define die(str) fatal_error(_("%s: " str "\n"))
+void
+die(const char *str) {
+ fprintf(stderr, "%s: %s\n", program_name, str);
+ exit(1);
+}
void
page_ok(int page) {
@@ -200,7 +235,7 @@ page_bad(int page) {
bit_test_and_clear(signature_page, page);
else {
if (badpages == MAX_BADPAGES)
- die("too many bad pages");
+ die(_("too many bad pages"));
p->badpages[badpages] = page;
}
badpages++;
@@ -214,7 +249,7 @@ check_blocks(void) {
buffer = malloc(pagesize);
if (!buffer)
- die("Out of memory");
+ die(_("Out of memory"));
current_page = 0;
while (current_page < PAGES) {
if (!check) {
@@ -223,7 +258,7 @@ check_blocks(void) {
}
if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) !=
current_page*pagesize)
- die("seek failed in check_blocks");
+ die(_("seek failed in check_blocks"));
if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) {
page_bad(current_page++);
continue;
@@ -236,8 +271,8 @@ check_blocks(void) {
printf(_("%d bad pages\n"), badpages);
}
-static long valid_offset (int fd, int offset)
-{
+static long
+valid_offset (int fd, int offset) {
char ch;
if (lseek (fd, offset, 0) < 0)
@@ -248,8 +283,7 @@ static long valid_offset (int fd, int offset)
}
static int
-find_size (int fd)
-{
+find_size (int fd) {
unsigned int high, low;
low = 0;
@@ -269,8 +303,7 @@ find_size (int fd)
/* return size in pages, to avoid integer overflow */
static long
-get_size(const char *file)
-{
+get_size(const char *file) {
int fd;
long size;
@@ -289,58 +322,85 @@ get_size(const char *file)
return size;
}
-int main(int argc, char ** argv)
-{
- char * tmp;
+int
+isnzdigit(char c) {
+ return (c >= '1' && c <= '9');
+}
+
+int
+main(int argc, char ** argv) {
struct stat statbuf;
- int sz;
+ int i, sz;
int maxpages;
int goodpages;
int offset;
int force = 0;
+ char *block_count = 0;
+ char *pp;
+
+ program_name = (argc && *argv) ? argv[0] : "fsck.minix";
+ if ((pp = strrchr(program_name, '/')) != NULL)
+ program_name = pp+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
-
-
- if (argc && *argv)
- program_name = *argv;
- init_signature_page(); /* get pagesize */
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), program_name, util_linux_version);
+ exit(0);
+ }
- while (argc-- > 1) {
- argv++;
- if (argv[0][0] != '-') {
- if (device_name) {
- int blocks_per_page = pagesize/1024;
- PAGES = strtol(argv[0],&tmp,0)/blocks_per_page;
- if (*tmp)
- usage();
- } else
- device_name = argv[0];
- } else {
- switch (argv[0][1]) {
+ for (i=1; i<argc; i++) {
+ if (argv[i][0] == '-') {
+ switch (argv[i][1]) {
case 'c':
check=1;
break;
case 'f':
force=1;
break;
+ case 'p':
+ pp = argv[i]+2;
+ if (!*pp && i+1 < argc)
+ pp = argv[++i];
+ if (isnzdigit(*pp))
+ user_pagesize=atoi(pp);
+ else
+ usage();
+ break;
case 'v':
- version=atoi(argv[0]+2);
+ version = atoi(argv[0]+2);
break;
default:
usage();
}
- }
+ } else if (!device_name) {
+ device_name = argv[i];
+ } else if (!block_count) {
+ block_count = argv[i];
+ } else
+ usage();
}
+
+ init_signature_page(); /* get pagesize */
+
if (!device_name) {
fprintf(stderr,
_("%s: error: Nowhere to set up swap on?\n"),
program_name);
usage();
}
+ if (block_count) {
+ /* this silly user specified the number of blocks
+ explicitly */
+ char *tmp;
+ int blocks_per_page = pagesize/1024;
+ PAGES = strtol(block_count,&tmp,0)/blocks_per_page;
+ if (*tmp)
+ usage();
+ }
sz = get_size(device_name);
if (!PAGES) {
PAGES = sz;
@@ -401,7 +461,7 @@ int main(int argc, char ** argv)
if (!S_ISBLK(statbuf.st_mode))
check=0;
else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
- die("Will not try to make swapdevice on '%s'");
+ die(_("Will not try to make swapdevice on '%s'"));
#ifdef __sparc__
if (!force && version == 0) {
@@ -410,7 +470,7 @@ int main(int argc, char ** argv)
unsigned short *q, sum;
if (read(DEV, buffer, 512) != 512)
- die("fatal: first page unreadable");
+ die(_("fatal: first page unreadable"));
if (buffer[508] == 0xDA && buffer[509] == 0xBE) {
q = (unsigned short *)(buffer + 510);
for (sum = 0; q >= (unsigned short *) buffer;)
@@ -431,7 +491,7 @@ the -f option to force it.\n"),
if (version == 0 || check)
check_blocks();
if (version == 0 && !bit_test_and_clear(signature_page,0))
- die("fatal: first page unreadable");
+ die(_("fatal: first page unreadable"));
if (version == 1) {
p->version = version;
p->last_page = PAGES-1;
@@ -440,23 +500,23 @@ the -f option to force it.\n"),
goodpages = PAGES - badpages - 1;
if (goodpages <= 0)
- die("Unable to set up swap-space: unreadable");
+ die(_("Unable to set up swap-space: unreadable"));
printf(_("Setting up swapspace version %d, size = %ld bytes\n"),
version, (long)(goodpages*pagesize));
write_signature((version == 0) ? "SWAP-SPACE" : "SWAPSPACE2");
offset = ((version == 0) ? 0 : 1024);
if (lseek(DEV, offset, SEEK_SET) != offset)
- die("unable to rewind swap-device");
+ die(_("unable to rewind swap-device"));
if (write(DEV,(char*)signature_page+offset, pagesize-offset)
!= pagesize-offset)
- die("unable to write signature page");
+ die(_("unable to write signature page"));
/*
* A subsequent swapon() will fail if the signature
* is not actually on disk. (This is a kernel bug.)
*/
if (fsync(DEV))
- die("fsync failed");
+ die(_("fsync failed"));
return 0;
}
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
new file mode 100644
index 000000000..cb8021668
--- /dev/null
+++ b/disk-utils/raw.8
@@ -0,0 +1,87 @@
+.\" -*- nroff -*-
+.TH RAW 8 "Aug 1999" "Version 0.1"
+.SH NAME
+raw \- bind a Linux raw character device
+.SH SYNOPSIS
+.B raw
+.I /dev/raw<N> <major> <minor>
+.PP
+.B raw
+.I /dev/raw<N> /dev/<blockdev>
+.PP
+.B raw
+.B \-q
+.I /dev/raw<N>
+.PP
+.B raw
+.B \-qa
+.SH DESCRIPTION
+.B raw
+is used to bind a Linux raw character device to a block device. Any
+block device may be used: at the time of binding, the device driver does
+not even have to be accessible (it may be loaded on demand as a kernel
+module later).
+.PP
+.B raw
+is used in two modes: it either sets raw device bindings, or it queries
+existing bindings. When setting a raw device,
+.I /dev/raw<N>
+is the device name of an existing raw device node in the filesystem.
+The block device to which it is to be bound can be specified either in
+terms of its
+.I major
+and
+.I minor
+device numbers, or as a path name
+.I /dev/<blockdev>
+to an existing block device file.
+.PP
+The bindings already in existence can be queried with the
+.I \-q
+option, with is used either with a raw device filename to query that one
+device, or with the
+.I \-a
+option to query all bound raw devices.
+.PP
+Once bound to a block device, a raw device can be opened, read and
+written, just like the block device it is bound to. However, the raw
+device does not behave exactly like the block device. In particular,
+access to the raw device bypasses the kernel's block buffer cache
+entirely: all I/O is done directly to and from the address space of the
+process performing the I/O. If the underlying block device driver can
+support DMA, then no data copying at all is required to complete the
+I/O.
+.PP
+Because raw I/O involves direct hardware access to a process's memory, a
+few extra restrictions must be observed. All I/Os must be correctly
+aligned in memory and on disk: they must start at a sector offset on
+disk, they must be an exact number of sectors long, and the data buffer
+in virtual memory must also be aligned to a multiple of the sector
+size. The sector size is 512 bytes for most devices.
+.SH OPTIONS
+.TP
+.B -q
+Set query mode.
+.B raw
+will query an existing binding instead of setting a new one.
+.TP
+.B -a
+With
+.B -q
+, specifies that all bound raw devices should be queried.
+.TP
+.B -h
+provides a usage summary.
+.SH BUGS
+The Linux
+.B dd
+(1) command does not currently align its buffers correctly, and so
+cannot be used on raw devices.
+.PP
+Raw I/O devices do not maintain cache coherency with the Linux block
+device buffer cache. If you use raw I/O to overwrite data already in
+the buffer cache, the buffer cache will no longer correspond to the
+contents of the actual storage device underneath. This is deliberate,
+but is regarded either a bug or a feature depending on who you ask!
+.SH AUTHOR
+Stephen Tweedie (sct@redhat.com)
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
new file mode 100644
index 000000000..5fb95348a
--- /dev/null
+++ b/disk-utils/raw.c
@@ -0,0 +1,217 @@
+/*
+ * raw.c: User mode tool to bind and query raw character devices.
+ *
+ * Stephen Tweedie, 1999
+ *
+ * This file may be redistributed under the terms of the GNU General
+ * Public License, version 2.
+ *
+ * Copyright Red Hat Software, 1999
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/sysmacros.h>
+#include <sys/raw.h>
+
+
+
+char * progname;
+int do_query = 0;
+int do_query_all = 0;
+
+int master_fd;
+int raw_minor;
+
+void open_raw_ctl(void);
+int query(int minor, int quiet);
+int bind (int minor, int block_major, int block_minor);
+
+
+static void usage(int err)
+{
+ fprintf(stderr,
+ "Usage:\n"
+ " %s /dev/rawN <major> <minor>\n"
+ " %s /dev/rawN /dev/<blockdev>\n"
+ " %s -q /dev/rawN\n"
+ " %s -qa\n",
+ progname, progname, progname, progname);
+ exit(err);
+}
+
+
+int main(int argc, char *argv[])
+{
+ char c;
+ char * raw_name;
+ char * block_name;
+ int err;
+ int block_major, block_minor;
+ int i;
+
+ struct stat statbuf;
+
+ progname = argv[0];
+
+ while ((c = getopt(argc, argv, "ahq")) != EOF) {
+ switch (c) {
+ case 'a':
+ do_query_all = 1;
+ break;
+ case 'h':
+ usage(0);
+ case 'q':
+ do_query = 1;
+ break;
+ default:
+ usage(1);
+ }
+ }
+
+ /*
+ * Check for, and open, the master raw device, /dev/raw
+ */
+
+ open_raw_ctl();
+
+ if (do_query_all) {
+ if (optind < argc)
+ usage(1);
+ for (i=1; i<255; i++)
+ query(i, 1);
+ exit(0);
+ }
+
+ /*
+ * It's a bind or a single query. Either way we need a raw device.
+ */
+
+ if (optind >= argc)
+ usage(1);
+ raw_name = argv[optind++];
+
+ err = stat(raw_name, &statbuf);
+ if (err) {
+ fprintf (stderr, "Cannot locate raw device '%s' (%s)\n",
+ raw_name, strerror(errno));
+ exit(2);
+ }
+
+ if (!S_ISCHR(statbuf.st_mode)) {
+ fprintf (stderr, "raw device '%s' is not a character dev\n",
+ raw_name);
+ exit(2);
+ }
+ if (major(statbuf.st_rdev) != RAW_MAJOR) {
+ fprintf (stderr, "Device '%s' is not a raw dev\n",
+ raw_name);
+ exit(2);
+ }
+
+ raw_minor = minor(statbuf.st_rdev);
+
+ if (do_query)
+ return query(raw_minor, 0);
+
+ /*
+ * It's not a query, so we still have some parsing to do. Have
+ * we been given a block device filename or a major/minor pair?
+ */
+
+ switch (argc - optind) {
+ case 1:
+ block_name = argv[optind];
+ err = stat(block_name, &statbuf);
+ if (err) {
+ fprintf (stderr,
+ "Cannot locate block device '%s' (%s)\n",
+ block_name, strerror(errno));
+ exit(2);
+ }
+
+ if (!S_ISBLK(statbuf.st_mode)) {
+ fprintf (stderr, "Device '%s' is not a block dev\n",
+ block_name);
+ exit(2);
+ }
+
+ block_major = major(statbuf.st_rdev);
+ block_minor = minor(statbuf.st_rdev);
+ break;
+
+ case 2:
+ block_major = strtol(argv[optind], 0, 0);
+ block_minor = strtol(argv[optind+1], 0, 0);
+ break;
+
+ default:
+ usage(1);
+ }
+
+ return bind(raw_minor, block_major, block_minor);
+ return 0;
+
+}
+
+
+void open_raw_ctl(void)
+{
+ master_fd = open("/dev/raw", O_RDWR, 0);
+ if (master_fd < 0) {
+ fprintf (stderr,
+ "Cannot open master raw device '/dev/raw' (%s)\n",
+ strerror(errno));
+ exit(2);
+ }
+}
+
+int query(int minor, int quiet)
+{
+ struct raw_config_request rq;
+ int err;
+
+ rq.raw_minor = minor;
+ err = ioctl(master_fd, RAW_GETBIND, &rq);
+ if (err < 0) {
+ if (quiet && errno == ENODEV)
+ return 3;
+ fprintf (stderr,
+ "Error querying raw device (%s)\n",
+ strerror(errno));
+ exit(3);
+ }
+ if (quiet && !rq.block_major && !rq.block_minor)
+ return 0;
+ printf ("/dev/raw%d: bound to major %d, minor %d\n",
+ minor, (int) rq.block_major, (int) rq.block_minor);
+ return 0;
+}
+
+int bind(int minor, int block_major, int block_minor)
+{
+ struct raw_config_request rq;
+ int err;
+
+ rq.raw_minor = minor;
+ rq.block_major = block_major;
+ rq.block_minor = block_minor;
+ err = ioctl(master_fd, RAW_SETBIND, &rq);
+ if (err < 0) {
+ fprintf (stderr,
+ "Error setting raw device (%s)\n",
+ strerror(errno));
+ exit(3);
+ }
+ printf ("/dev/raw%d: bound to major %d, minor %d\n",
+ raw_minor, (int) rq.block_major, (int) rq.block_minor);
+ return 0;
+}
+
diff --git a/disk-utils/setfdprm.c b/disk-utils/setfdprm.c
index 7c2b0dc36..73b3b7174 100644
--- a/disk-utils/setfdprm.c
+++ b/disk-utils/setfdprm.c
@@ -109,18 +109,27 @@ gap rate spec1 fmt_gap\n"),name);
}
int
-main(int argc,char **argv)
+main(int argc, char **argv)
{
int fd;
unsigned int cmd;
- char *name;
+ char *progname, *p;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- name = argv[0];
- if (argc < 3) usage(name);
+ if (argc == 2 &&
+ (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+ printf(_("%s from %s\n"), progname, util_linux_version);
+ exit(0);
+ }
+
+ if (argc < 3) usage(progname);
cmd = FDSETPRM;
if (*argv[1] == '-') {
switch (argv[1][1]) {
@@ -142,7 +151,7 @@ main(int argc,char **argv)
break;
#endif
default:
- usage(name);
+ usage(progname);
}
argc--;
argv++;
@@ -152,11 +161,11 @@ main(int argc,char **argv)
exit(1);
}
if (cmd != FDSETPRM && cmd != FDDEFPRM) {
- if (argc != 2) usage(name);
+ if (argc != 2) usage(progname);
cmd_without_param(cmd,fd);
}
if (argc != 11 && argc != 3)
- usage(name);
+ usage(progname);
else if (argc == 11)
set_params(cmd,fd,&argv[2]);
else
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 4fe759b68..4d0eb7ea4 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -69,7 +69,6 @@
#endif
#include <signal.h>
#include <math.h>
-#include <locale.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -89,7 +88,6 @@ typedef long ext2_loff_t;
extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset,
unsigned int origin);
-#include "../version.h"
#define VERSION UTIL_LINUX_VERSION
#define DEFAULT_DEVICE "/dev/hda"
@@ -1316,7 +1314,7 @@ void new_part(int i)
int num_sects = last - first + 1;
int len, ext, j;
char *errmsg;
-
+ double sectors_per_MB = K*K / 512.0;
if (p_info[i].num == PRI_OR_LOG) {
static struct MenuItem menuPartType[]=
@@ -1341,7 +1339,7 @@ void new_part(int i)
else
print_warning(_("!!! Internal error !!!"));
- sprintf(def, "%.2f", ceiling(num_sects/(K*0.02))/100);
+ sprintf(def, "%.2f", num_sects/sectors_per_MB);
mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Size (in MB): "));
if ((len = get_string(response, LINE_LENGTH, def)) <= 0 &&
len != GS_DEFAULT)
@@ -2367,8 +2365,13 @@ void draw_partition(int i)
}
if (p_info[i].id > 0) {
+ char *dbn = my_basename(disk_device);
+ int l = strlen(dbn);
+ int digit_last = isdigit(dbn[l-1]);
+
mvprintw(y, NAME_START,
- "%s%d", my_basename(disk_device), p_info[i].num+1);
+ "%s%s%d", dbn, (digit_last ? "p" : ""),
+ p_info[i].num+1);
if (p_info[i].flags) {
if (p_info[i].flags == ACTIVE_FLAG)
mvaddstr(y, FLAGS_START, _("Boot"));
diff --git a/fdisk/common.h b/fdisk/common.h
index d9fa4e8ec..a79d9acc3 100644
--- a/fdisk/common.h
+++ b/fdisk/common.h
@@ -6,3 +6,4 @@ struct systypes {
};
extern struct systypes i386_sys_types[];
+
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index e26baf1c5..2a8c85e8e 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -7,7 +7,7 @@ fdisk \- Partition table manipulator for Linux
.SH SYNOPSIS
.BI "fdisk [\-u] " device
.sp
-.BI "fdisk \-l [\-u] " "device ..."
+.BI "fdisk \-l [\-u] [" "device ..." ]
.sp
.BI "fdisk \-s " "partition ..."
.sp
@@ -175,11 +175,10 @@ Print version number of
program and exit.
.TP
.B \-l
-List the partition tables for
-.BR /dev/hd[a-d] ,
-.BR /dev/sd[a-h] ,
-.BR /dev/ed[a-d] ,
-and then exit.
+List the partition tables for the specified devices and then exit.
+If no devices are given, those mentioned in
+.I /proc/partitions
+(if that exists) are used.
.TP
.B \-u
When listing partition tables, give sizes in sectors instead
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 8270d344f..56caa9a17 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -94,7 +94,6 @@
#include <setjmp.h>
#include <errno.h>
#include <getopt.h>
-#include <locale.h>
#include "nls.h"
#include <sys/stat.h>
@@ -110,7 +109,6 @@
#include "fdisksgilabel.h"
#include "fdiskaixlabel.h"
-#include "../version.h"
#include "../defines.h"
#ifdef HAVE_blkpg_h
#include <linux/blkpg.h>
@@ -264,13 +262,6 @@ void fatal(enum failure why)
" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n"
" ...\n");
break;
- case no_device:
- message = _("A disk block device is needed.\n");
- break;
- case no_partition:
- message =_("Given name does not refer to a partition,\n"
- "or maybe not even to a block device.\n");
- break;
case unable_to_open:
sprintf(error, _("Unable to open %s\n"), disk_device);
break;
@@ -805,7 +796,7 @@ read_hex(struct systypes *sys)
}
/*
- * Print the message MESG, then read an integer between LOW and HIGH.
+ * Print the message MESG, then read an integer between LOW and HIGH (inclusive).
* If the user hits Enter, DFLT is returned.
* Answers like +10 are interpreted as offsets from BASE.
*
@@ -1243,10 +1234,10 @@ void x_list_table(int extend)
q = part_table;
printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"),
disk_device, heads, sectors, cylinders);
- printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"));
+ printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"));
for (i = 0 ; i < partitions; i++)
if ((p = q[i]) != NULL) {
- printf("%2d %02x%4d%4d%5d%4d%4d%5d%8d%8d %02x\n",
+ printf("%2d %02x%4d%4d%5d%4d%4d%5d%9d%9d %02x\n",
i + 1, p->boot_ind, p->head,
sector(p->sector),
cylinder(p->sector, p->cyl), p->end_head,
@@ -1370,7 +1361,7 @@ void verify(void)
void add_partition(int n, int sys)
{
- char mesg[48];
+ char mesg[256]; /* 48 does not suffice in Japanese */
int i, read = 0;
struct partition *p = part_table[n], *q = part_table[ext_index];
uint start, stop = 0, limit, temp,
@@ -1563,7 +1554,7 @@ void new_partition(void)
void write_table(void)
{
- int i, error = 0;
+ int i;
changed[3] = changed[0] || changed[1] || changed[2] || changed[3];
if (!sun_label && !sgi_label) {
@@ -1588,6 +1579,13 @@ void write_table(void)
}
printf(_("The partition table has been altered!\n\n"));
+ reread_partition_table(1);
+}
+
+void
+reread_partition_table(int leave) {
+ int error = 0;
+ int i;
printf(_("Calling ioctl() to re-read partition table.\n"));
sync();
@@ -1604,12 +1602,6 @@ void write_table(void)
error = errno;
}
- close(fd);
-
- printf(_("Syncing disks.\n"));
- sync();
- sleep(4); /* for sync() */
-
if (i < 0)
printf(_("Re-read table failed with error %d: %s.\nReboot your "
"system to ensure the partition table is updated.\n"),
@@ -1621,7 +1613,14 @@ void write_table(void)
"partitions, please see the fdisk manual page for additional\n"
"information.\n"));
- exit(0);
+ if (leave) {
+ close(fd);
+
+ printf(_("Syncing disks.\n"));
+ sync();
+ sleep(4); /* for sync() */
+ exit(!!i);
+ }
}
#define MAX_PER_LINE 16
@@ -1693,7 +1692,7 @@ void xselect(void)
move_begin(get_partition(0, partitions));
break;
case 'c':
- cylinders = read_int(1, cylinders, 65535,
+ cylinders = read_int(1, cylinders, 131071,
0, _("Number of cylinders"));
if (sun_label)
sun_set_ncyl(cylinders);
@@ -1826,6 +1825,32 @@ void try(char *device, int user_specified)
}
}
+/* for fdisk -l: try all things in /proc/partitions
+ that look like a partition name (do not end in a digit) */
+void
+tryprocpt() {
+ FILE *procpt;
+ char line[100], ptname[100], devname[120], *s;
+ int ma, mi, sz;
+
+ procpt = fopen(PROC_PARTITIONS, "r");
+ if (procpt == NULL) {
+ fprintf(stderr, _("cannot open %s\n"), PROC_PARTITIONS);
+ return;
+ }
+
+ while (fgets(line, sizeof(line), procpt)) {
+ if (sscanf (line, " %d %d %d %[^\n]\n",
+ &ma, &mi, &sz, ptname) != 4)
+ continue;
+ for(s = ptname; *s; s++);
+ if (isdigit(s[-1]))
+ continue;
+ sprintf(devname, "/dev/%s", ptname);
+ try(devname, 1);
+ }
+}
+
int
dir_exists(char *dirname) {
struct stat statbuf;
@@ -1837,8 +1862,7 @@ void
dummy(int *kk) {}
int
-main(int argc, char **argv)
-{
+main(int argc, char **argv) {
int j, c;
int optl = 0, opts = 0;
int user_set_sector_size = 0;
@@ -1892,7 +1916,6 @@ main(int argc, char **argv)
#endif
if (optl) {
- listing = 1;
nowarn = 1;
type_open = O_RDONLY;
if (argc > optind) {
@@ -1900,11 +1923,13 @@ main(int argc, char **argv)
/* avoid gcc warning:
variable `k' might be clobbered by `longjmp' */
dummy(&k);
+ listing = 1;
for(k=optind; k<argc; k++)
try(argv[k], 1);
} else {
/* we no longer have default device names */
- fatal(usage2);
+ /* but, we can use /proc/partitions instead */
+ tryprocpt();
}
exit(0);
}
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index ace1b0cd9..551b02f6f 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -49,7 +49,7 @@ struct partition {
enum failure {usage, usage2, ioctl_error,
unable_to_open, unable_to_read, unable_to_seek,
- unable_to_write, out_of_memory, no_partition, no_device};
+ unable_to_write, out_of_memory};
enum action {fdisk, require, try_only, create_empty};
@@ -68,6 +68,7 @@ extern void list_types(struct systypes *sys);
extern int read_line (void);
extern char read_char(char *mesg);
extern int read_hex(struct systypes *sys);
+extern void reread_partition_table(int leave);
uint read_int(uint low, uint dflt, uint high, uint base, char *mesg);
#define PLURAL 0
@@ -83,3 +84,5 @@ extern int btrydev (char * dev);
/* prototypes for fdisksgilabel.c */
extern int valid_part_table_flag(unsigned char *b);
+
+#define PROC_PARTITIONS "/proc/partitions"
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 64a792734..980bc38c7 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -75,7 +75,7 @@ static int xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int p
static int xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d);
static int xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d);
static void sync_disks (void);
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
static int xbsd_translate_fstype (int linux_type);
static void xbsd_link_part (void);
#endif
@@ -85,7 +85,7 @@ void alpha_bootblock_checksum (char *boot);
static struct xbsd_disklabel xbsd_dlabel;
static char buffer[BSD_BBSIZE];
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
static struct partition *xbsd_part;
static int xbsd_part_index;
#endif
@@ -111,13 +111,13 @@ bmenu (void)
puts (_(" n add a new BSD partition"));
puts (_(" p print BSD partition table"));
puts (_(" q quit without saving changes"));
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
puts (_(" r return to main menu"));
#endif
puts (_(" s show complete disklabel"));
puts (_(" t change a partition's filesystem id"));
puts (_(" w write disklabel to disk"));
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
puts (_(" x link BSD partition to non-BSD partition"));
#endif
}
@@ -134,7 +134,7 @@ is_netbsd_partition_type(int type) {
void
bselect (void) {
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
int t, ss;
for (t=0; t<4; t++)
@@ -203,7 +203,7 @@ bselect (void) {
case 'w':
xbsd_write_disklabel ();
break;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
case 'r':
return;
case 'x':
@@ -235,33 +235,35 @@ static void
xbsd_new_part (void)
{
uint begin, end;
- char mesg[48];
+ char mesg[256];
int i;
if (!xbsd_check_new_partition (&i))
return;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
begin = get_start_sect(xbsd_part);
end = begin + get_nr_sects(xbsd_part) - 1;
#elif defined (__alpha__) || defined (__powerpc__)
begin = 0;
- end = xbsd_dlabel.d_secperunit;
+ end = xbsd_dlabel.d_secperunit - 1;
#endif
sprintf (mesg, _("First %s"), str_units(SINGULAR));
begin = read_int (cround (begin), cround (begin), cround (end),
0, mesg);
- sprintf (mesg, _("Last %s or +size or +sizeM or +sizeK"), str_units(SINGULAR));
+ if (display_in_cyl_units)
+ begin = (begin - 1) * units_per_sector;
+
+ sprintf (mesg, _("Last %s or +size or +sizeM or +sizeK"),
+ str_units(SINGULAR));
end = read_int (cround (begin), cround (end), cround (end),
cround (begin), mesg);
if (display_in_cyl_units)
- {
- begin = (begin - 1) * units_per_sector;
end = end * units_per_sector - 1;
- }
+
xbsd_dlabel.d_partitions[i].p_size = end - begin + 1;
xbsd_dlabel.d_partitions[i].p_offset = begin;
xbsd_dlabel.d_partitions[i].p_fstype = BSD_FS_UNUSED;
@@ -277,7 +279,7 @@ xbsd_print_disklabel (int show_all)
if (show_all)
{
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
fprintf(f, "# %s%d:\n", disk_device, xbsd_part_index+1);
#elif defined (__alpha__)
fprintf(f, "# %s:\n", disk_device);
@@ -374,13 +376,14 @@ xbsd_print_disklabel (int show_all)
static void
xbsd_write_disklabel (void)
{
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
printf (_("Writing disklabel to %s%d.\n"), disk_device, xbsd_part_index+1);
xbsd_writelabel (xbsd_part, &xbsd_dlabel);
#elif defined (__alpha__)
printf (_("Writing disklabel to %s.\n"), disk_device);
xbsd_writelabel (NULL, &xbsd_dlabel);
#endif
+ reread_partition_table(0); /* no exit yet */
}
static int
@@ -388,7 +391,7 @@ xbsd_create_disklabel (void)
{
char c;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
fprintf (stderr, _("%s%d contains no disklabel.\n"),
disk_device, xbsd_part_index+1);
#elif defined (__alpha__)
@@ -398,7 +401,7 @@ xbsd_create_disklabel (void)
while (1)
if ((c = tolower (read_char (_("Do you want to create a disklabel? (y/n) ")))) == 'y')
{
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
if (xbsd_initlabel (xbsd_part, &xbsd_dlabel, xbsd_part_index) == 1)
#elif defined (__alpha__) || defined (__powerpc__)
if (xbsd_initlabel (NULL, &xbsd_dlabel, 0) == 1)
@@ -529,7 +532,7 @@ xbsd_write_bootstrap (void)
bcopy (&dl, d, sizeof (struct xbsd_disklabel));
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
sector = get_start_sect(xbsd_part);
#elif defined (__powerpc__)
sector = 0;
@@ -543,7 +546,7 @@ xbsd_write_bootstrap (void)
if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE))
fatal (unable_to_write);
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
printf (_("Bootstrap installed on %s%d.\n"), disk_device, xbsd_part_index+1);
#elif defined (__alpha__)
printf (_("Bootstrap installed on %s.\n"), disk_device);
@@ -564,7 +567,7 @@ xbsd_change_fstype (void)
static int
xbsd_get_part_index (int max)
{
- char prompt[40];
+ char prompt[256];
char l;
sprintf (prompt, _("Partition (a-%c): "), 'a' + max - 1);
@@ -647,7 +650,7 @@ xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex)
d -> d_subtype = BSD_DSTYPE_INDOSPART & pindex;
#endif
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
d -> d_flags = BSD_D_DOSPART;
#else
d -> d_flags = 0;
@@ -670,7 +673,7 @@ xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex)
d -> d_bbsize = BSD_BBSIZE;
d -> d_sbsize = BSD_SBSIZE;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
d -> d_npartitions = 4;
pp = &d -> d_partitions[2]; /* Partition C should be the NetBSD partition */
pp -> p_offset = get_start_sect(p);
@@ -696,7 +699,7 @@ xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d)
{
int t, sector;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
sector = (p ? get_start_sect(p) : 0);
#elif defined (__alpha__)
sector = 0;
@@ -730,7 +733,7 @@ xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d)
{
int sector;
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
sector = get_start_sect(p) + BSD_LABELSECTOR;
#elif defined (__alpha__) || defined (__powerpc__)
sector = BSD_LABELSECTOR;
@@ -771,7 +774,7 @@ sync_disks (void)
sleep (4);
}
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
static int
xbsd_translate_fstype (int linux_type)
{
@@ -810,7 +813,7 @@ xbsd_link_part (void)
#if defined (__alpha__)
-#if 0
+#if !defined(__GLIBC__)
typedef unsigned long long u_int64_t;
#endif
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index b9f2c9c38..1a06a08d5 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -43,7 +43,7 @@
#define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
-#if defined (i386) || defined (sparc)
+#if defined (i386) || defined (__sparc__) || defined (__arm__)
#define BSD_LABELSECTOR 1
#define BSD_LABELOFFSET 0
#elif defined (__alpha__) || defined (__powerpc__)
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 25ed31a3e..b2870e65b 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -671,7 +671,7 @@ sgi_delete_partition( int i )
void
sgi_add_partition( int n, int sys )
{
- char mesg[48];
+ char mesg[256];
int first=0, last=0;
if( n == 10 ) {
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index d484e7932..48916ad48 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -472,7 +472,7 @@ void add_sun_partition(int n, int sys)
uint starts[8], lens[8];
int whole_disk = 0;
- char mesg[48];
+ char mesg[256];
int i, first, last;
if (sunlabel->partitions[n].num_sectors && sunlabel->infos[n].id) {
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index d25543dd3..7bf7fd83d 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -32,7 +32,7 @@
#define PROGNAME "sfdisk"
#define VERSION "3.07"
-#define DATE "980518"
+#define DATE "990908"
#include <stdio.h>
#include <stdlib.h> /* atoi, free */
@@ -48,7 +48,6 @@
#include <linux/unistd.h> /* _syscall */
#include <linux/hdreg.h> /* HDIO_GETGEO */
#include <linux/fs.h> /* BLKGETSIZE */
-#include <locale.h>
#include "nls.h"
#include "common.h"
@@ -829,7 +828,7 @@ void
out_partition_header(char *dev, int format, struct geometry G) {
if (dump) {
printf(_("# partition table of %s\n"), dev);
- printf(_("unit: sectors\n\n"));
+ printf("unit: sectors\n\n");
return;
}
@@ -929,12 +928,12 @@ out_partition(char *dev, int format, struct part_desc *p,
size = p->size;
if (dump) {
- printf(_(" start=%9lu"), start);
- printf(_(", size=%8lu"), size);
+ printf(" start=%9lu", start);
+ printf(", size=%8lu", size);
if (p->ptype == DOS_TYPE) {
- printf(_(", Id=%2x"), p->p.sys_type);
+ printf(", Id=%2x", p->p.sys_type);
if (p->p.bootable == 0x80)
- printf(_(", bootable"));
+ printf(", bootable");
}
printf("\n");
return;
@@ -1012,16 +1011,24 @@ out_partition(char *dev, int format, struct part_desc *p,
void
out_partitions(char *dev, struct disk_desc *z) {
+ struct part_desc *p;
int pno, format = 0;
if (z->partno == 0)
printf(_("No partitions found\n"));
else {
- if (get_fdisk_geometry(&(z->partitions[0])))
- printf(_("Warning: The first partition looks like it was made\n"
+ for (pno=0; pno < z->partno; pno++) {
+ p = &(z->partitions[pno]);
+ if (p->size != 0 && p->p.sys_type != 0) {
+ if (get_fdisk_geometry(p))
+ printf(
+ _("Warning: The first partition 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"),
F.heads, F.sectors, B.cylinders, B.heads, B.sectors);
+ break;
+ }
+ }
out_partition_header(dev, format, F);
for(pno=0; pno < z->partno; pno++) {
out_partition(dev, format, &(z->partitions[pno]), z, F);
diff --git a/games/Makefile b/games/Makefile
index 23297857a..737e168e8 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -20,6 +20,7 @@ all: $(USRGAMES)
# Rules for everything else
+banner.o: $(LIB)/errs.h
banner: banner.o $(ERR_O)
ddate: ddate.o
diff --git a/games/banner.c b/games/banner.c
index a429c8421..36688b27a 100644
--- a/games/banner.c
+++ b/games/banner.c
@@ -39,7 +39,7 @@
* banner [-w#] [-d] [-t] message ...
*/
-#include "err.h"
+#include "errs.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/kbd/kbdrate.8 b/kbd/kbdrate.8
index 66715de05..e0fd890ff 100644
--- a/kbd/kbdrate.8
+++ b/kbd/kbdrate.8
@@ -47,6 +47,9 @@ milliseconds.
For Intel-based systems, the allowable range is from 250 to 1000 ms,
in 250 ms steps. For SPARC systems, possible values are between 10 ms and 1440 ms,
in 10 ms steps.
+.TP
+.B \-V
+Display a version number and exit.
.SH BUGS
Not all keyboards support all rates.
.PP
diff --git a/kbd/kbdrate.c b/kbd/kbdrate.c
index 5388a6ef0..0a9064f3f 100644
--- a/kbd/kbdrate.c
+++ b/kbd/kbdrate.c
@@ -85,7 +85,6 @@ beats rebuilding the kernel!
#endif
#include "nls.h"
-#include "../version.h"
static int valid_rates[] = { 300, 267, 240, 218, 200, 185, 171, 160, 150,
133, 120, 109, 100, 92, 86, 80, 75, 67,
@@ -202,7 +201,7 @@ int main( int argc, char **argv )
textdomain(PACKAGE);
- while ( (c = getopt( argc, argv, "r:d:sv" )) != EOF ) {
+ while ( (c = getopt( argc, argv, "r:d:svVh?" )) != EOF ) {
switch (c) {
case 'r':
rate = atof( optarg );
@@ -214,8 +213,14 @@ int main( int argc, char **argv )
silent = 1;
break;
case 'v':
+ case 'V':
fprintf( stderr, "util-linux %s kbdrate\n", UTIL_LINUX_VERSION);
exit(0);
+ case 'h':
+ case '?':
+ fprintf( stderr,
+ _("Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"));
+ exit(0);
}
}
diff --git a/lib/README.widechar b/lib/README.widechar
new file mode 100644
index 000000000..5a8179bb7
--- /dev/null
+++ b/lib/README.widechar
@@ -0,0 +1,18 @@
+From haible@ilog.fr Mon Sep 20 15:34:21 1999
+
+Hello Andries,
+
+Here is a patch for adding multi-byte locale support to a few programs
+found in util-linux-2.9u. With these patches, the programs
+
+ col colcrt colrm column rev ul
+
+now work correctly in UTF-8 locales. This is done by using the ISO C / SUSV2
+i18n functions, therefore they will become effective when glibc-2.2 comes
+out. For the moment, you can test the patches by
+ 1. defining ENABLE_WIDECHAR in defines.h
+ 2. Change the #if 0 to #if 1 in lib/widechar.h
+ 3. Modify your CFLAGS and LDFLAGS to include the directories where libutf8
+ is installed.
+
+
diff --git a/lib/err.c b/lib/err.c
index d53192240..dc0ab8a7b 100644
--- a/lib/err.c
+++ b/lib/err.c
@@ -31,17 +31,13 @@
* SUCH DAMAGE.
*/
-#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <string.h>
+#include "errs.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "../defines.h"
#ifdef HAVE_progname
@@ -50,101 +46,63 @@ extern char *__progname; /* Program name, from crt0. */
char *__progname = "foo"; /* probably libc4 */
#endif
-__dead void
-#ifdef __STDC__
-err(int eval, const char *fmt, ...)
-#else
-err(eval, fmt, va_alist)
- int eval;
- const char *fmt;
- va_dcl
-#endif
-{
+/* Some compilers complain "null format string" upon err(1,NULL) */
+/* Make them happy with a separate routine. */
+void
+err_nomsg(int exitval) {
+ (void)fprintf(stderr, "%s: %s\n", __progname, strerror(errno));
+ exit(exitval);
+}
+
+void
+err(int exitval, const char *fmt, ...) {
va_list ap;
-#if __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
- verr(eval, fmt, ap);
+ verr(exitval, fmt, ap);
va_end(ap);
}
-__dead void
-verr(eval, fmt, ap)
- int eval;
- const char *fmt;
- va_list ap;
-{
+void
+verr(int exitval, const char *fmt, va_list ap) {
int sverrno;
sverrno = errno;
(void)fprintf(stderr, "%s: ", __progname);
- if (fmt != NULL) {
+ if (fmt != NULL && *fmt != 0) {
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, ": ");
}
(void)fprintf(stderr, "%s\n", strerror(sverrno));
- exit(eval);
+ exit(exitval);
}
-__dead void
-#if __STDC__
-errx(int eval, const char *fmt, ...)
-#else
-errx(eval, fmt, va_alist)
- int eval;
- const char *fmt;
- va_dcl
-#endif
-{
+void
+errx(int exitval, const char *fmt, ...) {
va_list ap;
-#if __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
- verrx(eval, fmt, ap);
+ verrx(exitval, fmt, ap);
va_end(ap);
}
-__dead void
-verrx(eval, fmt, ap)
- int eval;
- const char *fmt;
- va_list ap;
-{
+void
+verrx(int exitval, const char *fmt, va_list ap) {
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, "\n");
- exit(eval);
+ exit(exitval);
}
void
-#if __STDC__
-warn(const char *fmt, ...)
-#else
-warn(fmt, va_alist)
- const char *fmt;
- va_dcl
-#endif
-{
+warn(const char *fmt, ...) {
va_list ap;
-#if __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
vwarn(fmt, ap);
va_end(ap);
}
void
-vwarn(fmt, ap)
- const char *fmt;
- va_list ap;
-{
+vwarn(const char *fmt, va_list ap) {
int sverrno;
sverrno = errno;
@@ -157,29 +115,15 @@ vwarn(fmt, ap)
}
void
-#ifdef __STDC__
-warnx(const char *fmt, ...)
-#else
-warnx(fmt, va_alist)
- const char *fmt;
- va_dcl
-#endif
-{
+warnx(const char *fmt, ...) {
va_list ap;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
vwarnx(fmt, ap);
va_end(ap);
}
void
-vwarnx(fmt, ap)
- const char *fmt;
- va_list ap;
-{
+vwarnx(const char *fmt, va_list ap) {
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
diff --git a/lib/err.h b/lib/err.h
deleted file mode 100644
index da4be150c..000000000
--- a/lib/err.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)err.h 8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _ERR_H_
-#define _ERR_H_
-
-#ifdef __linux__
-#include <stdarg.h>
-#define _BSD_VA_LIST_ va_list
-#define __dead /* */
-#else
-/*
- * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two
- * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- * of them here we may collide with the utility's includes. It's unreasonable
- * for utilities to have to include one of them to include err.h, so we get
- * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
- */
-#include <machine/ansi.h>
-#endif
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-__dead void err __P((int, const char *, ...));
-__dead void verr __P((int, const char *, _BSD_VA_LIST_));
-__dead void errx __P((int, const char *, ...));
-__dead void verrx __P((int, const char *, _BSD_VA_LIST_));
-void warn __P((const char *, ...));
-void vwarn __P((const char *, _BSD_VA_LIST_));
-void warnx __P((const char *, ...));
-void vwarnx __P((const char *, _BSD_VA_LIST_));
-__END_DECLS
-
-#ifdef __linux__
-#undef _BSD_VA_LIST_
-#endif
-
-#endif /* !_ERR_H_ */
diff --git a/lib/errs.h b/lib/errs.h
new file mode 100644
index 000000000..7961880dc
--- /dev/null
+++ b/lib/errs.h
@@ -0,0 +1,16 @@
+#ifndef _ERR_H_
+#define _ERR_H_
+
+#include <stdarg.h>
+
+void err_nomsg (int);
+void err (int, const char *, ...);
+void verr (int, const char *, va_list);
+void errx (int, const char *, ...);
+void verrx (int, const char *, va_list);
+void warn (const char *, ...);
+void vwarn (const char *, va_list);
+void warnx (const char *, ...);
+void vwarnx (const char *, va_list);
+
+#endif /* !_ERR_H_ */
diff --git a/lib/pathnames.h b/lib/pathnames.h
index ab7b97dc8..60797f94e 100644
--- a/lib/pathnames.h
+++ b/lib/pathnames.h
@@ -1,43 +1,78 @@
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
+ * Vaguely based on
* @(#)pathnames.h 5.3 (Berkeley) 5/9/89
- *
- * Changed: Sun Nov 21 12:30:54 1993 by faith@cs.unc.edu
- * Changed: Wed Jun 22 20:47:27 1994 by faith@cs.unc.edu, based on changes
- * from poe@daimi.aau.dk
- * Changed: Wed Jun 22 22:50:13 1994 by faith@cs.unc.edu
- * Changed: Sat Feb 4 16:02:10 1995 by faith@cs.unc.edu
- * Changed: Tue Jul 2 09:37:36 1996 by janl@math.uio.no, axp patches
- * Changed: Thu Nov 9 21:58:36 1995 by joey@infodrom.north.de
+ * This code is in the public domain.
*/
+#include <paths.h>
#ifndef __STDC__
# error "we need an ANSI compiler"
#endif
-/* The paths for some of these are wrong in /usr/include/paths.h, but we
- re-define them here. */
+/* The paths for some of these are wrong in /usr/include/paths.h,
+ but we re-define them here. */
+/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, write.c */
#undef _PATH_UTMP
+/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, last.c */
#undef _PATH_WTMP
+/* These four are used in login.c only */
#undef _PATH_DEFPATH
#undef _PATH_DEFPATH_ROOT
#undef _PATH_LASTLOG
-#undef _PATH_MAILDIR
+
+/*
+ * HISTORY
+ *
+What is the history of these six, and related defines?
+------------------------------------------------------------------------
+_PATH_UTMP and UTMP_FILE and UTMP_FILENAME:
+ /etc/utmp > /var/adm/utmp > /var/run/utmp.
+Traditionally we have /etc/utmp.
+In <paths.h> we have /etc/utmp, but since 4.6.0 /var/adm/utmp
+and since 5.0.9 (and in glibc2) /var/run/utmp.
+In login/pathnames.h we have /etc/utmp, but since 4.6.6 /var/adm/utmp.
+In <utmp.h> UTMP_FILE is defined as /etc/utmp, but in 4.6.* as _PATH_UTMP.
+
+_PATH_WTMP and WTMP_FILE and WTMP_FILENAME:
+ /etc/wtmp > /usr/adm/wtmp > /var/adm/wtmp > /var/log/wtmp.
+Traditionally we have /etc/wtmp.
+In <paths.h> we have /usr/adm/wtmp, but since 4.5.13 /var/adm/wtmp,
+and since 5.0.9 (and in glibc2) /var/log/wtmp.
+In login/pathnames.h. we have /etc/wtmp, but since 4.6.6 /var/adm/wtmp.
+In <utmp.h> WTMP_FILE is defined as /usr/adm/wtmp, but in 4.5.* as
+/var/adm/wtmp, and in 4.6.* as _PATH_WTMP.
+
+_PATH_DEFPATH)
+Long ago this was ".:/bin:/usr/bin".
+In <paths.h> libc 4.4.1-4.4.4 have "/usr/bin:/bin"
+and libc 4.5.21-5.4.23 have "/usr/local/bin:/usr/bin:/bin:."
+and libc 5.4.38-5.4.46 have "/usr/local/bin:/usr/bin:/bin".
+In login/pathnames.h libc4 and libc5 have "/usr/local/bin:/bin:/usr/bin:."
+
+_PATH_DEFPATH_ROOT)
+Long ago this was identical to _PATH_DEFPATH.
+In <paths.h> no definition is present before libc 4.5.13.
+Libc 4.5.13 has "/bin:/usr/bin:/etc"
+Libc 4.5.14-5.4.46 have "/sbin:/bin:/usr/sbin:/usr/bin"
+In login/pathnames.h libc4 and libc5 have "/bin:/usr/bin:/etc"
+
+_PATH_LASTLOG)
+ /etc/lastlog > /usr/adm/lastlog > /var/adm/lastlog > /var/log/lastlog.
+Traditionally we have /etc/lastlog.
+In <bsd/utmp.h> libc 4.4.1-4.5.12 have /usr/adm/lastlog, 4.5.13 and
+later have /var/adm/lastlog.
+In paths.h all libc5 and glibc2 versions have /var/log/lastlog.
+In login/pathnames.h all libc4 and libc5 versions have /usr/adm/lastlog.
+
+_PATH_MAILDIR)
+ /usr/spool/mail > /var/spool/mail > /var/mail.
+Traditionally we have /usr/spool/mail.
+In <paths.h> we have /usr/spool/mail, but since libc 4.5.13 /var/spool/mail.
+In login/pathnames.h all libc4 versions have /var/spool/mail.
+Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
+------------------------------------------------------------------------*/
+
#ifndef SBINDIR
#define SBINDIR "/sbin"
@@ -73,7 +108,10 @@
#define _PATH_DEFPATH_ROOT SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
#define _PATH_HUSHLOGIN ".hushlogin"
#define _PATH_LASTLOG LOGDIR "/lastlog"
+
+#ifndef _PATH_MAILDIR
#define _PATH_MAILDIR VARPATH "/spool/mail"
+#endif
#define _PATH_MOTDFILE "/etc/motd"
#define _PATH_NOLOGIN "/etc/nologin"
@@ -87,18 +125,22 @@
#define _PATH_SECURE "/etc/securesingle"
#define _PATH_USERTTY "/etc/usertty"
+/* used in login-utils/shutdown.c */
#define _PATH_MTAB "/etc/mtab"
#define _PATH_UMOUNT "/bin/umount"
#define UMOUNT_ARGS "umount", "-a"
#define SWAPOFF_ARGS "swapoff", "-a"
+/* used in login-utils/setpwnam.h and login-utils/islocal.c */
#define _PATH_PASSWD "/etc/passwd"
+
+/* used in login-utils/setpwnam.h */
#define _PATH_PTMP "/etc/ptmp"
#define _PATH_PTMPTMP "/etc/ptmptmp"
-
#define _PATH_GROUP "/etc/group"
#define _PATH_GTMP "/etc/gtmp"
#define _PATH_GTMPTMP "/etc/gtmptmp"
+/* used in misc-utils/look.c */
#define _PATH_WORDS "/usr/dict/words"
#define _PATH_WORDS_ALT "/usr/dict/web2"
diff --git a/lib/widechar.h b/lib/widechar.h
new file mode 100644
index 000000000..a8d288298
--- /dev/null
+++ b/lib/widechar.h
@@ -0,0 +1,41 @@
+/* Declarations for wide characters */
+/* This file must be included last because the redefinition of wchar_t may
+ cause conflicts when system include files were included after it. */
+
+#include "../defines.h" /* for ENABLE_WIDECHAR */
+
+#ifdef ENABLE_WIDECHAR
+
+# include <wchar.h>
+# include <wctype.h>
+#if 0 /* for testing on platforms without built-in wide character support */
+# include <libutf8.h>
+#endif
+
+#else
+
+# include <ctype.h>
+ /* Fallback for types */
+# define wchar_t char
+# define wint_t int
+# define WEOF EOF
+ /* Fallback for input operations */
+# define fgetwc fgetc
+# define getwc getc
+# define getwchar getchar
+# define fgetws fgets
+ /* Fallback for output operations */
+# define fputwc fputc
+# define putwc putc
+# define putwchar putchar
+# define fputws fputs
+ /* Fallback for character classification */
+# define iswgraph isgraph
+# define iswprint isprint
+# define iswspace isspace
+ /* Fallback for string functions */
+# define wcschr strchr
+# define wcsdup strdup
+# define wcslen strlen
+
+#endif
diff --git a/login-utils/Makefile b/login-utils/Makefile
index 4dcfee26f..e277d1bad 100644
--- a/login-utils/Makefile
+++ b/login-utils/Makefile
@@ -124,12 +124,12 @@ wall: wall.o ttymsg.o
ifeq "$(USE_TTY_GROUP)" "yes"
login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h
$(CC) -c $(CFLAGS) $(PAMFL) -DUSE_TTY_GROUP login.c
-mesg.o: mesg.c $(LIB)/err.h
+mesg.o: mesg.c $(LIB)/errs.h
$(CC) -c $(CFLAGS) -DUSE_TTY_GROUP mesg.c
else
login.o: $(LIB)/pathnames.h
$(CC) -c $(CFLAGS) $(PAMFL) login.c
-mesg.o: $(LIB)/err.h
+mesg.o: $(LIB)/errs.h
endif
passwd: passwd.o islocal.o setpwnam.o $(LIB)/env.o
diff --git a/login-utils/agetty.8 b/login-utils/agetty.8
index 57c9b6b46..69be5f2be 100644
--- a/login-utils/agetty.8
+++ b/login-utils/agetty.8
@@ -8,6 +8,7 @@ agetty \- alternative Linux getty
.RI "[-l " login_program ]
.RI "[-I " init ]
.RI "[-t " timeout ]
+.RI "[-H " login_host ]
.I port
.I baud_rate,...
.RI [ term ]
@@ -17,6 +18,7 @@ agetty \- alternative Linux getty
.RI "[-l " login_program ]
.RI "[-I " init ]
.RI "[-t " timeout ]
+.RI "[-H " login_host ]
.I baud_rate,...
.I port
.RI [ term ]
@@ -120,6 +122,12 @@ This allows the use of a non-standard login program (for example,
one that asks for a dial-up password or that uses a different
password file).
.TP
+\-H \fIlogin_host\fP
+Write the specified \fIlogin_host\fP into the utmp file. (Normally,
+no login host is given, since \fBagetty\fP is used for local hardwired
+connections and consoles. However, this option can be useful for
+identifying terminal concentrators and the like.
+.TP
\-m
Try to extract the baud rate the CONNECT status message
produced by Hayes(tm)\-compatible modems. These status
diff --git a/login-utils/agetty.c b/login-utils/agetty.c
index c85526dc0..9360be0ae 100644
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@ -237,6 +237,9 @@ void error P_((int va_alist));
char *progname;
+/* Fake hostname for ut_host specified on command line. */
+char *fakehost = NULL;
+
/* ... */
#ifdef DEBUGGING
#define debug(s) fprintf(dbf,s); fflush(dbf)
@@ -390,7 +393,7 @@ parse_args(argc, argv, op)
extern int optind; /* getopt */
int c;
- while (isascii(c = getopt(argc, argv, "I:Lf:hil:mt:wn"))) {
+ while (isascii(c = getopt(argc, argv, "I:LH:f:hil:mt:wn"))) {
switch (c) {
case 'I':
if (!(op->initstring = malloc(strlen(optarg)))) {
@@ -435,6 +438,9 @@ parse_args(argc, argv, op)
case 'L': /* force local */
op->flags |= F_LOCAL;
break;
+ case 'H': /* fake login host */
+ fakehost = optarg;
+ break;
case 'f': /* custom issue file */
op->flags |= F_CUSTISSUE;
op->issue = optarg;
@@ -547,6 +553,8 @@ update_utmp(line)
strncpy(ut.ut_user, "LOGIN", sizeof(ut.ut_user));
strncpy(ut.ut_line, line, sizeof(ut.ut_line));
+ if (fakehost)
+ strncpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
time(&t);
ut.ut_time = t;
ut.ut_type = LOGIN_PROCESS;
@@ -586,6 +594,8 @@ update_utmp(line)
ut.ut_time = time((long *) 0);
(void) strncpy(ut.ut_name, "LOGIN", sizeof(ut.ut_name));
(void) strncpy(ut.ut_line, line, sizeof(ut.ut_line));
+ if (fakehost)
+ (void) strncpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
(void) lseek(ut_fd, -ut_size, 1);
(void) write(ut_fd, (char *) &ut, sizeof(ut));
(void) close(ut_fd);
@@ -1160,7 +1170,7 @@ bcode(s)
void
usage()
{
- fprintf(stderr, _("Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] line baud_rate,... [termtype]\n"), progname);
+ fprintf(stderr, _("Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname);
exit(1);
}
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 5fe5025de..93e801e0c 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -33,9 +33,7 @@
#include <errno.h>
#include <ctype.h>
#include <getopt.h>
-#include <locale.h>
#include "my_crypt.h"
-#include "../version.h"
#include "nls.h"
#include "env.h"
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index f9c4d743f..d1d14d0fa 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -37,7 +37,6 @@
#include <ctype.h>
#include <getopt.h>
#include "my_crypt.h"
-#include "../version.h"
#include "nls.h"
#include "env.h"
diff --git a/login-utils/login.1 b/login-utils/login.1
index 88bb4d89e..d21a41efc 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -35,14 +35,14 @@ these must be met, or the log in attempt will be denied and a
.B syslog
message will be generated. See the section on "Special Access Restrictions".
-If the user is root, then the login must be occuring on a tty listed in
+If the user is root, then the login must be occurring on a tty listed in
.IR /etc/securetty .
Failures will be logged with the
.B syslog
facility.
-After these conditions are checked, the password will be requested and
-checks (if a password is required for this username). Ten attempts
+After these conditions have been checked, the password will be requested and
+checked (if a password is required for this username). Ten attempts
are allowed before
.B login
dies, but after the first three, the response starts to get very slow.
@@ -53,8 +53,8 @@ facility. This facility is also used to report any successful root logins.
If the file
.I .hushlogin
exists, then a "quiet" login is performed (this disables the checking
-of the checking of mail and the printing of the last login time and
-message of the day). Otherwise, if
+of mail and the printing of the last login time and message of the day).
+Otherwise, if
.I /var/log/lastlog
exists, the last login time is printed (and the current login is
recorded).
diff --git a/login-utils/login.c b/login-utils/login.c
index fa0450164..399b4aee1 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -162,6 +162,23 @@
#include "setproctitle.h"
#endif
+/*
+ * RedHat writes:
+ * we've got a REAL HACK to avoid telling people that they have
+ * mail because the imap server has left a turd in their inbox.
+ * It works, but it sucks...
+ * It turns out that the turd is always 523 bytes long, so we
+ * just check for that size.
+ */
+/*
+ * If you want to turn this strange hack off, set
+ #define REDHAT_IGNORED_MAILSIZE 0
+ * In case people complain, this may become a configuration option,
+ * or perhaps this hack is thrown out again.
+ * A better solution would be to check the contents of this file..
+ */
+#define REDHAT_IGNORED_MAILSIZE 523
+
#if 0
/* from before we had a lastlog.h file in linux */
struct lastlog
@@ -241,12 +258,23 @@ const char *months[] =
{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
"Sep", "Oct", "Nov", "Dec" };
-/* provided by Linus Torvalds 16-Feb-93 */
+/* Nice and simple code provided by Linus Torvalds 16-Feb-93 */
+/* Nonblocking stuff by Maciej W. Rozycki, macro@ds2.pg.gda.pl, 1999.
+ He writes: "Login performs open() on a tty in a blocking mode.
+ In some cases it may make login wait in open() for carrier infinitely,
+ for example if the line is a simplistic case of a three-wire serial
+ connection. I believe login should open the line in the non-blocking mode
+ leaving the decision to make a connection to getty (where it actually
+ belongs). */
void
opentty(const char * tty)
{
int i;
- int fd = open(tty, O_RDWR);
+ int fd = open(tty, O_RDWR | O_NONBLOCK);
+ int flags = fcntl(fd, F_GETFL);
+
+ flags &= ~O_NONBLOCK;
+ fcntl(fd, F_SETFL, flags);
for (i = 0 ; i < fd ; i++)
close(i);
@@ -485,6 +513,12 @@ main(int argc, char **argv)
retcode = pam_set_item(pamh, PAM_TTY, tty);
PAM_FAIL_CHECK;
+ /* 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). */
+ retcode = pam_set_item(pamh, PAM_USER_PROMPT, _("login: "));
+ PAM_FAIL_CHECK;
+
#if 0
/* other than iso-8859-1
* one more time due to reset tty by PAM
@@ -1050,7 +1084,8 @@ Michael Riepe <michael@stud.uni-hannover.de>
motd();
mail = getenv("MAIL");
- if (mail && stat(mail, &st) == 0 && st.st_size != 0) {
+ if (mail && stat(mail, &st) == 0 && st.st_size != 0
+ && st.st_size != REDHAT_IGNORED_MAILSIZE) {
printf(_("You have %smail.\n"),
(st.st_mtime > st.st_atime) ? _("new ") : "");
}
diff --git a/login-utils/mesg.c b/login-utils/mesg.c
index cc8c4010d..bfa17eb11 100644
--- a/login-utils/mesg.c
+++ b/login-utils/mesg.c
@@ -48,12 +48,12 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "errs.h"
#include "nls.h"
int
diff --git a/login-utils/passwd.c b/login-utils/passwd.c
index 90054ccca..ba679cd23 100644
--- a/login-utils/passwd.c
+++ b/login-utils/passwd.c
@@ -68,8 +68,6 @@
#include "nls.h"
#include "env.h"
-#include "../version.h"
-
#ifndef _PATH_CHFN
# define _PATH_CHFN "/usr/bin/chfn"
# define _PATH_CHSH "/usr/bin/chsh"
diff --git a/login-utils/wall.c b/login-utils/wall.c
index 70a0df65b..d476edd64 100644
--- a/login-utils/wall.c
+++ b/login-utils/wall.c
@@ -56,10 +56,7 @@
#include <unistd.h>
#include <utmp.h>
#include "nls.h"
-#ifdef __linux__
-#include <locale.h>
#include "pathnames.h"
-#endif
void makemsg __P((char *));
diff --git a/misc-utils/Makefile b/misc-utils/Makefile
index eeaf56764..088d2ccee 100644
--- a/misc-utils/Makefile
+++ b/misc-utils/Makefile
@@ -10,8 +10,8 @@ include ../MCONFIG
# Where to put man pages?
MAN1= cal.1 chkdupexe.1 ddate.1 kill.1 \
- logger.1 look.1 mcookie.1 namei.1 script.1 \
- tsort.1 whereis.1 write.1
+ logger.1 look.1 mcookie.1 namei.1 rename.1 script.1 \
+ whereis.1 write.1
# Where to put binaries?
# See the "install" rule for the links. . .
@@ -19,12 +19,7 @@ MAN1= cal.1 chkdupexe.1 ddate.1 kill.1 \
BIN= kill
USRBIN= cal chkdupexe ddate logger look mcookie \
- namei script tsort whereis write
-
-ifeq "$(HAVE_CLEAR)" "no"
-USRBIN:=$(USRBIN) clear
-MAN1:=$(MAN1) clear.1
-endif
+ namei rename script whereis write
ifeq "$(HAVE_RESET)" "no"
USRBIN:=$(USRBIN) reset
@@ -36,6 +31,11 @@ USRBIN:=$(USRBIN) setterm
MAN1:=$(MAN1) setterm.1
endif
+ifeq "$(HAVE_TSORT)" "no"
+USRBIN:=$(USRBIN) tsort
+MAN1:=$(MAN1) tsort.1
+endif
+
# For script only
LIBPTY=
ifeq "$(HAVE_OPENPTY)" "yes"
@@ -69,9 +69,9 @@ $(NEEDS_OPENPTY):
# Rules for everything else
+cal.o: $(LIB)/errs.h
cal: cal.o $(ERR_O)
chkdupexe: chkdupexe.pl
-clear: clear.sh
kill: kill.o procs.o
logger: logger.o
mcookie: mcookie.o md5.o
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 9d41dc5ed..6a5ec5ae5 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -52,9 +52,10 @@ the current month is displayed.
The options are as follows:
.Bl -tag -width Ds
.It Fl m
-Display monday as the first day of the week.
+Display Monday as the first day of the week.
+(The default is Sunday.)
.It Fl j
-Display julian dates (days one-based, numbered from January 1).
+Display Julian dates (days one-based, numbered from January 1).
.It Fl y
Display a calendar for the current year.
.El
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index e3acf74b1..fe35e1851 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -44,13 +44,13 @@
#include <sys/types.h>
#include <ctype.h>
-#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <locale.h>
+#include "errs.h"
#include "nls.h"
#include "../defines.h"
@@ -138,6 +138,7 @@ void trim_trailing_spaces __P((char *));
void usage __P((void));
void yearly __P((int));
void headers_init(void);
+extern char *__progname;
int
main(argc, argv)
@@ -147,17 +148,17 @@ main(argc, argv)
struct tm *local_time;
time_t now;
int ch, month, year, yflag;
+ char *progname, *p;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+ __progname = progname;
-#ifdef __linux__
- extern char *__progname;
- __progname = argv[0];
-#endif
-
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- setlocale(LC_ALL,"");
yflag = 0;
while ((ch = getopt(argc, argv, "mjy")) != EOF)
switch(ch) {
@@ -170,6 +171,10 @@ main(argc, argv)
case 'y':
yflag = 1;
break;
+ case 'V':
+ printf(_("%s from %s\n"),
+ progname, util_linux_version);
+ return 0;
case '?':
default:
usage();
@@ -254,7 +259,7 @@ monthly(month, year)
int month, year;
{
int col, row, len, days[MAXDAYS];
- char *p, lineout[30];
+ char *p, lineout[300];
day_array(month, year, days);
len = sprintf(lineout, "%s %d", full_month[month - 1], year);
@@ -481,6 +486,6 @@ void
usage()
{
- (void)fprintf(stderr, _("usage: cal [-mjy] [[month] year]\n"));
+ (void)fprintf(stderr, _("usage: cal [-mjyV] [[month] year]\n"));
exit(1);
}
diff --git a/misc-utils/chkdupexe.pl b/misc-utils/chkdupexe.pl
index 82ee9e98b..e5fae6847 100755
--- a/misc-utils/chkdupexe.pl
+++ b/misc-utils/chkdupexe.pl
@@ -29,13 +29,18 @@ $execdirs='/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin '.
'/usr/TeX/bin /usr/tex/bin /usr/games '.
'/usr/local/games';
+# Turn off buffering for the output channel.
+$|=1;
+
# Values from /usr/include/linux/errno.h. Existence of linux/errno.ph is not
# something to count on... :-(
$ENOENT=2;
%didthis=();
-foreach $dir (split(/\s+/, "$execdirs")) {
+foreach $dir (split(/\s+/, "$execdirs"), "\0", split(/:/, $ENV{PATH})) {
+
+ if ($dir eq "\0") { $checkingpath = 1; next; }
# It's like this: One directory corresponds to one $device,$inode tuple
# If a symlink points to a directory we already checked that directory
@@ -52,7 +57,7 @@ foreach $dir (split(/\s+/, "$execdirs")) {
print "Dangling symlink: $dir\n";
next;
}
- # warn "Nonexistent directory: $dir\n";
+ warn "Nonexistent directory: $dir\n" if ($checkingpath);
next;
}
@@ -90,7 +95,7 @@ foreach $dir (split(/\s+/, "$execdirs")) {
closedir(DIR);
}
-open(LS,"| xargs ls -ldU");
+open(LS,"| xargs -r ls -ldU");
while (($prog,$paths)=each %progs) {
print LS "$paths\n" if ($count{$prog}>1);
}
diff --git a/misc-utils/ddate.c b/misc-utils/ddate.c
index 7f12e86fd..f00a8fd07 100644
--- a/misc-utils/ddate.c
+++ b/misc-utils/ddate.c
@@ -30,6 +30,7 @@
- added Native Language Support
*/
+#include "../defines.h" /* for util-linux-version */
/* configuration options VVVVV READ THIS!!! */
@@ -150,6 +151,11 @@ main (int argc, char *argv[])
struct disc_time hastur;
char schwa[23*17], *fnord=0;
int pi;
+ char *progname, *p;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@@ -162,6 +168,8 @@ main (int argc, char *argv[])
case '+': fnord=argv[pi]+1; break;
case '-':
switch(argv[pi][1]) {
+ case 'V':
+ printf(_("%s from %s\n"), progname, util_linux_version);
default: goto usage;
}
default: goto thud;
@@ -281,7 +289,7 @@ struct disc_time makeday(int imonth,int iday,int iyear) /*i for input */
funkychickens.day=dayspast+iday-1;
funkychickens.season=0;
if((funkychickens.year%4)==2) {
- if (funkychickens.day==59) funkychickens.day=-1;
+ if (funkychickens.day==59 && iday==29) funkychickens.day=-1;
}
funkychickens.yday=funkychickens.day;
/* note: EQUAL SIGN...hopefully that fixes it */
diff --git a/misc-utils/ddate.doc b/misc-utils/ddate.doc
new file mode 100644
index 000000000..87d0fb8bb
--- /dev/null
+++ b/misc-utils/ddate.doc
@@ -0,0 +1,73 @@
+
+PERPETUAL DATE CONVERTER FROM GREGORIAN TO POEE CALENDAR
+
+SEASONS
+ 1. Chaos -- Patron Apostle Hung Mung
+ 2. Discord -- Patron Apostle Dr. Van Van Mojo
+ 3. Confusion -- Patron Apostle Sri Syadasti
+ 4. Bureaucracy -- Patron Apostle Zarathud
+ 5. The Aftermath -- Patron Apostle the Elder Malaclypse
+
+DAYS OF THE WEEK*
+ 1. Sweetmorn *The DAYS OF THE WEEK
+ 2. Boomtime are named from the five
+ 3. Pungenday basic elements: SWEET,
+ 4. Prickle-Prickle BOOM, PUNGENT, PRICKLE,
+ 5. Setting Orange and ORANGE.
+
+HOLYDAYS
+A. Apostle Holydays B. Seasons Holydays
+ 1. Mungday 1. Chaoflux
+ 2. Mojoday 2. Discoflux
+ 3. Syaday 3. Confuflux
+ 4. Zaraday 4. Bureflux
+ 5. Maladay 5. Afflux
+Each occurs on the 5th Each occurs on the 50th
+day of the Season day of the Season
+
+C. Saint Tib's Day -- occurs once every four years (1 + 4 = 5) and is
+ inserted between the 59th and 60th days of the Season of Chaos
+
+ ST BT PD PP SO SM BT PD PP SO
+Jan 1 2 3 4 5 1 2 3 4 5 Chs Jul 5 6 7 8 9 40 41 42 43 44 Cfn
+ 6 7 8 9 10 6 7 8 9 10 10 11 12 13 14 45 46 47 48 49
+ 11 12 13 14 15 11 12 13 14 15 15 16 17 18 19 50 51 52 53 54
+ 16 17 18 19 20 16 17 18 19 20 20 21 22 23 24 55 56 57 58 59
+ 21 22 23 24 25 21 22 23 24 25 25 26 27 28 29 60 61 62 63 64
+ 26 27 28 29 30 26 27 28 29 30 30 31 1 2 3 65 66 67 68 69
+ 31 1 2 3 4 31 32 33 34 35 Aug 4 5 6 7 8 70 71 72 73 1 Bcy
+Feb 5 6 7 8 9 36 37 38 39 40 9 10 11 12 13 2 3 4 5 6
+ 10 11 12 13 14 41 42 43 44 45 14 15 16 17 18 7 8 9 10 11
+ 15 16 17 18 19 46 47 48 49 50 19 20 21 22 23 12 13 14 15 16
+ 20 21 22 23 24 51 52 53 54 55 24 25 26 27 28 17 18 19 20 21
+ 25 26 27 28* 1 56 57 58 59 60 29 30 31 1 2 22 23 24 25 26
+Mar 2 3 4 5 6 61 62 63 64 65 Sep 3 4 5 6 7 27 28 29 30 31
+ 7 8 9 10 11 66 67 68 69 70 8 9 10 11 12 32 33 34 35 36
+ 12 13 14 15 16 71 72 73 1 2 Dsc 13 14 15 16 17 37 38 39 40 41
+ 17 18 19 20 21 3 4 5 6 7 18 19 20 21 22 42 43 44 45 46
+ 22 23 24 25 26 8 9 10 11 12 23 24 25 26 27 47 48 49 50 51
+ 27 28 29 30 31 13 14 15 16 17 28 29 30 1 2 52 53 54 55 56
+Apr 1 2 3 4 5 18 19 20 21 22 Oct 3 4 5 6 7 57 58 59 60 61
+ 6 7 8 9 10 23 24 25 26 27 8 9 10 11 12 62 63 64 65 66
+ 11 12 13 14 15 28 29 30 31 32 13 14 15 16 17 67 68 69 70 71
+ 16 17 18 19 20 33 34 35 36 37 18 19 20 21 22 72 73 1 2 3 Afm
+ 21 22 23 24 25 38 39 40 41 42 23 24 25 26 27 4 5 6 7 8
+ 26 27 28 29 30 43 44 45 46 47 28 29 30 31 1 9 10 11 12 13
+May 1 2 3 4 5 48 49 50 51 52 Nov 2 3 4 5 6 14 15 16 17 18
+ 6 7 8 9 10 53 54 55 56 57 7 8 9 10 11 19 20 21 22 23
+ 11 12 13 14 15 58 59 60 61 62 12 13 14 15 16 24 25 26 27 28
+ 16 17 18 19 20 63 64 65 66 67 17 18 19 20 21 29 30 31 32 33
+ 21 22 23 24 25 68 69 70 71 72 22 23 24 25 26 34 35 36 37 38
+ 26 27 28 29 30 73 1 2 3 4 Cfn 27 28 29 30 1 39 40 41 42 43
+ 31 1 2 3 4 5 6 7 8 9 Dec 2 3 4 5 6 44 45 46 47 48
+Jun 5 6 7 8 9 10 11 12 13 14 7 8 9 10 11 49 50 51 52 53
+ 10 11 12 13 14 15 16 17 18 19 12 13 14 15 16 54 55 56 57 58
+ 15 16 17 18 19 20 21 22 23 24 17 18 19 20 21 59 60 61 62 63
+ 20 21 22 23 24 25 26 27 28 29 22 23 24 25 26 64 65 66 67 68
+ 25 26 27 28 29 30 31 32 33 34 27 28 29 30 31 69 70 71 72 73
+ 30 1 2 3 4 35 36 37 38 39 [1970 = 3136] [Next St. Tib's Day in 3138]
+
+ SACRED DOCUMENT OF THE FROGS (old Erisian poem):
+ 73 Days hath
+ Chaos, Discord, Confusion, Bureaucracy, and Aftermath
+
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 768f5deab..5372f5216 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -38,6 +38,8 @@
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
* - added Native Language Support
*
+ * 1999-11-13 aeb Accept signal numers 128+s.
+ *
*/
#include <stdio.h>
@@ -137,7 +139,7 @@ struct signv {
int main (int argc, char *argv[]);
extern char *mybasename(char *);
int signame_to_signum (char *sig);
-int arg_to_signum (char *arg);
+int arg_to_signum (char *arg, int mask);
void nosig (char *name);
void printsig (int sig);
void printsignals (FILE *fp);
@@ -146,16 +148,19 @@ int kill_verbose (char *procname, int pid, int sig);
extern int *get_pids (char *, int);
-char version_string[] = "kill v2.0\n";
char *whoami;
int main (int argc, char *argv[])
{
int errors, numsig, pid;
- char *ep, *arg;
+ char *ep, *arg, *progname, *p;
int do_pid, do_kill, check_all;
int *pids, *ip;
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -174,11 +179,16 @@ int main (int argc, char *argv[])
if (*arg != '-') {
break;
}
+ if (! strcmp (arg, "--")) {
+ argc--, argv++;
+ break;
+ }
if (! strcmp (arg, "-u")) {
return usage (0);
}
- if (! strcmp (arg, "-v")) {
- fputs (version_string, stdout);
+ if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") ||
+ ! strcmp (arg, "--version")) {
+ printf(_("%s from %s\n"), progname, util_linux_version);
return 0;
}
if (! strcmp (arg, "-a")) {
@@ -193,9 +203,9 @@ int main (int argc, char *argv[])
if (argc > 2) {
return usage (1);
}
- /* argc == 2 */
+ /* argc == 2, accept "kill -l $?" */
arg = argv[1];
- if ((numsig = arg_to_signum (arg)) < 0) {
+ if ((numsig = arg_to_signum (arg, 1)) < 0) {
fprintf (stderr, _("%s: unknown signal %s\n"), whoami, arg);
return 1;
}
@@ -217,7 +227,7 @@ int main (int argc, char *argv[])
return usage (1);
argc--, argv++;
arg = *argv;
- if ((numsig = arg_to_signum (arg)) < 0) {
+ if ((numsig = arg_to_signum (arg, 0)) < 0) {
nosig (arg);
return 1;
}
@@ -231,7 +241,7 @@ int main (int argc, char *argv[])
if (do_kill)
break;
arg++;
- if ((numsig = arg_to_signum (arg)) < 0) {
+ if ((numsig = arg_to_signum (arg, 0)) < 0) {
return usage (1);
}
do_kill++;
@@ -284,13 +294,15 @@ int signame_to_signum (char *sig)
return (-1);
}
-int arg_to_signum (char *arg)
+int arg_to_signum (char *arg, int maskbit)
{
int numsig;
char *ep;
if (isdigit (*arg)) {
numsig = strtol (arg, &ep, 10);
+ if (numsig >= NSIG && maskbit && (numsig & 128) != 0)
+ numsig -= 128;
if (*ep != 0 || numsig < 0 || numsig >= NSIG)
return (-1);
return (numsig);
diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index 82df6be7a..b5459ed4c 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -31,6 +31,8 @@
.\"
.\" @(#)logger.1 8.1 (Berkeley) 6/6/93
.\"
+.\" Section on valid facitily and level strings added by
+.\" and1000@debian.org, 26 Oct 1997.
.Dd June 6, 1993
.Dt LOGGER 1
.Os BSD 4.3
@@ -78,6 +80,11 @@ Mark every line in the log with the specified
Write to socket as specified with
.Ar socket
instead of builtin syslog routines.
+.It --
+End the argument list. This is to allow the
+.Ar message
+to start with a hyphen (\-). This feature was not present in the
+original BSD logger command; it is a GNU-specific extra.
.It Ar message
Write the message to log; if not specified, and the
.Fl f
@@ -88,6 +95,15 @@ provided, standard input is logged.
The
.Nm logger
utility exits 0 on success, and >0 if an error occurs.
+.Pp
+Valid facility names are: auth, authpriv (for security information of
+a sensitive nature), cron, daemon, ftp, kern, lpr, mail, news,
+security (deprecated synonym for auth), syslog, user, uucp, and local0
+to local7, inclusive.
+.Pp
+Valid level names are: alert, crit, debug, emerg, err, error
+(deprecated synonym for err), info, notice, panic (deprecated synonym
+for emerg), warning, warn (deprecated synonym for warning).
.Sh EXAMPLES
.Bd -literal -offset indent -compact
logger System rebooted
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 4c881c968..9d848a660 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -210,6 +210,13 @@ main(argc, argv)
}
} else
while (fgets(buf, sizeof(buf), stdin) != NULL) {
+ /* glibc is buggy and adds an additional newline,
+ so we have to remove it here until glibc is fixed */
+ int len = strlen(buf);
+
+ if (len > 0 && buf[len - 1] == '\n')
+ buf[len - 1] = '\0';
+
if (!usock)
syslog(pri, "%s", buf);
else
diff --git a/misc-utils/look.1 b/misc-utils/look.1
index 872d4af75..2ab162c86 100644
--- a/misc-utils/look.1
+++ b/misc-utils/look.1
@@ -55,7 +55,11 @@ As
.Nm look
performs a binary search, the lines in
.Ar file
-must be sorted.
+must be sorted (where
+.Xr sort 1
+got the same options \-d and/or \-f that
+.Nm look
+is invoked with).
.Pp
If
.Ar file
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 9e6c15bf8..a8e826fa4 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -74,7 +74,7 @@ char *string;
char *comparbuf;
static char *binary_search (char *, char *);
-static int compare (char *, char *, int);
+static int compare (char *, char *);
static void err (const char *fmt, ...);
static char *linear_search (char *, char *);
static int look (char *, char *);
@@ -192,10 +192,6 @@ look(char *front, char *back)
* back points to the beginning of a line at or after the first
* matching line.
*
- * Base of the Invariants.
- * front = NULL;
- * back = EOF;
- *
* Advancing the Invariants:
*
* p = first newline after halfway point from front to back.
@@ -232,7 +228,7 @@ binary_search(char *front, char *back)
* infinitely loop.
*/
while (p < back && back > front) {
- if (compare(p, back, 1) == GREATER)
+ if (compare(p, back) == GREATER)
front = p;
else
back = p;
@@ -257,7 +253,7 @@ char *
linear_search(char *front, char *back)
{
while (front < back) {
- switch (compare(front, back, 1)) {
+ switch (compare(front, back)) {
case EQUAL: /* Found it. */
return (front);
break;
@@ -280,8 +276,8 @@ print_from(char *front, char *back)
{
int eol;
- while (front < back && compare(front, back, 1) == EQUAL) {
- if (compare(front, back, fflag) == EQUAL) {
+ while (front < back && compare(front, back) == EQUAL) {
+ if (compare(front, back) == EQUAL) {
eol = 0;
while (front < back && !eol) {
if (putchar(*front) == EOF)
@@ -311,7 +307,7 @@ print_from(char *front, char *back)
* in other locales.
*/
int
-compare(char *s2, char *s2end, int nocase) {
+compare(char *s2, char *s2end) {
int i;
char *p;
@@ -326,7 +322,7 @@ compare(char *s2, char *s2end, int nocase) {
*p = 0;
/* and compare */
- if (nocase)
+ if (fflag)
i = strncasecmp(comparbuf, string, stringlen);
else
i = strncmp(comparbuf, string, stringlen);
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index f110e6385..2541d03bc 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -255,11 +255,12 @@ register int lev;
(void)printf(" l %s -> %s", buf, sym);
if(symcount > 0 && symcount++ > MAXSYMLINKS){
- (void)printf(_(" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"));
+ (void)printf(_(" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"));
symcount = -1;
+ } else {
+ (void)printf("\n");
+ namei(sym, lev + 1);
}
- (void)printf("\n");
- namei(sym, lev + 1);
break;
case S_IFCHR:
diff --git a/misc-utils/rename.1 b/misc-utils/rename.1
new file mode 100644
index 000000000..37f99cc1b
--- /dev/null
+++ b/misc-utils/rename.1
@@ -0,0 +1,40 @@
+.\" Written by Andries E. Brouwer (aeb@cwi.nl)
+.\" Placed in the public domain
+.\"
+.TH RENAME 1 "1 Januari 2000" "" "Linux Programmer's Manual"
+.SH NAME
+rename \- Rename files
+.SH SYNOPSIS
+.BI rename " from to file..."
+.SH DESCRIPTION
+.B rename
+will rename the specified files by replacing the first occurrence of
+.I from
+in their name by
+.IR to .
+
+For example, given the files
+.IR foo1 ", ..., " foo9 ", " foo10 ", ..., " foo278 ,
+the commands
+
+.RS
+.nf
+rename foo foo0 foo?
+rename foo foo0 foo??
+.fi
+.RE
+
+will turn them into
+.IR foo001 ", ..., " foo009 ", " foo010 ", ..., " foo278 .
+
+And
+.RS
+.nf
+rename .htm .html *.htm
+.fi
+.RE
+
+will fix the extension of your html files.
+
+.SH "SEE ALSO"
+.BR mv (1)
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
new file mode 100644
index 000000000..af5ba44cc
--- /dev/null
+++ b/misc-utils/rename.c
@@ -0,0 +1,97 @@
+/*
+ * rename.c - aeb 2000-01-01
+ *
+--------------------------------------------------------------
+#!/bin/sh
+if [ $# -le 2 ]; then echo call: rename from to files; exit; fi
+FROM="$1"
+TO="$2"
+shift
+shift
+for i in $@; do N=`echo "$i" | sed "s/$FROM/$TO/g"`; mv "$i" "$N"; done
+--------------------------------------------------------------
+ * This shell script will do renames of files, but may fail
+ * in cases involving special characters. Here a C version.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "nls.h"
+
+static char *progname;
+
+int
+do_rename(char *from, char *to, char *s) {
+ char *newname, *where, *p, *q;
+ int flen, tlen, slen;
+
+ where = strstr(s, from);
+ if (where == NULL)
+ return 0;
+
+ flen = strlen(from);
+ tlen = strlen(to);
+ slen = strlen(s);
+ newname = malloc(tlen+slen+1);
+ if (newname == NULL) {
+ fprintf(stderr, _("%s: out of memory\n"), progname);
+ exit(1);
+ }
+
+ p = s;
+ q = newname;
+ while (p < where)
+ *q++ = *p++;
+ p = to;
+ while (*p)
+ *q++ = *p++;
+ p = where+flen;
+ while (*p)
+ *q++ = *p++;
+ *p = 0;
+
+ if (rename(s, newname) != 0) {
+ int errsv = errno;
+ fprintf(stderr, _("%s: renaming %s to %s failed: %s\n"),
+ progname, s, newname, strerror(errsv));
+ exit(1);
+ }
+
+ return 1;
+}
+
+int
+main(int argc, char **argv) {
+ char *from, *to, *p;
+ int i, ct;
+
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ if (argc == 2) {
+ if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
+ printf(_("%s from %s\n"),
+ progname, util_linux_version);
+ return 0;
+ }
+ }
+
+ if (argc < 3) {
+ fprintf(stderr, _("call: %s from to files...\n"), progname);
+ exit(1);
+ }
+
+ from = argv[1];
+ to = argv[2];
+
+ ct = 0;
+ for (i=3; i<argc; i++)
+ ct += do_rename(from, to, argv[i]);
+ return 0;
+}
diff --git a/misc-utils/setterm.1 b/misc-utils/setterm.1
index 3853a7132..0dbbdf42e 100644
--- a/misc-utils/setterm.1
+++ b/misc-utils/setterm.1
@@ -11,7 +11,6 @@ setterm \- set terminal attributes
.B "setterm [ \-reset ]"
.B "setterm [ \-initialize ]"
.B "setterm [ \-cursor [on|off] ]"
-.B "setterm [ \-keyboard pc|olivetti|dutch|extended ]"
.B "setterm [ \-repeat [on|off] ]"
.B "setterm [ \-appcursorkeys [on|off] ]"
.B "setterm [ \-linewrap [on|off] ]"
diff --git a/misc-utils/setterm.c b/misc-utils/setterm.c
index b9e4c0dad..36d3be190 100644
--- a/misc-utils/setterm.c
+++ b/misc-utils/setterm.c
@@ -12,7 +12,7 @@
*
* Sanity increases by Cafeine Addict [sic].
*
- * Powersave features by, todd j. derr <tjd@wordsmith.org>
+ * Powersave features by todd j. derr <tjd@wordsmith.org>
*
* Converted to terminfo by Kars de Jong (jongk@cs.utwente.nl)
*
@@ -27,7 +27,6 @@
* [ -reset ]
* [ -initialize ]
* [ -cursor [on|off] ]
- * [ -keyboard pc|olivetti|dutch|extended ]
* [ -repeat [on|off] ]
* [ -appcursorkeys [on|off] ]
* [ -linewrap [on|off] ]
@@ -162,7 +161,7 @@ extern int klogctl(int type, char *buf, int len);
/* Static variables. */
/* Option flags. Set if the option is to be invoked. */
-int opt_term, opt_reset, opt_initialize, opt_cursor, opt_keyboard;
+int opt_term, opt_reset, opt_initialize, opt_cursor;
int opt_linewrap, opt_snow, opt_softscroll, opt_default, opt_foreground;
int opt_background, opt_bold, opt_blink, opt_reverse, opt_underline;
int opt_store, opt_clear, opt_blank, opt_snap, opt_snapfile, opt_standout;
@@ -252,33 +251,6 @@ int *bad_arg; /* Set to true if an error is detected. */
}
}
-#if 0
-void parse_keyboard(argc, argv, option, opt_keyboard, bad_arg)
-int argc; /* Number of arguments for this option. */
-char *argv[]; /* Arguments for this option. */
-int *option; /* Keyboard flag to set. */
-int *opt_keyboard; /* Keyboard type to set. */
-int *bad_arg; /* Set to true if an error is detected. */
-{
-/* Parse a -keyboard specification. */
-
- if (argc != 1 || *option) *bad_arg = TRUE;
- *option = TRUE;
- if (argc == 1) {
- if (strcmp(argv[0], "pc") == 0)
- *opt_keyboard = PC;
- else if (strcmp(argv[0], "olivetti") == 0)
- *opt_keyboard = OLIVETTI;
- else if (strcmp(argv[0], "dutch") == 0)
- *opt_keyboard = DUTCH;
- else if (strcmp(argv[0], "extended") == 0)
- *opt_keyboard = EXTENDED;
- else
- *bad_arg = TRUE;
- }
-}
-#endif
-
void par_color(argc, argv, option, opt_color, bad_arg)
int argc; /* Number of arguments for this option. */
char *argv[]; /* Arguments for this option. */
@@ -659,10 +631,6 @@ int *bad_arg; /* Set to true if an error is detected. */
parse_none(argc, argv, &opt_initialize, bad_arg);
else if (STRCMP(option, "cursor") == 0)
parse_switch(argc, argv, &opt_cursor, &opt_cu_on, bad_arg);
-#if 0
- else if (STRCMP(option, "keyboard") == 0)
- parse_keyboard(argc, argv, &opt_keyboard, &opt_ke_type, bad_arg);
-#endif
else if (STRCMP(option, "repeat") == 0)
parse_switch(argc, argv, &opt_repeat, &opt_rep_on, bad_arg);
else if (STRCMP(option, "appcursorkeys") == 0)
@@ -752,7 +720,6 @@ char *prog_name; /* Name of this program. */
#if 0
fprintf(stderr, _(" [ -snow [on|off] ]\n"));
fprintf(stderr, _(" [ -softscroll [on|off] ]\n"));
- fprintf(stderr, _(" [ -keyboard pc|olivetti|dutch|extended ]\n"));
#endif
fprintf(stderr, _(" [ -repeat [on|off] ]\n"));
fprintf(stderr, _(" [ -appcursorkeys [on|off] ]\n"));
@@ -833,26 +800,6 @@ int vcterm; /* Set if terminal is a virtual console. */
putp(ti_entry("civis"));
}
-#if 0
- /* -keyboard pc|olivetti|dutch|extended. Vc only. */
- if (opt_keyboard && vcterm) {
- switch (opt_ke_type) {
- case PC:
- printf("%s%s%s", DCS, _("keyboard.pc"), ST);
- break;
- case OLIVETTI:
- printf("%s%s%s", DCS, _("keyboard.olivetti"), ST);
- break;
- case DUTCH:
- printf("%s%s%s", DCS, _("keyboard.dutch"), ST);
- break;
- case EXTENDED:
- printf("%s%s%s", DCS, _("keyboard.extended"), ST);
- break;
- }
- }
-#endif
-
/* -linewrap [on|off]. Vc only (vt102) */
if (opt_linewrap && vcterm) {
if (opt_li_on)
diff --git a/misc-utils/sparc-solaris-hostid.sh b/misc-utils/sparc-solaris-hostid.sh
new file mode 100755
index 000000000..7ce28ac5e
--- /dev/null
+++ b/misc-utils/sparc-solaris-hostid.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# This script reproduces the output of the Solaris hostid program.
+# It might be put in /usr/bin/hostid or so.
+# Note that the hostid program does not have any known uses
+# and does not exist on other architectures.
+# Copyright 1999 Peter Jones, <pjones@redhat.com> .
+# GPL and all that good stuff apply.
+(
+idprom=`cat /proc/openprom/idprom`
+echo $idprom|dd bs=1 skip=2 count=2
+echo $idprom|dd bs=1 skip=27 count=6
+echo
+) 2>/dev/null
diff --git a/misc-utils/tsort.c b/misc-utils/tsort.c
index 627897667..a1fab2a9e 100644
--- a/misc-utils/tsort.c
+++ b/misc-utils/tsort.c
@@ -39,6 +39,7 @@
*/
#include <sys/types.h>
+#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
@@ -87,7 +88,7 @@ typedef struct _buf {
NODE *add_node(), *find_node();
void add_arc(), no_memory(), remove_node(), tsort();
-char *grow_buf(), *malloc();
+char *grow_buf();
int find_cycle(NODE *, NODE *, int, int);
extern int errno;
@@ -168,8 +169,6 @@ grow_buf(bp, size)
char *bp;
int size;
{
- char *realloc();
-
if (!(bp = realloc(bp, (u_int)size)))
no_memory();
return(bp);
diff --git a/mount/Makefile b/mount/Makefile
index 0d370ff8c..443e8f783 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -1,7 +1,6 @@
include ../make_include
include ../MCONFIG
-CC = gcc
CFLAGS = -I$(LIB) $(OPT)
WARNFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes
DEFINES = -DHAVE_NFS
@@ -9,17 +8,6 @@ DEFINES = -DHAVE_NFS
RPCSVCDIR = rpcsvc
RPC_CFLAGS = -Wno-unused
RPCGEN = rpcgen
-#INSTALL = install
-#INSTALLSUID = $(INSTALL) -m 4755 -o root
-#INSTALLPROG = $(INSTALL) -m 755
-#INSTALLDATA = $(INSTALL) -m 644
-
-## for suid progs (mount, umount)
-#BINDIR = /bin
-## for nosuid progs (swapon)
-#SBINDIR = /sbin
-
-# End of configuration section.
COMPILE = $(CC) -c $(WARNFLAGS) $(CFLAGS) $(DEFINES)
LINK = $(CC) $(LDFLAGS)
@@ -67,7 +55,7 @@ swapon: swapon.o version.o
losetup: losetup.o
$(LINK) $^ -o $@
-mount.o umount.o nfsmount.o losetup.o fstab.o sundries.o: sundries.h
+mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h
mount.o umount.o fstab.o sundries.o: fstab.h
@@ -89,6 +77,8 @@ umount.o: mount_constants.h
mount.o mount_by_label.o mount_guess_fstype.o: linux_fs.h
+sundries.o realpath.o: realpath.h
+
nfsmount_clnt.o: nfsmount_clnt.c
$(COMPILE) $(RPC_CFLAGS) nfsmount_clnt.c
diff --git a/mount/fstab.5 b/mount/fstab.5
index 5b85fb996..6d7638e4a 100644
--- a/mount/fstab.5
+++ b/mount/fstab.5
@@ -189,7 +189,11 @@ The documentation in
.BR mount (8)
is often more up-to-date.
.SH "SEE ALSO"
-.BR getmntent "(3), " mount "(8), " swapon "(8), " nfs (5)
+.BR getmntent (3),
+.BR mount (8),
+.BR swapon (8),
+.BR fs (5)
+.BR nfs (5)
.SH HISTORY
The
.B fstab
diff --git a/mount/fstab.c b/mount/fstab.c
index 793caddde..aef26d90c 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -224,6 +224,23 @@ getmntoptfile (const char *file)
return NULL;
}
+/* Find the entry (SPEC,FILE) in fstab */
+struct mntentchn *
+getfsspecfile (const char *spec, const char *file) {
+ struct mntentchn *mc;
+
+ for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
+ if (streq (mc->mnt_dir, file) && streq (mc->mnt_fsname, spec))
+ return mc;
+ for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
+ if ((streq (mc->mnt_dir, file) ||
+ streq (canonicalize(mc->mnt_dir), file))
+ && (streq (mc->mnt_fsname, spec) ||
+ streq (canonicalize(mc->mnt_fsname), spec)))
+ break;
+ return mc;
+}
+
/* Find the dir FILE in fstab. */
struct mntentchn *
getfsfile (const char *file) {
@@ -401,6 +418,8 @@ lock_mtab (void) {
}
we_created_lockfile = 1;
} else {
+ static int tries = 0;
+
/* Someone else made the link. Wait. */
alarm(LOCK_TIMEOUT);
if (fcntl (fd, F_SETLKW, &flock) == -1) {
@@ -410,7 +429,15 @@ lock_mtab (void) {
_("timed out") : strerror (errsv));
}
alarm(0);
- /* Maybe limit the number of iterations? */
+ /* Limit the number of iterations - maybe there
+ still is some old /etc/mtab~ */
+ if (tries++ > 3) {
+ if (tries > 5)
+ die (EX_FILEIO, _("Cannot create link %s\n"
+ "Perhaps there is a stale lock file?\n"),
+ MOUNTED_LOCK);
+ sleep(1);
+ }
}
close(fd);
diff --git a/mount/fstab.h b/mount/fstab.h
index acd8f6271..65bf5dba6 100644
--- a/mount/fstab.h
+++ b/mount/fstab.h
@@ -28,6 +28,7 @@ struct mntentchn *getmntfilesbackward (const char *file, struct mntentchn *mc);
struct mntentchn *fstab_head (void);
struct mntentchn *getfsfile (const char *file);
struct mntentchn *getfsspec (const char *spec);
+struct mntentchn *getfsspecfile (const char *spec, const char *file);
struct mntentchn *getfsuuidspec (const char *uuid);
struct mntentchn *getfsvolspec (const char *label);
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index bd9243b55..635389a01 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -91,6 +91,7 @@ struct ntfs_super_block {
struct fat_super_block {
u_char s_dummy[3];
u_char s_os[8]; /* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */
+ /* mtools-3.9.4 writes "MTOOL394" */
u_char s_dummy2[32];
u_char s_label[11]; /* for DOS? */
u_char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */
diff --git a/mount/losetup.c b/mount/losetup.c
index 911d73060..9f20ee8b6 100644
--- a/mount/losetup.c
+++ b/mount/losetup.c
@@ -103,7 +103,8 @@ int set_loop(const char *device, const char *file, int offset,
loopinfo.lo_name[LO_NAME_SIZE-1] = 0;
if (encryption && (loopinfo.lo_encrypt_type = crypt_type(encryption))
< 0) {
- fprintf(stderr,_("Unsupported encryption type %s\n"),encryption);
+ fprintf(stderr,_("Unsupported encryption type %s\n"),
+ encryption);
exit(1);
}
loopinfo.lo_offset = offset;
@@ -129,7 +130,8 @@ int set_loop(const char *device, const char *file, int offset,
(islower(pass[i]) ? toupper(pass[i]) :
pass[i])-'A'+10 : pass[i]-'0') << (i & 7)*4;
else {
- fprintf(stderr,_("Non-hex digit '%c'.\n"),pass[i]);
+ fprintf(stderr,_("Non-hex digit '%c'.\n"),
+ pass[i]);
exit(1);
}
break;
@@ -183,6 +185,7 @@ int main(int argc, char **argv)
{
char *offset,*encryption;
int delete,off,c;
+ int res = 0;
int ro = 0;
setlocale(LC_ALL, "");
@@ -219,9 +222,9 @@ int main(int argc, char **argv)
} else {
if (offset && sscanf(offset,"%d",&off) != 1)
usage();
- set_loop(argv[optind],argv[optind+1],off,encryption,&ro);
+ res = set_loop(argv[optind],argv[optind+1],off,encryption,&ro);
}
- return 0;
+ return res;
}
#else /* LOOP_SET_FD not defined */
diff --git a/mount/mk_loop_h b/mount/mk_loop_h
index dfeff296e..86e76f35e 100644
--- a/mount/mk_loop_h
+++ b/mount/mk_loop_h
@@ -14,8 +14,10 @@ rm -f loop.h
if [ -f /usr/include/linux/posix_types.h ]; then
echo '#include <linux/posix_types.h>' >> loop.h
+ echo '#undef dev_t' >> loop.h
echo '#define dev_t __kernel_dev_t' >> loop.h
else
+ echo '#undef dev_t' >> loop.h
echo '#define dev_t unsigned short' >> loop.h
fi
diff --git a/mount/mntent.c b/mount/mntent.c
index ac9cce823..d28171b98 100644
--- a/mount/mntent.c
+++ b/mount/mntent.c
@@ -86,10 +86,10 @@ unmangle(char *s) {
/*
* fstat'ing the file and allocating a buffer holding all of it
- * may be a bad idea: if the file is /proc/mounttab, the stat
+ * may be a bad idea: if the file is /proc/mounts, the stat
* returns 0.
* (On the other hand, mangling and unmangling is meaningless
- * for /proc/mounttab.)
+ * for /proc/mounts.)
*/
mntFILE *
diff --git a/mount/mount.8 b/mount/mount.8
index f42375fdc..4aba358c2 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -33,6 +33,8 @@
.\" 970914, reg: -s option
.\" 981111, K.Garloff: /etc/filesystems
.\" 990111, aeb: documented /sbin/mount.smbfs
+.\" 990730, Yann Droneaud <lch@multimania.com>: updated page
+.\" 991214, Elrond <Elrond@Wunder-Nett.org>: added some docs on devpts
.\"
.TH MOUNT 8 "14 September 1997" "Linux 2.0" "Linux Programmer's Manual"
.SH NAME
@@ -175,6 +177,14 @@ instead of
in the
.I fstab
line.
+The
+.B owner
+option is similar to the
+.B user
+option, with the restriction that the user must be the owner
+of the special file. This may be useful e.g. for
+.I /dev/fd
+if a login script makes the console user owner of this device.
The programs
.B mount
@@ -202,7 +212,11 @@ option below). It is possible to replace
by a symbolic link to
.IR /proc/mounts ,
but some information is lost that way, and in particular
-working with the loop device will be less convenient.
+working with the loop device will be less convenient. Also,
+pathnames containing spaces are handled correctly by
+.I /etc/mtab
+but not (yet) by
+.IR /proc/mounts .
.SH OPTIONS
The full set of options used by an invocation of
@@ -294,31 +308,35 @@ The argument following the
is used to indicate the file system type. The file system types which are
currently supported are listed in
.IR linux/fs/filesystems.c :
-.IR minix ,
-.IR xiafs ,
-.IR ext ,
-.IR ext2 ,
-.IR msdos ,
-.IR umsdos ,
-.IR vfat ,
-.IR proc ,
-.IR autofs ,
-.IR devpts ,
-.IR nfs ,
-.IR iso9660 ,
-.IR smbfs ,
-.IR ncpfs ,
.IR adfs ,
.IR affs ,
+.IR autofs ,
.IR coda ,
+.IR coherent ,
+.IR devpts ,
+.IR efs ,
+.IR ext ,
+.IR ext2 ,
.IR hfs ,
.IR hpfs ,
+.IR iso9660 ,
+.IR minix ,
+.IR msdos ,
+.IR ncpfs ,
+.IR nfs ,
.IR ntfs ,
+.IR proc ,
.IR qnx4 ,
.IR romfs ,
+.IR smbfs ,
+.IR sysv ,
+.IR udf ,
.IR ufs ,
-.IR sysv ", " xenix ", " coherent .
-Note that the last three are equivalent and that
+.IR umsdos ,
+.IR vfat ,
+.IR xenix ,
+.IR xiafs .
+Note that coherent, sysv and xenix are equivalent and that
.I xenix
and
.I coherent
@@ -355,6 +373,7 @@ option is given, or if the
.B auto
type is specified, the superblock is probed for the filesystem type
.RI ( minix ", " ext ", " ext2 ", " xiafs ", " iso9660 ", " romfs
+.RI , ufs ", " ntfs ", " qnx4 ", " bfs
are supported).
If this probe fails, mount will try to read the file
.IR /etc/filesystems ,
@@ -362,6 +381,7 @@ or, if that does not exist,
.IR /proc/filesystems .
All of the filesystem types listed there will be tried,
except for those that are labeled "nodev" (e.g.,
+.IR devpts ,
.I proc
and
.IR nfs ).
@@ -537,6 +557,32 @@ These options are accepted but ignored.
.SH "Mount options for coherent"
None.
+.SH "Mount options for devpts"
+The devpts file system is a pseudo file system, traditionally mounted on
+.IR /dev/pts .
+In order to acquire a pseudo terminal, a process opens
+.IR /dev/ptmx ;
+the number of the pseudo terminal is then made available to the process
+and the pseudo terminal slave can be accessed as
+.IR /dev/pts/ <number>.
+.TP
+\fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP
+This sets the owner or the group of newly created PTYs to
+the specified values. When nothing is specified, they will
+be set to the UID and GID of the creating process.
+For example, if there is a tty group with GID 5, then
+.B gid=5
+will cause newly created PTYs to belong to the tty group.
+.TP
+.BI mode= value
+Set the mode of newly created PTYs to the specified value.
+The default is 0600.
+A value of
+.B mode=620
+and
+.B gid=5
+makes "mesg y" the default on newly created PTYs.
+
.SH "Mount options for ext"
None.
Note that the `ext' file system is obsolete. Don't use it.
@@ -619,11 +665,15 @@ These options determine who can use the reserved blocks.
Instead of block 1, use block
.I n
as superblock. This could be useful when the filesystem has been damaged.
-Usually, copies of the superblock are found every 8192 blocks: in
-block 1, 8193, 16385, ...
-(Thus, one gets hundreds or even thousands of copies of the superblock
-on a big filesystem. I do not know of options to mke2fs that would
-cause fewer copies to be written.)
+(Earlier, copies of the superblock would be made every 8192 blocks: in
+block 1, 8193, 16385, ... (and one got hundreds or even thousands
+of copies on a big filesystem). Since version 1.08,
+.B mke2fs
+has a \-s (sparse superblock) option to reduce the number of backup
+superblocks, and since version 1.15 this is the default. Note
+that this may mean that ext2 filesystems created by a recent
+.B mke2fs
+cannot be mounted r/w under Linux 2.0.*.)
.TP
.BR grpquota " / " noquota " / " quota " / " usrquota
These options are accepted but ignored.
@@ -638,7 +688,7 @@ and
.I vfat
filesystems.)
.TP
-.BR blocksize=512 " / " blocksize=1024
+.BR blocksize=512 " / " blocksize=1024 " / " blocksize=2048
Set blocksize (default 512).
.TP
\fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP
@@ -673,6 +723,10 @@ that are sometimes used on Linux, but are not accepted by MS-DOS are
rejected. (+, =, spaces, etc.)
.RE
.TP
+.BI codepage= value
+Sets the codepage for converting to shortname characters on FAT
+and VFAT filesystems. By default, codepage 437 is used.
+.TP
.BR conv=b[inary] " / " conv=t[ext] " / " conv=a[uto]
The
.I fat
@@ -703,6 +757,15 @@ For file systems mounted in binary mode, a conversion tool
(fromdos/todos) is available.
.RE
.TP
+.BI cvf_format= module
+Forces the driver to use the CVF (Compressed Volume File) module
+.RI cvf_ module
+instead of auto-detection. If the kernel supports kmod, the
+cvf_format=xxx option also controls on-demand CVF module loading.
+.TP
+.BI cvf_option= option
+Option passed to the CVF module.
+.TP
.B debug
Turn on the
.I debug
@@ -710,10 +773,15 @@ flag. A version string and a list of file system parameters will be
printed (these data are also printed if the parameters appear to be
inconsistent).
.TP
-.BR fat=12 " / " fat=16
-Specify either a 12 bit fat or a 16 bit fat. This overrides
+.BR fat=12 " / " fat=16 " / " fat=32
+Specify a 12, 16 or 32 bit fat. This overrides
the automatic FAT type detection routine. Use with caution!
.TP
+.BI iocharset= value
+Character set to use for converting between 8 bit characters
+and 16 bit Unicode characters. The default is iso8859-1.
+Long filenames are stored on disk in Unicode format.
+.TP
.B quiet
Turn on the
.I quiet
@@ -774,6 +842,9 @@ that it is read-only, of course).
.B norock
Disable the use of Rock Ridge extensions, even if available. Cf.\&
.BR map .
+.B nojoliet
+Disable the use of Microsoft Joliet extensions, even if available. Cf.\&
+.BR map .
.TP
.BR check=r[elaxed] " / " check=s[trict]
With
@@ -792,7 +863,7 @@ possibly overriding the information found in the Rock Ridge extensions.
(Default:
.BR uid=0,gid=0 .)
.TP
-.BR map=n[ormal] " / " map=o[ff]
+.BR map=n[ormal] " / " map=o[ff] " / " map=a[corn]
For non-Rock Ridge volumes, normal name translation maps upper
to lower case ASCII, drops a trailing `;1', and converts `;' to `.'.
With
@@ -801,6 +872,10 @@ no name translation is done. See
.BR norock .
(Default:
.BR map=normal .)
+.B map=acorn
+is like
+.BR map=normal
+but also apply Acorn extensions if present.
.TP
.BI mode= value
For non-Rock Ridge volumes, give all files the indicated mode.
@@ -821,7 +896,7 @@ Set the block size to the indicated value.
.BR conv=binary .)
Since Linux 1.3.54 this option has no effect anymore.
(And non-binary settings used to be very dangerous,
-often leading to silent data corruption.)
+possibly leading to silent data corruption.)
.TP
.B cruft
If the high byte of the file length contains other garbage,
@@ -830,6 +905,12 @@ This implies that a file cannot be larger than 16MB.
The `cruft' option is set automatically if the entire CDROM
has a weird size (negative, or more than 800MB). It is also
set when volume sequence numbers other than 0 or 1 are seen.
+.TP
+.B session=x
+Select number of session on multisession CD. (Since 2.3.4.)
+.TP
+.B sbsector=xxx
+Session begins from sector xxx. (Since 2.3.4.)
.SH "Mount options for minix"
None.
@@ -926,6 +1007,30 @@ Usually it just causes lots of trouble.
.B nolock
Do not use locking. Do not start lockd.
+.SH "Mount options for ntfs"
+.TP
+.BI iocharset= name
+Character set to use when returning file names.
+Unlike VFAT, NTFS suppresses names that contain
+unconvertible characters.
+.TP
+.BR utf8
+Use UTF-8 for converting file names.
+.TP
+.B uni_xlate=[0|1|2]
+For 0 (or `no' or `false') or 1 (or `yes' or `true'):
+use the VFAT-style encoding for file names outside the current
+character set. A value of 2 will disable the encoding with ":".
+.TP
+.B posix=[0|1]
+If enabled (posix=1), the file system distinguishes between
+upper and lower case. The 8.3 alias names are presented as
+hard links instead of being suppressed.
+.TP
+\fBuid=\fP\fIvalue\fP, \fBgid=\fP\fIvalue\fP and \fBumask=\fP\fIvalue\fP
+Set the file permission on the filesystem.
+By default, the files are owned by root and not readable by somebody else.
+
.SH "Mount options for proc"
.TP
\fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP
@@ -943,13 +1048,109 @@ to the mount system call. This argument is constructed by
.BR smbmount (8)
and the current version of
.B mount
-(2.6c) does not know anything about smb.
+(2.9w) does not know anything about smb.
.SH "Mount options for sysv"
None.
+.SH "Mount options for udf"
+.TP
+.B gid=
+Set the default group.
+.TP
+.B umask=
+Set the default umask.
+.TP
+.B uid=
+Set the default user.
+.TP
+.B unhide
+Show otherwise hidden files.
+.TP
+.B undelete
+Show deleted files in lists.
+.TP
+.B strict
+Set strict conformance (unused).
+.TP
+.B utf8
+(unused).
+.TP
+.B iocharset
+(unused).
+.TP
+.B bs=
+Set the block size. (May not work unless 2048.)
+.TP
+.B novrs
+Skip volume sequence recognition.
+.TP
+.B session=
+Set the CDROM session counting from 0. Default: last session.
+.TP
+.B anchor=
+Override standard anchor location. Default: 256.
+.TP
+.B volume=
+Override the VolumeDesc location. (unused)
+.TP
+.B partition=
+Override the PartitionDesc location. (unused)
+.TP
+.B lastblock=
+Set the last block of the filesystem.
+.TP
+.B fileset=
+Override the fileset block location. (unused)
+.TP
+.B rootdir=
+Override the root directory location. (unused)
+
.SH "Mount options for ufs"
-None.
+.TP
+.BI ufstype= value
+UFS is a file system widely used in different operating systems.
+The problem are differences among implementations. Features of some
+implementations are undocumented, so its hard to recognize the
+type of ufs automatically.
+That's why user must specify the type of ufs by mount option.
+Possible values are:
+.RS
+.TP
+.B old
+Old format of ufs, this is the default, read only.
+.TP
+.B 44bsd
+For filesystems created by a BSD-like system (NetBSD,FreeBSD,OpenBSD).
+.TP
+.B sun
+For filesystems created by SunOS or Solaris on Sparc.
+.TP
+.B sunx86
+For filesystems created by Solaris on x86.
+.TP
+.B nextstep
+For filesystems created by NeXTStep (on NeXT station) (currently read only).
+.TP
+.B nextstep-cd
+For NextStep CDROMs (block_size == 2048), read-only.
+.TP
+.B openstep
+For filesystems created by OpenStep (currently read only).
+.RE
+
+.TP
+.BI onerror= value
+Set behaviour on error:
+.RS
+.TP
+.B panic
+If an error is encountered, cause a kernel panic.
+.TP
+.B [lock|umount|repair]
+These mount options don't do anything at present;
+when an error is encountered only a console message is printed.
+.RE
.SH "Mount options for umsdos"
See mount options for msdos.
@@ -984,6 +1185,11 @@ Allow two files with names that only differ in case.
First try to make a short name without sequence number,
before trying
.IR name~num.ext .
+.TP
+.B utf8
+UTF8 is the filesystem safe 8-bit encoding of Unicode that is used
+by the console. It can be be enabled for the filesystem with this option.
+If `uni_xlate' gets set, UTF8 gets disabled.
.SH "Mount options for xenix"
None.
diff --git a/mount/mount.c b/mount/mount.c
index 9f51db310..6c1f40a29 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -32,6 +32,8 @@
* - fixed strerr(errno) in gettext calls
* 1999-07-05 Hirokazu Takahashi <h-takaha@sss.abk.nec.co.jp>
* - fixed use of nouser option
+ * 1999-09-09 Michael K. Johnson <johnsonm@redhat.com>
+ * - added `owner' mount option
*/
#include <unistd.h>
@@ -107,6 +109,7 @@ struct opt_map
#define MS_NOAUTO 0x80000000
#define MS_USERS 0x40000000
#define MS_USER 0x20000000
+#define MS_OWNER 0x10000000
#define MS_LOOP 0x00010000
/* Options that we keep the mount system call from seeing. */
@@ -115,9 +118,12 @@ struct opt_map
/* Options that we keep from appearing in the options field in the mtab. */
#define MS_NOMTAB (MS_REMOUNT|MS_NOAUTO|MS_USERS|MS_USER)
-/* OPTIONS that we make ordinary users have by default. */
+/* Options that we make ordinary users have by default. */
#define MS_SECURE (MS_NOEXEC|MS_NOSUID|MS_NODEV)
+/* Options that we make owner-mounted devices have by default */
+#define MS_OWNERSECURE (MS_NOSUID|MS_NODEV)
+
const struct opt_map opt_map[] = {
{ "defaults", 0, 0, 0 }, /* default options */
{ "ro", 1, 0, MS_RDONLY }, /* read-only */
@@ -137,6 +143,8 @@ const struct opt_map opt_map[] = {
{ "nousers", 0, 1, MS_USERS }, /* Forbid ordinary user to mount */
{ "user", 0, 0, MS_USER }, /* Allow ordinary user to mount */
{ "nouser", 0, 1, MS_USER }, /* Forbid ordinary user to mount */
+ { "owner", 0, 0, MS_OWNER }, /* Let the owner of the device mount */
+ { "noowner", 0, 1, MS_OWNER }, /* Device owner has no special privs */
/* add new options here */
#ifdef MS_NOSUB
{ "sub", 0, 1, MS_NOSUB }, /* allow submounts */
@@ -244,6 +252,8 @@ parse_opt (const char *opt, int *mask, char *extra_opts)
if ((om->mask == MS_USER || om->mask == MS_USERS)
&& !om->inv)
*mask |= MS_SECURE;
+ if ((om->mask == MS_OWNER) && !om->inv)
+ *mask |= MS_OWNERSECURE;
#ifdef MS_SILENT
if (om->mask == MS_SILENT && om->inv) {
mount_quiet = 1;
@@ -377,6 +387,7 @@ create_mtab (void) {
/* count successful mount system calls */
static int mountcount = 0;
+/* returns 0: OK, -1: error */
static int
mount5 (struct mountargs *args) {
int ret = mount (args->spec, args->node, args->type,
@@ -386,9 +397,9 @@ mount5 (struct mountargs *args) {
return ret;
}
-/* Mount a single file system. Return status,
- so don't exit on non-fatal errors. */
-
+/* Mount a single file system.
+ Return status: 0: OK, -1: error in errno, 1: other error
+ don't exit on non-fatal errors. */
static int
try_mount5 (char *spec, char *node, char **type, int flags, char *mount_opts) {
struct mountargs args = { spec, node, NULL, flags & ~MS_NOSYS, mount_opts };
@@ -396,8 +407,14 @@ try_mount5 (char *spec, char *node, char **type, int flags, char *mount_opts) {
if (*type && strcasecmp (*type, "auto") == 0)
*type = NULL;
- if (!*type && !(flags & MS_REMOUNT))
+ if (!*type && !(flags & MS_REMOUNT)) {
*type = guess_fstype_from_superblock(spec);
+ if (*type && !strcmp(*type, "swap")) {
+ error(_("%s looks like swapspace - not mounted"), spec);
+ *type = NULL;
+ return 1;
+ }
+ }
if (*type || (flags & MS_REMOUNT)) {
args.type = *type;
@@ -419,6 +436,7 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
const char *opts0, int freq, int pass, int bg, int ro) {
struct mntentchn mcn;
struct mntent mnt;
+ int mnt5_res = 0; /* only for gcc */
int mnt_err;
int flags;
char *extra_opts; /* written in mtab */
@@ -438,6 +456,26 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
/* root may allow certain types of mounts by ordinary users */
if (suid) {
+ /* RedHat patch: allow owners to mount when fstab contains
+ the owner option. Note that this should never be used
+ in a high security environment, but may be useful to give
+ people at the console the possibility of mounting a floppy. */
+ if (flags & MS_OWNER) {
+ if (!strncmp(spec0, "/dev/", 5)) {
+ struct stat sb;
+
+ if (!stat(spec0, &sb)) {
+ if (getuid() == sb.st_uid)
+ flags |= MS_USER;
+ }
+ }
+ }
+ /* James Kehl <mkehl@gil.com.au> came with a similar patch:
+ allow an arbitrary user to mount when he is the owner of
+ the mount-point and has write-access to the device.
+ This is even less secure. Let me skip it for the time being;
+ there should be an explicit fstab line allowing such things. */
+
if (!(flags & (MS_USER | MS_USERS))) {
if (already (spec, node))
die (EX_USAGE, _("mount failed"));
@@ -448,6 +486,9 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
user = getusername();
}
+ if (flags & MS_OWNER)
+ flags &= ~MS_OWNER;
+
/* quietly succeed for fstab entries that don't get mounted automatically */
if (all && (flags & MS_NOAUTO))
return 0;
@@ -538,7 +579,8 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
sprintf(mountprog, "/sbin/mount.%s", type);
if (stat(mountprog, &statbuf) == 0) {
- if (fork() == 0) {
+ int res;
+ if ((res = fork()) == 0) {
char *oo, *mountargs[10];
int i = 0;
@@ -559,7 +601,7 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
mountargs[i] = NULL;
execv(mountprog, mountargs);
exit(1); /* exec failed */
- } else if (fork() != -1) {
+ } else if (res != -1) {
int status;
wait(&status);
return status;
@@ -572,10 +614,11 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
block_signals (SIG_BLOCK);
- if (fake
- || (try_mount5 (spec, node, &type, flags & ~MS_NOSYS, mount_opts)) == 0)
+ if (!fake)
+ mnt5_res = try_mount5 (spec, node, &type, flags & ~MS_NOSYS, mount_opts);
+
+ if (fake || mnt5_res == 0) {
/* Mount succeeded, report this (if verbose) and write mtab entry. */
- {
if (loop)
opt_loopdev = loopdev;
@@ -619,7 +662,7 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
block_signals (SIG_UNBLOCK);
return 0;
- }
+ }
mnt_err = errno;
@@ -630,11 +673,17 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
/* Mount failed, complain, but don't die. */
- if (type == 0)
- error (_("mount: you must specify the filesystem type"));
- else
- switch (mnt_err)
- {
+ if (type == 0) {
+ if (suid)
+ error (_("mount: I could not determine the filesystem type, "
+ "and none was specified"));
+ else
+ error (_("mount: you must specify the filesystem type"));
+ } else if (mnt5_res != -1) {
+ /* should not happen */
+ error (_("mount: mount failed"));
+ } else {
+ switch (mnt_err) {
case EPERM:
if (geteuid() == 0) {
if (stat (node, &statbuf) || !S_ISDIR(statbuf.st_mode))
@@ -775,6 +824,7 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
default:
error ("mount: %s", strerror (mnt_err)); break;
}
+ }
return EX_FAIL;
}
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index 8e8207223..9e3a54a48 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -13,6 +13,9 @@
*
* Wed Nov 11 11:33:55 1998: K.Garloff@ping.de, try /etc/filesystems before
* /proc/filesystems
+ * [This was mainly in order to specify vfat before fat; these days we often
+ * detect *fat and then assume vfat, so perhaps /etc/filesystems isnt
+ * so useful anymore.]
*
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
* - added Native Language Support
@@ -67,12 +70,17 @@ swapped(unsigned short a) {
Added ufs from a patch by jj. But maybe there are several types of ufs?
Added ntfs from a patch by Richard Russon.
Added a very weak heuristic for vfat - aeb
+ Added qnx4 - aeb
+ Added swap - aeb
- Currently supports: minix, ext, ext2, xiafs, iso9660, romfs, ufs, ntfs, vfat
+ Currently supports: minix, ext, ext2, xiafs, iso9660, romfs,
+ ufs, ntfs, vfat, qnx4, bfs
*/
static char
*magic_known[] = { "minix", "ext", "ext2", "xiafs", "iso9660", "romfs",
- "ufs", "ntfs" };
+ "ufs", "ntfs", "qnx4", "bfs", "udf",
+ "swap" /* last - just to warn the user */
+};
static int
tested(const char *device) {
@@ -84,6 +92,32 @@ tested(const char *device) {
return 0;
}
+/* udf magic - I find that trying to mount garbage as an udf fs
+ causes a very large kernel delay, almost killing the machine.
+ So, we do not try udf unless there is positive evidence that it
+ might work. Try iso9660 first, it is much more likely.
+
+ Strings below taken from ECMA 167. */
+static char
+*udf_magic[] = { "BEA01", "BOOT2", "CD001", "CDW02", "NSR02",
+ "NSR03", "TEA01" };
+
+static int
+may_be_udf(const char *id) {
+ char **m;
+
+ for (m = udf_magic; m - udf_magic < SIZE(udf_magic); m++)
+ if (!strncmp(*m, id, 5))
+ return 1;
+ return 0;
+}
+
+static int
+may_be_swap(const char *s) {
+ return (strncmp(s-10, "SWAP-SPACE", 10) == 0 ||
+ strncmp(s-10, "SWAPSPACE2", 10) == 0);
+}
+
static char *
fstype(const char *device) {
int fd;
@@ -96,6 +130,8 @@ fstype(const char *device) {
union {
struct xiafs_super_block xiasb;
char romfs_magic[8];
+ char qnx4fs_magic[10]; /* ignore first 4 bytes */
+ long bfs_magic;
struct ntfs_super_block ntfssb;
struct fat_super_block fatsb;
} xsb;
@@ -141,11 +177,17 @@ fstype(const char *device) {
type = "xiafs";
else if(!strncmp(xsb.romfs_magic, "-rom1fs-", 8))
type = "romfs";
+ else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6))
+ type = "qnx4fs";
+ else if(xsb.bfs_magic == 0x1badface)
+ type = "bfs";
else if(!strncmp(xsb.ntfssb.s_magic, NTFS_SUPER_MAGIC,
sizeof(xsb.ntfssb.s_magic)))
type = "ntfs";
else if ((!strncmp(xsb.fatsb.s_os, "MSDOS", 5) ||
- !strncmp(xsb.fatsb.s_os, "MSWIN", 5))
+ !strncmp(xsb.fatsb.s_os, "MSWIN", 5) ||
+ !strncmp(xsb.fatsb.s_os, "MTOOL", 5) ||
+ !strncmp(xsb.fatsb.s_os, "mkdosfs", 7))
&& (!strncmp(xsb.fatsb.s_fs, "FAT12 ", 8) ||
!strncmp(xsb.fatsb.s_fs, "FAT16 ", 8) ||
!strncmp(xsb.fatsb.s_fs2, "FAT32 ", 8)))
@@ -169,6 +211,28 @@ fstype(const char *device) {
if(strncmp(isosb.iso.id, ISO_STANDARD_ID, sizeof(isosb.iso.id)) == 0
|| strncmp(isosb.hs.id, HS_STANDARD_ID, sizeof(isosb.hs.id)) == 0)
type = "iso9660";
+ else if (may_be_udf(isosb.iso.id))
+ type = "udf";
+ }
+
+ if (!type) {
+ /* perhaps the user tries to mount the swap space
+ on a new disk; warn her before she does mke2fs on it */
+ int pagesize = getpagesize();
+ int rd;
+ char buf[32768];
+
+ rd = pagesize;
+ if (rd < 8192)
+ rd = 8192;
+ if (rd > sizeof(buf))
+ rd = sizeof(buf);
+ if (lseek(fd, 0, SEEK_SET) != 0
+ || read(fd, buf, rd) != rd)
+ goto io_error;
+ if (may_be_swap(buf+pagesize) ||
+ may_be_swap(buf+4096) || may_be_swap(buf+8192))
+ type = "swap";
}
close (fd);
@@ -182,17 +246,19 @@ io_error:
char *
guess_fstype_from_superblock(const char *spec) {
- char *type = fstype(spec);
- if (verbose) {
- printf (_("mount: you didn't specify a filesystem type for %s\n"),
- spec);
- if (type)
- printf (_(" I will try type %s\n"), type);
- else
- printf (_(" I will try all types mentioned in %s or %s\n"),
- ETC_FILESYSTEMS, PROC_FILESYSTEMS);
- }
- return type;
+ char *type = fstype(spec);
+ if (verbose) {
+ printf (_("mount: you didn't specify a filesystem type for %s\n"),
+ spec);
+ if (!type)
+ printf (_(" I will try all types mentioned in %s or %s\n"),
+ ETC_FILESYSTEMS, PROC_FILESYSTEMS);
+ else if (!strcmp(type, "swap"))
+ printf (_(" and it looks like this is swapspace\n"));
+ else
+ printf (_(" I will try type %s\n"), type);
+ }
+ return type;
}
static FILE *procfs;
@@ -237,17 +303,24 @@ is_in_procfs(const char *type) {
return 0;
}
+/* return: 0: OK, -1: error in errno, 1: type not found */
+/* when 1 is returned, *type is NULL */
int
procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
char **type) {
char *fsname;
+ *type = NULL;
if (!procfsopen())
- return -1;
+ return 1;
while ((fsname = procfsnext()) != NULL) {
if (tested (fsname))
continue;
args->type = fsname;
+ if (verbose) {
+ printf(_("Trying %s\n"), fsname);
+ fflush(stdout);
+ }
if ((*mount_fn) (args) == 0) {
*type = xstrdup(fsname);
procfsclose();
@@ -255,13 +328,11 @@ procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
} else if (errno != EINVAL) {
*type = "guess";
procfsclose();
- return 1;
+ return -1;
}
}
procfsclose();
- *type = NULL;
-
- return -1;
+ return 1;
}
int
diff --git a/mount/realpath.c b/mount/realpath.c
index 0eebba3ac..f0d7c76c0 100644
--- a/mount/realpath.c
+++ b/mount/realpath.c
@@ -13,170 +13,109 @@
* GNU Library Public License for more details.
*/
-#define HAVE_GETCWD
-
/*
* This routine is part of libc. We include it nevertheless,
* since the libc version has some security flaws.
*/
-#ifdef __linux__
-extern char *realpath(const char *path, char *resolved_path);
-#define HAVE_UNISTD_H
-#define HAVE_STRING_H
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#if defined(HAVE_UNISTD_H) || defined(STDC_HEADERS)
+#include <limits.h> /* for PATH_MAX */
#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_STRING_H
#include <string.h>
-#else
-#include <strings.h>
-#endif
-#ifdef _POSIX_VERSION
-#include <limits.h> /* for PATH_MAX */
-#else
-#include <sys/param.h> /* for MAXPATHLEN */
-#endif
#include <errno.h>
-
-#include <sys/stat.h> /* for S_IFLNK */
-
-#ifndef PATH_MAX
-#ifdef _POSIX_VERSION
-#define PATH_MAX _POSIX_PATH_MAX
-#else
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
+#include "realpath.h"
+#include "sundries.h" /* for xstrdup */
#define MAX_READLINKS 32
-#ifdef __STDC__
-char *realpath(const char *path, char *resolved_path)
-#else
-char *realpath(path, resolved_path)
-const char *path;
-char *resolved_path;
-#endif
-{
- char copy_path[PATH_MAX];
- char link_path[PATH_MAX];
- char *new_path = resolved_path;
- char *max_path;
+char *
+myrealpath(const char *path, char *resolved_path, int maxreslth) {
+ char *npath;
+ char link_path[PATH_MAX+1];
int readlinks = 0;
int n;
- /* Make a copy of the source path since we may need to modify it. */
- if (strlen(path) >= PATH_MAX) {
- errno = ENAMETOOLONG;
- return NULL;
- }
- strcpy(copy_path, path);
- path = copy_path;
- max_path = copy_path + PATH_MAX - 2;
+ npath = resolved_path;
- /* If it's a relative pathname use getwd for starters. */
+ /* If it's a relative pathname use getcwd for starters. */
if (*path != '/') {
-#ifdef HAVE_GETCWD
- getcwd(new_path, PATH_MAX - 1);
-#else
- getwd(new_path);
-#endif
- new_path += strlen(new_path);
- if (new_path[-1] != '/')
- *new_path++ = '/';
- }
- else {
- *new_path++ = '/';
+ getcwd(npath, maxreslth-2);
+ npath += strlen(npath);
+ if (npath[-1] != '/')
+ *npath++ = '/';
+ } else {
+ *npath++ = '/';
path++;
}
+
/* Expand each slash-separated pathname component. */
while (*path != '\0') {
- /* Ignore stray "/". */
+ /* Ignore stray "/" */
if (*path == '/') {
path++;
continue;
}
- if (*path == '.') {
- /* Ignore ".". */
- if (path[1] == '\0' || path[1] == '/') {
- path++;
- continue;
- }
- if (path[1] == '.') {
- if (path[2] == '\0' || path[2] == '/') {
- path += 2;
- /* Ignore ".." at root. */
- if (new_path == resolved_path + 1)
- continue;
- /* Handle ".." by backing up. */
- while ((--new_path)[-1] != '/')
- ;
- continue;
- }
- }
+ if (*path == '.' && (path[1] == '\0' || path[1] == '/')) {
+ /* Ignore "." */
+ path++;
+ continue;
+ }
+ if (*path == '.' && path[1] == '.' &&
+ (path[2] == '\0' || path[2] == '/')) {
+ /* Backup for ".." */
+ path += 2;
+ while (npath > resolved_path+1 &&
+ (--npath)[-1] != '/')
+ ;
+ continue;
}
/* Safely copy the next pathname component. */
while (*path != '\0' && *path != '/') {
- if (path > max_path) {
+ if (npath-resolved_path > maxreslth-2) {
errno = ENAMETOOLONG;
return NULL;
}
- *new_path++ = *path++;
+ *npath++ = *path++;
}
-#ifdef S_IFLNK
+
/* Protect against infinite loops. */
if (readlinks++ > MAX_READLINKS) {
errno = ELOOP;
return NULL;
}
+
/* See if latest pathname component is a symlink. */
- *new_path = '\0';
- n = readlink(resolved_path, link_path, PATH_MAX - 1);
+ *npath = '\0';
+ n = readlink(resolved_path, link_path, PATH_MAX);
if (n < 0) {
/* EINVAL means the file exists but isn't a symlink. */
if (errno != EINVAL)
return NULL;
- }
- else {
+ } else {
/* Note: readlink doesn't add the null byte. */
link_path[n] = '\0';
if (*link_path == '/')
/* Start over for an absolute symlink. */
- new_path = resolved_path;
+ npath = resolved_path;
else
/* Otherwise back up over this component. */
- while (*(--new_path) != '/')
+ while (*(--npath) != '/')
;
/* Safe sex check. */
- if (strlen(path) + n >= PATH_MAX) {
+ if (strlen(path) + n >= sizeof(link_path)) {
errno = ENAMETOOLONG;
return NULL;
}
/* Insert symlink contents into path. */
strcat(link_path, path);
- strcpy(copy_path, link_path);
- path = copy_path;
+ path = xstrdup(link_path);
}
-#endif /* S_IFLNK */
- *new_path++ = '/';
+
+ *npath++ = '/';
}
/* Delete trailing slash but don't whomp a lone slash. */
- if (new_path != resolved_path + 1 && new_path[-1] == '/')
- new_path--;
+ if (npath != resolved_path+1 && npath[-1] == '/')
+ npath--;
/* Make sure it's null terminated. */
- *new_path = '\0';
+ *npath = '\0';
return resolved_path;
}
diff --git a/mount/realpath.h b/mount/realpath.h
new file mode 100644
index 000000000..206e53c10
--- /dev/null
+++ b/mount/realpath.h
@@ -0,0 +1 @@
+extern char *myrealpath(const char *path, char *resolved_path, int m);
diff --git a/mount/sundries.c b/mount/sundries.c
index a844724e9..de17b256d 100644
--- a/mount/sundries.c
+++ b/mount/sundries.c
@@ -14,6 +14,7 @@
#include <mntent.h> /* for MNTTYPE_SWAP */
#include "fstab.h"
#include "sundries.h"
+#include "realpath.h"
#include "nfsmount.h"
#include "nls.h"
@@ -224,9 +225,9 @@ canonicalize (const char *path) {
if (streq(path, "none") || streq(path, "proc") || streq(path, "devpts"))
return xstrdup(path);
- canonical = xmalloc (PATH_MAX + 1);
+ canonical = xmalloc (PATH_MAX+2);
- if (realpath (path, canonical))
+ if (myrealpath (path, canonical, PATH_MAX+1))
return canonical;
free(canonical);
diff --git a/mount/umount.c b/mount/umount.c
index 36f9407f2..98a1d330a 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -49,17 +49,21 @@
#include <arpa/inet.h>
#endif
-#ifdef MNT_FORCE
+#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
/* Interesting ... it seems libc knows about MNT_FORCE and presumably
about umount2 as well -- need not do anything */
#else /* MNT_FORCE */
-static int umount2(const char *path, int flags);
/* Does the present kernel source know about umount2? */
#include <linux/unistd.h>
#ifdef __NR_umount2
+
+static int umount2(const char *path, int flags);
+
_syscall2(int, umount2, const char *, path, int, flags);
+
#else /* __NR_umount2 */
+
static int
umount2(const char *path, int flags) {
fprintf(stderr, _("umount: compiled without support for -f\n"));
@@ -68,8 +72,10 @@ umount2(const char *path, int flags) {
}
#endif /* __NR_umount2 */
+#if !defined(MNT_FORCE)
/* dare not try to include <linux/mount.h> -- lots of errors */
#define MNT_FORCE 1
+#endif
#endif /* MNT_FORCE */
@@ -476,14 +482,21 @@ main (int argc, char *argv[])
die (2, _("umount: %s is not mounted (according to mtab)"), file);
if (getmntfilesbackward (file, mc))
die (2, _("umount: it seems %s is mounted multiple times"), file);
- if (!(fs = getfsspec (file)) && !(fs = getfsfile (file)))
- die (2, _("umount: %s is not in the fstab (and you are not root)"),
+
+ /* If fstab contains the two lines
+ /dev/sda1 /mnt/zip auto user,noauto 0 0
+ /dev/sda4 /mnt/zip auto user,noauto 0 0
+ then "mount /dev/sda4" followed by "umount /mnt/zip"
+ used to fail. So, we must not look for file, but for
+ the pair (spec,file) in fstab. */
+ fs = getfsspecfile(mc->mnt_fsname, mc->mnt_dir);
+ if (!fs) {
+ if (!getfsspec (file) && !getfsfile (file))
+ die (2,
+ _("umount: %s is not in the fstab (and you are not root)"),
file);
- if ((!streq (mc->mnt_fsname, fs->mnt_fsname) &&
- !streq (mc->mnt_fsname, canonicalize (fs->mnt_fsname)))
- || (!streq (mc->mnt_dir, fs->mnt_dir) &&
- !streq (mc->mnt_dir, canonicalize (fs->mnt_dir)))) {
- die (2, _("umount: %s mount disagrees with the fstab"), file);
+ else
+ die (2, _("umount: %s mount disagrees with the fstab"), file);
}
/* User mounting and unmounting is allowed only
@@ -492,19 +505,22 @@ main (int argc, char *argv[])
and unmount - this may be a security risk. */
/* The option `user' only allows unmounting by the user
that mounted. */
+ /* The option `owner' only allows (un)mounting by the owner. */
/* A convenient side effect is that the user who mounted
is visible in mtab. */
options = parse_list (fs->mnt_opts);
while (options) {
if (streq (car (options), "user") ||
- streq (car (options), "users"))
+ streq (car (options), "users") ||
+ streq (car (options), "owner"))
break;
options = cdr (options);
}
if (!options)
die (2, _("umount: only root can unmount %s from %s"),
fs->mnt_fsname, fs->mnt_dir);
- if (streq (car (options), "user")) {
+ if (streq (car (options), "user") ||
+ streq (car (options), "owner")) {
char *user = getusername();
options = parse_list (mc->mnt_opts);
diff --git a/mount/version.c b/mount/version.c
index 790c447bf..a98d11874 100644
--- a/mount/version.c
+++ b/mount/version.c
@@ -1,2 +1,2 @@
-#include "../version.h"
+#include "../defines.h"
char version[] = "mount-" UTIL_LINUX_VERSION;
diff --git a/po/Makefile b/po/Makefile
index 0e8d6ab83..7ee4053ca 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
PACKAGE = util-linux
-VERSION = 2.9s
include ../make_include
+include ../MCONFIG
#
# po2tbl.sed is not taken from /usr/share/gettext/intl
@@ -13,7 +13,7 @@ INTL = /usr/share/gettext/intl
SHELL = /bin/sh
-prefix = /usr
+prefix = $(DESTDIR)/usr
exec_prefix = ${prefix}
datadir = $(prefix)/share
localedir = $(datadir)/locale
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1d79e757c..21c17da9f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@ clock/hwclock.c
clock/kd.c
clock/rtc.c
clock/shhopt.c
+disk-utils/blockdev.c
disk-utils/fdformat.c
disk-utils/fsck.minix.c
disk-utils/mkfs.c
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index cc679d0b7..b431c0aea 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -17,205 +17,284 @@ const struct _msg_ent _msg_tbl[] = {
{"I failed to get permission because I didnt try.\n", 8},
{"%s is unable to get I/O port access: the iopl(3) call failed.\n", 9},
{"Probably you need root privileges.\n", 10},
- {"Last drift adjustment done at %d seconds after 1969\n", 11},
- {"Last calibration done at %d seconds after 1969\n", 12},
- {"Waiting for clock tick...\n", 13},
- {"...got clock tick\n", 14},
- {"Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n", 15},
- {"Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n", 16},
- {"Time read from Hardware Clock: %02d:%02d:%02d\n", 17},
- {"Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n", 18},
- {"Clock not changed - testing only.\n", 19},
+ {"Assuming hardware clock is kept in %s time.\n", 11},
+ {"UTC", 12},
+ {"local", 13},
+ {"%s: Warning: unrecognized third line in adjtime file\n", 14},
+ {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 15},
+ {"Last drift adjustment done at %d seconds after 1969\n", 16},
+ {"Last calibration done at %d seconds after 1969\n", 17},
+ {"Hardware clock is on %s time\n", 18},
+ {"unknown", 19},
+ {"Waiting for clock tick...\n", 20},
+ {"...got clock tick\n", 21},
+ {"Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n", 22},
+ {"Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n", 23},
+ {"Time read from Hardware Clock: %02d:%02d:%02d\n", 24},
+ {"Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n", 25},
+ {"Clock not changed - testing only.\n", 26},
{"\
Time elapsed since reference time has been %.6f seconds.\n\
-Delaying further to reach the next full second.\n", 20},
+Delaying further to reach the next full second.\n", 27},
{"\
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", 21},
- {"%s %.6f seconds\n", 22},
- {"No --date option specified.\n", 23},
+50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 28},
+ {"%s %.6f seconds\n", 29},
+ {"No --date option specified.\n", 30},
{"\
The value of the --date option is not a valid date.\n\
-In particular, it contains quotation marks.\n", 24},
- {"Issuing date command: %s\n", 25},
- {"Unable to run 'date' program in /bin/sh shell. popen() failed", 26},
- {"response from date command = %s\n", 27},
+In particular, it contains quotation marks.\n", 31},
+ {"Issuing date command: %s\n", 32},
+ {"Unable to run 'date' program in /bin/sh shell. popen() failed", 33},
+ {"response from date command = %s\n", 34},
{"\
The date command issued by %s returned unexpected results.\n\
The command was:\n\
%s\n\
The response was:\n\
- %s\n", 28},
+ %s\n", 35},
{"\
The date command issued by %s returnedsomething other than an integer where \
the convertedtime value was expected.\n\
The command was:\n\
%s\n\
The response was:\n\
- %s\n", 29},
- {"date string %s equates to %d seconds since 1969.\n", 30},
+ %s\n", 36},
+ {"date string %s equates to %d seconds since 1969.\n", 37},
{"\
The Hardware Clock does not contain a valid time, so we cannot set the \
-System Time from it.\n", 31},
- {"Calling settimeofday:\n", 32},
- {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 33},
- {"\ttz.tz_minuteswest = %ld\n", 34},
- {"Not setting system clock because running in test mode.\n", 35},
- {"Must be superuser to set system clock.\n", 36},
- {"settimeofday() failed", 37},
+System Time from it.\n", 38},
+ {"Calling settimeofday:\n", 39},
+ {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 40},
+ {"\ttz.tz_minuteswest = %ld\n", 41},
+ {"Not setting system clock because running in test mode.\n", 42},
+ {"Must be superuser to set system clock.\n", 43},
+ {"settimeofday() failed", 44},
{"\
Not adjusting drift factor because the Hardware Clock previously contained \
-garbage.\n", 38},
+garbage.\n", 45},
{"\
Not adjusting drift factor because it has been less than a day since the \
-last calibration.\n", 39},
+last calibration.\n", 46},
{"\
Clock drifted %d 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", 40},
- {"Time since last adjustment is %d seconds\n", 41},
- {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 42},
- {"Not updating adjtime file because of testing mode.\n", 43},
+Adjusting drift factor by %f seconds/day\n", 47},
+ {"Time since last adjustment is %d seconds\n", 48},
+ {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 49},
+ {"Not updating adjtime file because of testing mode.\n", 50},
{"\
Would have written the following to %s:\n\
-%s", 44},
- {"Drift adjustment parameters not updated.\n", 45},
+%s", 51},
+ {"Drift adjustment parameters not updated.\n", 52},
{"\
-The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 46},
- {"Needed adjustment is less than one second, so not setting clock.\n", 47},
- {"Using %s.\n", 48},
- {"No usable clock interface found.\n", 49},
- {"Unable to set system clock.\n", 50},
+The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 53},
+ {"Needed adjustment is less than one second, so not setting clock.\n", 54},
+ {"Using %s.\n", 55},
+ {"No usable clock interface found.\n", 56},
+ {"Unable to set system clock.\n", 57},
{"\
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", 51},
- {"Unable to get the epoch value from the kernel.\n", 52},
- {"Kernel is assuming an epoch value of %lu\n", 53},
+(and thus is presumably not running on an Alpha now). No action taken.\n", 58},
+ {"Unable to get the epoch value from the kernel.\n", 59},
+ {"Kernel is assuming an epoch value of %lu\n", 60},
{"\
To set the epoch value, you must use the 'epoch' option to tell to what \
-value to set it.\n", 54},
- {"Not setting the epoch to %d - testing only.\n", 55},
- {"Unable to set the epoch value in the kernel.\n", 56},
- {"%s takes no non-option arguments. You supplied %d.\n", 57},
+value to set it.\n", 61},
+ {"Not setting the epoch to %d - testing only.\n", 62},
+ {"Unable to set the epoch value in the kernel.\n", 63},
+ {"\
+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 /dev/rtc\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", 64},
+ {"\
+ --jensen, --arc, --srm, --funky-toy\n\
+ tell hwclock the type of alpha you have (see hwclock(8))\n", 65},
+ {"%s takes no non-option arguments. You supplied %d.\n", 66},
{"\
You have specified multiple function options.\n\
-You can only perform one function at a time.\n", 58},
- {"No usable set-to time. Cannot set clock.\n", 59},
- {"Sorry, only the superuser can change the Hardware Clock.\n", 60},
+You can only perform one function at a time.\n", 67},
+ {"\
+%s: The --utc and --localtime options are mutually exclusive. You specified \
+both.\n", 68},
+ {"No usable set-to time. Cannot set clock.\n", 69},
+ {"Sorry, only the superuser can change the Hardware Clock.\n", 70},
{"\
Sorry, only the superuser can change the Hardware Clock epoch in the \
-kernel.\n", 61},
+kernel.\n", 71},
{"\
Cannot access the Hardware Clock via any known method. Use --debug option \
-to see the details of our search for an access method.\n", 62},
- {"%s: %s, errno=%d: %s.\n", 63},
- {"Waiting in loop for time from KDGHWCLK to change\n", 64},
- {"KDGHWCLK ioctl to read time failed", 65},
- {"Timed out waiting for time change.\n", 66},
- {"KDGHWCLK ioctl to read time failed in loop", 67},
- {"ioctl() failed to read time from /dev/tty1", 68},
- {"ioctl() to open /dev/tty1 failed", 69},
- {"KDGHWCLK ioctl failed", 70},
- {"Can't open /dev/tty1", 71},
- {"ioctl() to /dev/rtc to read the time failed.\n", 72},
- {"Waiting in loop for time from /dev/rtc to change\n", 73},
- {"open() of /dev/rtc failed", 74},
- {"/dev/rtc does not have interrupt functions. ", 75},
- {"read() to /dev/rtc to wait for clock tick failed", 76},
- {"ioctl() to /dev/rtc to turn off update interrupts failed", 77},
- {"ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly", 78},
- {"Unable to open /dev/rtc", 79},
- {"ioctl() to /dev/rtc to set the time failed.\n", 80},
- {"ioctl(%s) was successful.\n", 81},
- {"Open of /dev/rtc failed", 82},
+to see the details of our search for an access method.\n", 72},
+ {"Waiting in loop for time from KDGHWCLK to change\n", 73},
+ {"KDGHWCLK ioctl to read time failed", 74},
+ {"Timed out waiting for time change.\n", 75},
+ {"KDGHWCLK ioctl to read time failed in loop", 76},
+ {"ioctl() failed to read time from /dev/tty1", 77},
+ {"ioctl() to open /dev/tty1 failed", 78},
+ {"KDGHWCLK ioctl failed", 79},
+ {"Can't open /dev/tty1", 80},
+ {"ioctl() to /dev/rtc to read the time failed.\n", 81},
+ {"Waiting in loop for time from /dev/rtc to change\n", 82},
+ {"open() of /dev/rtc failed", 83},
+ {"/dev/rtc does not have interrupt functions. ", 84},
+ {"read() to /dev/rtc to wait for clock tick failed", 85},
+ {"ioctl() to /dev/rtc to turn off update interrupts failed", 86},
+ {"ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly", 87},
+ {"Unable to open /dev/rtc", 88},
+ {"ioctl() to /dev/rtc to set the time failed.\n", 89},
+ {"ioctl(%s) was successful.\n", 90},
+ {"Open of /dev/rtc failed", 91},
{"\
To manipulate the epoch value in the kernel, we must access the Linux 'rtc' \
device driver via the device special file /dev/rtc. This file does not \
-exist on this system.\n", 83},
- {"ioctl(RTC_EPOCH_READ) to /dev/rtc failed", 84},
- {"we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n", 85},
- {"The epoch value may not be less than 1900. You requested %ld\n", 86},
- {"setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n", 87},
+exist on this system.\n", 92},
+ {"ioctl(RTC_EPOCH_READ) to /dev/rtc failed", 93},
+ {"we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n", 94},
+ {"The epoch value may not be less than 1900. You requested %ld\n", 95},
+ {"setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n", 96},
{"\
The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET \
-ioctl.\n", 88},
- {"ioctl(RTC_EPOCH_SET) to /dev/rtc failed", 89},
- {"invalid number `%s'\n", 90},
- {"number `%s' to `%s' out of range\n", 91},
- {"unrecognized option `%s'\n", 92},
- {"option `%s' requires an argument\n", 93},
- {"option `%s' doesn't allow an argument\n", 94},
- {"unrecognized option `-%c'\n", 95},
- {"Formatting ... ", 96},
- {"done\n", 97},
- {"Verifying ... ", 98},
- {"Read: ", 99},
- {"Problem reading cylinder %d, expected %d, read %d\n", 100},
+ioctl.\n", 97},
+ {"ioctl(RTC_EPOCH_SET) to /dev/rtc failed", 98},
+ {"invalid number `%s'\n", 99},
+ {"number `%s' to `%s' out of range\n", 100},
+ {"unrecognized option `%s'\n", 101},
+ {"option `%s' requires an argument\n", 102},
+ {"option `%s' doesn't allow an argument\n", 103},
+ {"unrecognized option `-%c'\n", 104},
+ {"set read-only", 105},
+ {"set read-write", 106},
+ {"get read-only", 107},
+ {"get sectorsize", 108},
+ {"get size", 109},
+ {"set readahead", 110},
+ {"get readahead", 111},
+ {"flush buffers", 112},
+ {"reread partition table", 113},
+ {"Usage: %s [-V] [-v|-q] commands devices\n", 114},
+ {"Available commands:\n", 115},
+ {"%s: Unknown command: %s\n", 116},
+ {"%s requires an argument\n", 117},
+ {"Formatting ... ", 118},
+ {"done\n", 119},
+ {"Verifying ... ", 120},
+ {"Read: ", 121},
+ {"Problem reading cylinder %d, expected %d, read %d\n", 122},
{"\
bad data in cyl %d\n\
-Continuing ... ", 101},
- {"usage: %s [ -n ] device\n", 102},
- {"%s: not a floppy device\n", 103},
- {"Could not determine current format type", 104},
- {"%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n", 105},
- {"Double", 106},
- {"Single", 107},
- {"%s is mounted.\t ", 108},
- {"Do you really want to continue", 109},
- {"check aborted.\n", 110},
- {"Zone nr < FIRSTZONE in file `", 111},
- {"Zone nr >= ZONES in file `", 112},
- {"Remove block", 113},
- {"Read error: unable to seek to block in file '", 114},
- {"Read error: bad block in file '", 115},
+Continuing ... ", 123},
+ {"usage: %s [ -n ] device\n", 124},
+ {"%s from %s\n", 125},
+ {"%s: not a floppy device\n", 126},
+ {"Could not determine current format type", 127},
+ {"%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n", 128},
+ {"Double", 129},
+ {"Single", 130},
+ {"Usage: %s [-larvsmf] /dev/name\n", 131},
+ {"%s is mounted.\t ", 132},
+ {"Do you really want to continue", 133},
+ {"check aborted.\n", 134},
+ {"Zone nr < FIRSTZONE in file `", 135},
+ {"Zone nr >= ZONES in file `", 136},
+ {"Remove block", 137},
+ {"Read error: unable to seek to block in file '", 138},
+ {"Read error: bad block in file '", 139},
{"\
Internal error: trying to write bad block\n\
-Write request ignored\n", 116},
- {"Write error: bad block in file '", 117},
- {"Warning: Firstzone != Norm_firstzone\n", 118},
- {"%ld inodes\n", 119},
- {"%ld blocks\n", 120},
- {"Firstdatazone=%ld (%ld)\n", 121},
- {"Zonesize=%d\n", 122},
- {"Maxsize=%ld\n", 123},
- {"Filesystem state=%d\n", 124},
+Write request ignored\n", 140},
+ {"seek failed in write_block", 141},
+ {"Write error: bad block in file '", 142},
+ {"seek failed in write_super_block", 143},
+ {"unable to write super-block", 144},
+ {"Unable to write inode map", 145},
+ {"Unable to write zone map", 146},
+ {"Unable to write inodes", 147},
+ {"seek failed", 148},
+ {"unable to read super block", 149},
+ {"bad magic number in super-block", 150},
+ {"Only 1k blocks/zones supported", 151},
+ {"bad s_imap_blocks field in super-block", 152},
+ {"bad s_zmap_blocks field in super-block", 153},
+ {"Unable to allocate buffer for inode map", 154},
+ {"Unable to allocate buffer for inodes", 155},
+ {"Unable to allocate buffer for inode count", 156},
+ {"Unable to allocate buffer for zone count", 157},
+ {"Unable to read inode map", 158},
+ {"Unable to read zone map", 159},
+ {"Unable to read inodes", 160},
+ {"Warning: Firstzone != Norm_firstzone\n", 161},
+ {"%ld inodes\n", 162},
+ {"%ld blocks\n", 163},
+ {"Firstdatazone=%ld (%ld)\n", 164},
+ {"Zonesize=%d\n", 165},
+ {"Maxsize=%ld\n", 166},
+ {"Filesystem state=%d\n", 167},
{"\
namelen=%d\n\
-\n", 125},
- {"Inode %d marked not used, but used for file '", 126},
- {"Mark in use", 127},
- {" has mode %05o\n", 128},
- {"Warning: inode count too big.\n", 129},
- {"Block has been used before. Now in file `", 130},
- {"Clear", 131},
- {"Block %d in file `", 132},
- {"' is marked not in use.", 133},
- {"Correct", 134},
- {" contains a bad inode number for file '", 135},
- {" Remove", 136},
- {": bad directory: '.' isn't first\n", 137},
- {": bad directory: '..' isn't second\n", 138},
- {": bad directory: size<32", 139},
- {": bad directory: size < 32", 140},
- {"Inode %d mode not cleared.", 141},
- {"Inode %d not used, marked used in the bitmap.", 142},
- {"Inode %d used, marked unused in the bitmap.", 143},
- {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 144},
- {"Set i_nlinks to count", 145},
- {"Zone %d: marked in use, no file uses it.", 146},
- {"Unmark", 147},
- {"Zone %d: %sin use, counted=%d\n", 148},
- {"not ", 149},
- {"Set", 150},
- {"%s is clean, no check.\n", 151},
- {"Forcing filesystem check on %s.\n", 152},
- {"Filesystem on %s is dirty, needs checking.\n", 153},
+\n", 168},
+ {"Inode %d marked not used, but used for file '", 169},
+ {"Mark in use", 170},
+ {" has mode %05o\n", 171},
+ {"Warning: inode count too big.\n", 172},
+ {"root inode isn't a directory", 173},
+ {"Block has been used before. Now in file `", 174},
+ {"Clear", 175},
+ {"Block %d in file `", 176},
+ {"' is marked not in use.", 177},
+ {"Correct", 178},
+ {" contains a bad inode number for file '", 179},
+ {" Remove", 180},
+ {": bad directory: '.' isn't first\n", 181},
+ {": bad directory: '..' isn't second\n", 182},
+ {"internal error", 183},
+ {": bad directory: size<32", 184},
+ {": bad directory: size < 32", 185},
+ {"seek failed in bad_zone", 186},
+ {"Inode %d mode not cleared.", 187},
+ {"Inode %d not used, marked used in the bitmap.", 188},
+ {"Inode %d used, marked unused in the bitmap.", 189},
+ {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 190},
+ {"Set i_nlinks to count", 191},
+ {"Zone %d: marked in use, no file uses it.", 192},
+ {"Unmark", 193},
+ {"Zone %d: %sin use, counted=%d\n", 194},
+ {"not ", 195},
+ {"Set", 196},
+ {"bad inode size", 197},
+ {"bad v2 inode size", 198},
+ {"need terminal for interactive repairs", 199},
+ {"unable to open '%s'", 200},
+ {"%s is clean, no check.\n", 201},
+ {"Forcing filesystem check on %s.\n", 202},
+ {"Filesystem on %s is dirty, needs checking.\n", 203},
{"\
\n\
-%6ld inodes used (%ld%%)\n", 154},
- {"%6ld zones used (%ld%%)\n", 155},
+%6ld inodes used (%ld%%)\n", 204},
+ {"%6ld zones used (%ld%%)\n", 205},
{"\
\n\
%6d regular files\n\
@@ -225,264 +304,272 @@ namelen=%d\n\
%6d links\n\
%6d symbolic links\n\
------\n\
-%6d files\n", 156},
+%6d files\n", 206},
{"\
----------------------------\n\
FILE SYSTEM HAS BEEN CHANGED\n\
-----------------------------\n", 157},
- {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 158},
- {"%s: Out of memory!\n", 159},
- {"mkfs version ", 160},
- {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 161},
- {"%s is mounted; will not make a filesystem here!", 162},
- {"seek to boot block failed in write_tables", 163},
- {"unable to clear boot sector", 164},
- {"seek failed in write_tables", 165},
- {"unable to write super-block", 166},
- {"unable to write inode map", 167},
- {"unable to write zone map", 168},
- {"unable to write inodes", 169},
- {"seek failed in write_block", 170},
- {"write failed in write_block", 171},
- {"too many bad blocks", 172},
- {"not enough good blocks", 173},
- {"unable to allocate buffers for maps", 174},
- {"unable to allocate buffer for inodes", 175},
+----------------------------\n", 207},
+ {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 208},
+ {"%s: Out of memory!\n", 209},
+ {"mkfs version %s (%s)\n", 210},
+ {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 211},
+ {"%s is mounted; will not make a filesystem here!", 212},
+ {"seek to boot block failed in write_tables", 213},
+ {"unable to clear boot sector", 214},
+ {"seek failed in write_tables", 215},
+ {"unable to write inode map", 216},
+ {"unable to write zone map", 217},
+ {"unable to write inodes", 218},
+ {"write failed in write_block", 219},
+ {"too many bad blocks", 220},
+ {"not enough good blocks", 221},
+ {"unable to allocate buffers for maps", 222},
+ {"unable to allocate buffer for inodes", 223},
{"\
Maxsize=%ld\n\
-\n", 176},
- {"seek failed during testing of blocks", 177},
- {"Weird values in do_check: probably bugs\n", 178},
- {"seek failed in check_blocks", 179},
- {"bad blocks before data-area: cannot make fs", 180},
- {"%d bad blocks\n", 181},
- {"one bad block\n", 182},
- {"can't open file of bad blocks", 183},
- {"bad inode size", 184},
- {"%s: not compiled with minix v2 support\n", 185},
- {"strtol error: number of blocks not specified", 186},
- {"unable to open %s", 187},
- {"unable to stat %s", 188},
- {"will not try to make filesystem on '%s'", 189},
- {"Assuming pages of size %d\n", 190},
- {"one bad page\n", 191},
- {"%d bad pages\n", 192},
- {"%s: error: Nowhere to set up swap on?\n", 193},
- {"%s: error: size %ld is larger than device size %d\n", 194},
- {"%s: error: unknown version %d\n", 195},
- {"%s: error: swap area needs to be at least %ldkB\n", 196},
- {"%s: warning: truncating swap area to %ldkB\n", 197},
+\n", 224},
+ {"seek failed during testing of blocks", 225},
+ {"Weird values in do_check: probably bugs\n", 226},
+ {"seek failed in check_blocks", 227},
+ {"bad blocks before data-area: cannot make fs", 228},
+ {"%d bad blocks\n", 229},
+ {"one bad block\n", 230},
+ {"can't open file of bad blocks", 231},
+ {"%s: not compiled with minix v2 support\n", 232},
+ {"strtol error: number of blocks not specified", 233},
+ {"unable to open %s", 234},
+ {"unable to stat %s", 235},
+ {"will not try to make filesystem on '%s'", 236},
+ {"Bad user-specified page size %d\n", 237},
+ {"Using user-specified page size %d, instead of the system values %d/%d\n", 238},
+ {"Assuming pages of size %d (not %d)\n", 239},
+ {"Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n", 240},
+ {"too many bad pages", 241},
+ {"Out of memory", 242},
+ {"one bad page\n", 243},
+ {"%d bad pages\n", 244},
+ {"%s: error: Nowhere to set up swap on?\n", 245},
+ {"%s: error: size %ld is larger than device size %d\n", 246},
+ {"%s: error: unknown version %d\n", 247},
+ {"%s: error: swap area needs to be at least %ldkB\n", 248},
+ {"%s: warning: truncating swap area to %ldkB\n", 249},
+ {"Will not try to make swapdevice on '%s'", 250},
+ {"fatal: first page unreadable", 251},
{"\
%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", 198},
- {"Setting up swapspace version %d, size = %ld bytes\n", 199},
- {"Invalid number: %s\n", 200},
- {"Syntax error: '%s'\n", 201},
- {"No such parameter set: '%s'\n", 202},
- {"usage: %s [ -p ] dev name\n", 203},
- {"\
- %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 204},
- {" %s [ -c | -y | -n | -d ] dev\n", 205},
- {" %s [ -c | -y | -n ] dev\n", 206},
- {"Unusable", 207},
- {"Free Space", 208},
- {"Linux ext2", 209},
- {"Linux", 210},
- {"OS/2 HPFS", 211},
- {"OS/2 IFS", 212},
- {"NTFS", 213},
- {"Disk has been changed.\n", 214},
- {"Reboot the system to ensure the partition table is correctly updated.\n", 215},
+the -f option to force it.\n", 252},
+ {"Unable to set up swap-space: unreadable", 253},
+ {"Setting up swapspace version %d, size = %ld bytes\n", 254},
+ {"unable to rewind swap-device", 255},
+ {"unable to write signature page", 256},
+ {"fsync failed", 257},
+ {"Invalid number: %s\n", 258},
+ {"Syntax error: '%s'\n", 259},
+ {"No such parameter set: '%s'\n", 260},
+ {"usage: %s [ -p ] dev name\n", 261},
+ {"\
+ %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 262},
+ {" %s [ -c | -y | -n | -d ] dev\n", 263},
+ {" %s [ -c | -y | -n ] dev\n", 264},
+ {"Unusable", 265},
+ {"Free Space", 266},
+ {"Linux ext2", 267},
+ {"Linux", 268},
+ {"OS/2 HPFS", 269},
+ {"OS/2 IFS", 270},
+ {"NTFS", 271},
+ {"Disk has been changed.\n", 272},
+ {"Reboot the system to ensure the partition table is correctly updated.\n", 273},
{"\
\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", 216},
- {"FATAL ERROR", 217},
- {"Press any key to exit cfdisk", 218},
- {"Cannot seek on disk drive", 219},
- {"Cannot read disk drive", 220},
- {"Cannot write disk drive", 221},
- {"Too many partitions", 222},
- {"Partition begins before sector 0", 223},
- {"Partition ends before sector 0", 224},
- {"Partition begins after end-of-disk", 225},
- {"Partition ends after end-of-disk", 226},
- {"logical partitions not in disk order", 227},
- {"logical partitions overlap", 228},
- {"enlarged logical partitions overlap", 229},
- {"\
-!!!! Internal error creating logical drive with no extended partition !!!!", 230},
- {"\
-Cannot create logical drive here -- would create two extended partitions", 231},
- {"Menu item too long. Menu may look odd.", 232},
- {"Menu without direction. Defaulting horizontal.", 233},
- {"Illegal key", 234},
- {"Press a key to continue", 235},
- {"Primary", 236},
- {"Create a new primary partition", 237},
- {"Logical", 238},
- {"Create a new logical partition", 239},
- {"Cancel", 240},
- {"Don't create a partition", 241},
- {"!!! Internal error !!!", 242},
- {"Size (in MB): ", 243},
- {"Beginning", 244},
- {"Add partition at beginning of free space", 245},
- {"End", 246},
- {"Add partition at end of free space", 247},
- {"No room to create the extended partition", 248},
- {"Bad signature on partition table", 249},
- {"You specified more cylinders than fit on disk", 250},
- {"Cannot open disk drive", 251},
- {"Opened disk read-only - you have no permission to write", 252},
- {"Cannot get disk size", 253},
- {"Bad primary partition", 254},
- {"Bad logical partition", 255},
- {"Warning!! This may destroy data on your disk!", 256},
- {"Are you sure you want write the partition table to disk? (yes or no): ", 257},
- {"no", 258},
- {"Did not write partition table to disk", 259},
- {"yes", 260},
- {"Please enter `yes' or `no'", 261},
- {"Writing partition table to disk...", 262},
- {"Wrote partition table to disk", 263},
- {"\
-Wrote partition table, but re-read table failed. Reboot to update table.", 264},
- {"\
-Not precisely one primary partition is bootable. DOS MBR cannot boot this.", 265},
- {"Enter filename or press RETURN to display on screen: ", 266},
- {"Cannot open file '%s'", 267},
- {"Disk Drive: %s\n", 268},
- {"Sector 0:\n", 269},
- {"Sector %d:\n", 270},
- {" None ", 271},
- {" Pri/Log", 272},
- {" Primary", 273},
- {" Logical", 274},
- {"Unknown", 275},
- {"Boot (%02X)", 276},
- {"Unknown (%02X)", 277},
- {"None (%02X)", 278},
- {"Partition Table for %s\n", 279},
- {" First Last\n", 280},
- {"\
- # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n", 281},
+page for additional information.\n", 274},
+ {"FATAL ERROR", 275},
+ {"Press any key to exit cfdisk", 276},
+ {"Cannot seek on disk drive", 277},
+ {"Cannot read disk drive", 278},
+ {"Cannot write disk drive", 279},
+ {"Too many partitions", 280},
+ {"Partition begins before sector 0", 281},
+ {"Partition ends before sector 0", 282},
+ {"Partition begins after end-of-disk", 283},
+ {"Partition ends after end-of-disk", 284},
+ {"logical partitions not in disk order", 285},
+ {"logical partitions overlap", 286},
+ {"enlarged logical partitions overlap", 287},
+ {"\
+!!!! Internal error creating logical drive with no extended partition !!!!", 288},
+ {"\
+Cannot create logical drive here -- would create two extended partitions", 289},
+ {"Menu item too long. Menu may look odd.", 290},
+ {"Menu without direction. Defaulting horizontal.", 291},
+ {"Illegal key", 292},
+ {"Press a key to continue", 293},
+ {"Primary", 294},
+ {"Create a new primary partition", 295},
+ {"Logical", 296},
+ {"Create a new logical partition", 297},
+ {"Cancel", 298},
+ {"Don't create a partition", 299},
+ {"!!! Internal error !!!", 300},
+ {"Size (in MB): ", 301},
+ {"Beginning", 302},
+ {"Add partition at beginning of free space", 303},
+ {"End", 304},
+ {"Add partition at end of free space", 305},
+ {"No room to create the extended partition", 306},
+ {"Bad signature on partition table", 307},
+ {"You specified more cylinders than fit on disk", 308},
+ {"Cannot open disk drive", 309},
+ {"Opened disk read-only - you have no permission to write", 310},
+ {"Cannot get disk size", 311},
+ {"Bad primary partition", 312},
+ {"Bad logical partition", 313},
+ {"Warning!! This may destroy data on your disk!", 314},
+ {"Are you sure you want write the partition table to disk? (yes or no): ", 315},
+ {"no", 316},
+ {"Did not write partition table to disk", 317},
+ {"yes", 318},
+ {"Please enter `yes' or `no'", 319},
+ {"Writing partition table to disk...", 320},
+ {"Wrote partition table to disk", 321},
+ {"\
+Wrote partition table, but re-read table failed. Reboot to update table.", 322},
+ {"\
+Not precisely one primary partition is bootable. DOS MBR cannot boot this.", 323},
+ {"Enter filename or press RETURN to display on screen: ", 324},
+ {"Cannot open file '%s'", 325},
+ {"Disk Drive: %s\n", 326},
+ {"Sector 0:\n", 327},
+ {"Sector %d:\n", 328},
+ {" None ", 329},
+ {" Pri/Log", 330},
+ {" Primary", 331},
+ {" Logical", 332},
+ {"Unknown", 333},
+ {"Boot (%02X)", 334},
+ {"Unknown (%02X)", 335},
+ {"None (%02X)", 336},
+ {"Partition Table for %s\n", 337},
+ {" First Last\n", 338},
+ {"\
+ # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n", 339},
{"\
-- ------- -------- --------- ------ --------- ---------------------- \
----------\n", 282},
- {" ---Starting--- ----Ending---- Start Number of\n", 283},
- {" # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n", 284},
- {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 285},
- {"Raw", 286},
- {"Print the table using raw data format", 287},
- {"Sectors", 288},
- {"Print the table ordered by sectors", 289},
- {"Table", 290},
- {"Just print the partition table", 291},
- {"Don't print the table", 292},
- {"Help Screen for cfdisk", 293},
- {"This is cfdisk, a curses based disk partitioning program, which", 294},
- {"allows you to create, delete and modify partitions on your hard", 295},
- {"disk drive.", 296},
- {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 297},
- {"Command Meaning", 298},
- {"------- -------", 299},
- {" b Toggle bootable flag of the current partition", 300},
- {" d Delete the current partition", 301},
- {" g Change cylinders, heads, sectors-per-track parameters", 302},
- {" WARNING: This option should only be used by people who", 303},
- {" know what they are doing.", 304},
- {" h Print this screen", 305},
- {" m Maximize disk usage of the current partition", 306},
- {" Note: This may make the partition incompatible with", 307},
- {" DOS, OS/2, ...", 308},
- {" n Create new partition from free space", 309},
- {" p Print partition table to the screen or to a file", 310},
- {" There are several different formats for the partition", 311},
- {" that you can choose from:", 312},
- {" r - Raw data (exactly what would be written to disk)", 313},
- {" s - Table ordered by sectors", 314},
- {" t - Table in raw format", 315},
- {" q Quit program without writing partition table", 316},
- {" t Change the filesystem type", 317},
- {" u Change units of the partition size display", 318},
- {" Rotates through MB, sectors and cylinders", 319},
- {" W Write partition table to disk (must enter upper case W)", 320},
- {" Since this might destroy data on the disk, you must", 321},
- {" either confirm or deny the write by entering `yes' or", 322},
- {" `no'", 323},
- {"Up Arrow Move cursor to the previous partition", 324},
- {"Down Arrow Move cursor to the next partition", 325},
- {"CTRL-L Redraws the screen", 326},
- {" ? Print this screen", 327},
- {"Note: All of the commands can be entered with either upper or lower", 328},
- {"case letters (except for Writes).", 329},
- {"Cylinders", 330},
- {"Change cylinder geometry", 331},
- {"Heads", 332},
- {"Change head geometry", 333},
- {"Change sector geometry", 334},
- {"Done", 335},
- {"Done with changing geometry", 336},
- {"Enter the number of cylinders: ", 337},
- {"Illegal cylinders value", 338},
- {"Enter the number of heads: ", 339},
- {"Illegal heads value", 340},
- {"Enter the number of sectors per track: ", 341},
- {"Illegal sectors value", 342},
- {"Enter filesystem type: ", 343},
- {"Cannot change FS Type to empty", 344},
- {"Cannot change FS Type to extended", 345},
- {"Boot", 346},
- {"Unk(%02X)", 347},
- {", NC", 348},
- {"NC", 349},
- {"Pri/Log", 350},
- {"Disk Drive: %s", 351},
- {"Size: %lld bytes", 352},
- {"Heads: %d Sectors per Track: %d Cylinders: %d", 353},
- {"Name", 354},
- {"Flags", 355},
- {"Part Type", 356},
- {"FS Type", 357},
- {"[Label]", 358},
- {" Sectors", 359},
- {"Size (MB)", 360},
- {"Size (GB)", 361},
- {"Bootable", 362},
- {"Toggle bootable flag of the current partition", 363},
- {"Delete", 364},
- {"Delete the current partition", 365},
- {"Geometry", 366},
- {"Change disk geometry (experts only)", 367},
- {"Help", 368},
- {"Print help screen", 369},
- {"Maximize", 370},
- {"Maximize disk usage of the current partition (experts only)", 371},
- {"New", 372},
- {"Create new partition from free space", 373},
- {"Print", 374},
- {"Print partition table to the screen or to a file", 375},
- {"Quit", 376},
- {"Quit program without writing partition table", 377},
- {"Type", 378},
- {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 379},
- {"Units", 380},
- {"Change units of the partition size display (MB, sect, cyl)", 381},
- {"Write", 382},
- {"Write partition table to disk (this might destroy data)", 383},
- {"Cannot make this partition bootable", 384},
- {"Cannot delete an empty partition", 385},
- {"Cannot maximize this partition", 386},
- {"This partition is unusable", 387},
- {"This partition is already in use", 388},
- {"Cannot change the type of an empty partition", 389},
- {"No more partitions", 390},
- {"Illegal command", 391},
- {"Copyright (C) 1994-1999 Kevin E. Martin & aeb\n", 392},
+---------\n", 340},
+ {" ---Starting--- ----Ending---- Start Number of\n", 341},
+ {" # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n", 342},
+ {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 343},
+ {"Raw", 344},
+ {"Print the table using raw data format", 345},
+ {"Sectors", 346},
+ {"Print the table ordered by sectors", 347},
+ {"Table", 348},
+ {"Just print the partition table", 349},
+ {"Don't print the table", 350},
+ {"Help Screen for cfdisk", 351},
+ {"This is cfdisk, a curses based disk partitioning program, which", 352},
+ {"allows you to create, delete and modify partitions on your hard", 353},
+ {"disk drive.", 354},
+ {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 355},
+ {"Command Meaning", 356},
+ {"------- -------", 357},
+ {" b Toggle bootable flag of the current partition", 358},
+ {" d Delete the current partition", 359},
+ {" g Change cylinders, heads, sectors-per-track parameters", 360},
+ {" WARNING: This option should only be used by people who", 361},
+ {" know what they are doing.", 362},
+ {" h Print this screen", 363},
+ {" m Maximize disk usage of the current partition", 364},
+ {" Note: This may make the partition incompatible with", 365},
+ {" DOS, OS/2, ...", 366},
+ {" n Create new partition from free space", 367},
+ {" p Print partition table to the screen or to a file", 368},
+ {" There are several different formats for the partition", 369},
+ {" that you can choose from:", 370},
+ {" r - Raw data (exactly what would be written to disk)", 371},
+ {" s - Table ordered by sectors", 372},
+ {" t - Table in raw format", 373},
+ {" q Quit program without writing partition table", 374},
+ {" t Change the filesystem type", 375},
+ {" u Change units of the partition size display", 376},
+ {" Rotates through MB, sectors and cylinders", 377},
+ {" W Write partition table to disk (must enter upper case W)", 378},
+ {" Since this might destroy data on the disk, you must", 379},
+ {" either confirm or deny the write by entering `yes' or", 380},
+ {" `no'", 381},
+ {"Up Arrow Move cursor to the previous partition", 382},
+ {"Down Arrow Move cursor to the next partition", 383},
+ {"CTRL-L Redraws the screen", 384},
+ {" ? Print this screen", 385},
+ {"Note: All of the commands can be entered with either upper or lower", 386},
+ {"case letters (except for Writes).", 387},
+ {"Cylinders", 388},
+ {"Change cylinder geometry", 389},
+ {"Heads", 390},
+ {"Change head geometry", 391},
+ {"Change sector geometry", 392},
+ {"Done", 393},
+ {"Done with changing geometry", 394},
+ {"Enter the number of cylinders: ", 395},
+ {"Illegal cylinders value", 396},
+ {"Enter the number of heads: ", 397},
+ {"Illegal heads value", 398},
+ {"Enter the number of sectors per track: ", 399},
+ {"Illegal sectors value", 400},
+ {"Enter filesystem type: ", 401},
+ {"Cannot change FS Type to empty", 402},
+ {"Cannot change FS Type to extended", 403},
+ {"Boot", 404},
+ {"Unk(%02X)", 405},
+ {", NC", 406},
+ {"NC", 407},
+ {"Pri/Log", 408},
+ {"Disk Drive: %s", 409},
+ {"Size: %lld bytes", 410},
+ {"Heads: %d Sectors per Track: %d Cylinders: %d", 411},
+ {"Name", 412},
+ {"Flags", 413},
+ {"Part Type", 414},
+ {"FS Type", 415},
+ {"[Label]", 416},
+ {" Sectors", 417},
+ {"Size (MB)", 418},
+ {"Size (GB)", 419},
+ {"Bootable", 420},
+ {"Toggle bootable flag of the current partition", 421},
+ {"Delete", 422},
+ {"Delete the current partition", 423},
+ {"Geometry", 424},
+ {"Change disk geometry (experts only)", 425},
+ {"Help", 426},
+ {"Print help screen", 427},
+ {"Maximize", 428},
+ {"Maximize disk usage of the current partition (experts only)", 429},
+ {"New", 430},
+ {"Create new partition from free space", 431},
+ {"Print", 432},
+ {"Print partition table to the screen or to a file", 433},
+ {"Quit", 434},
+ {"Quit program without writing partition table", 435},
+ {"Type", 436},
+ {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 437},
+ {"Units", 438},
+ {"Change units of the partition size display (MB, sect, cyl)", 439},
+ {"Write", 440},
+ {"Write partition table to disk (this might destroy data)", 441},
+ {"Cannot make this partition bootable", 442},
+ {"Cannot delete an empty partition", 443},
+ {"Cannot maximize this partition", 444},
+ {"This partition is unusable", 445},
+ {"This partition is already in use", 446},
+ {"Cannot change the type of an empty partition", 447},
+ {"No more partitions", 448},
+ {"Illegal command", 449},
+ {"Copyright (C) 1994-1999 Kevin E. Martin & aeb\n", 450},
{"\
\n\
Usage:\n\
@@ -498,7 +585,7 @@ Options:\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", 393},
+\n", 451},
{"\
Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n\
fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n\
@@ -507,203 +594,200 @@ Usage: fdisk [-b SSZ] [-u] DISK Change partition table\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 drives) use 2048-byte sectors\n", 394},
+-b 2048: (for certain MO drives) use 2048-byte sectors\n", 452},
{"\
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", 395},
- {"A disk block device is needed.\n", 396},
- {"\
-Given name does not refer to a partition,\n\
-or maybe not even to a block device.\n", 397},
- {"Unable to open %s\n", 398},
- {"Unable to read %s\n", 399},
- {"Unable to seek on %s\n", 400},
- {"Unable to write %s\n", 401},
- {"BLKGETSIZE ioctl failed on %s\n", 402},
- {"Unable to allocate any more memory\n", 403},
- {"Fatal error\n", 404},
- {"Command action", 405},
- {" a toggle a read only flag", 406},
- {" b edit bsd disklabel", 407},
- {" c toggle the mountable flag", 408},
- {" d delete a partition", 409},
- {" l list known partition types", 410},
- {" m print this menu", 411},
- {" n add a new partition", 412},
- {" o create a new empty DOS partition table", 413},
- {" p print the partition table", 414},
- {" q quit without saving changes", 415},
- {" s create a new empty Sun disklabel", 416},
- {" t change a partition's system id", 417},
- {" u change display/entry units", 418},
- {" v verify the partition table", 419},
- {" w write table to disk and exit", 420},
- {" x extra functionality (experts only)", 421},
- {" a select bootable partition", 422},
- {" b edit bootfile entry", 423},
- {" c select sgi swap partition", 424},
- {" a toggle a bootable flag", 425},
- {" c toggle the dos compatibility flag", 426},
- {" a change number of alternate cylinders", 427},
- {" c change number of cylinders", 428},
- {" d print the raw data in the partition table", 429},
- {" e change number of extra sectors per cylinder", 430},
- {" h change number of heads", 431},
- {" i change interleave factor", 432},
- {" o change rotation speed (rpm)", 433},
- {" r return to main menu", 434},
- {" s change number of sectors/track", 435},
- {" y change number of physical cylinders", 436},
- {" b move beginning of data in a partition", 437},
- {" e list extended partitions", 438},
- {" g create an IRIX partition table", 439},
- {"You must set", 440},
- {"heads", 441},
- {"sectors", 442},
- {"cylinders", 443},
+ ...\n", 453},
+ {"Unable to open %s\n", 454},
+ {"Unable to read %s\n", 455},
+ {"Unable to seek on %s\n", 456},
+ {"Unable to write %s\n", 457},
+ {"BLKGETSIZE ioctl failed on %s\n", 458},
+ {"Unable to allocate any more memory\n", 459},
+ {"Fatal error\n", 460},
+ {"Command action", 461},
+ {" a toggle a read only flag", 462},
+ {" b edit bsd disklabel", 463},
+ {" c toggle the mountable flag", 464},
+ {" d delete a partition", 465},
+ {" l list known partition types", 466},
+ {" m print this menu", 467},
+ {" n add a new partition", 468},
+ {" o create a new empty DOS partition table", 469},
+ {" p print the partition table", 470},
+ {" q quit without saving changes", 471},
+ {" s create a new empty Sun disklabel", 472},
+ {" t change a partition's system id", 473},
+ {" u change display/entry units", 474},
+ {" v verify the partition table", 475},
+ {" w write table to disk and exit", 476},
+ {" x extra functionality (experts only)", 477},
+ {" a select bootable partition", 478},
+ {" b edit bootfile entry", 479},
+ {" c select sgi swap partition", 480},
+ {" a toggle a bootable flag", 481},
+ {" c toggle the dos compatibility flag", 482},
+ {" a change number of alternate cylinders", 483},
+ {" c change number of cylinders", 484},
+ {" d print the raw data in the partition table", 485},
+ {" e change number of extra sectors per cylinder", 486},
+ {" h change number of heads", 487},
+ {" i change interleave factor", 488},
+ {" o change rotation speed (rpm)", 489},
+ {" r return to main menu", 490},
+ {" s change number of sectors/track", 491},
+ {" y change number of physical cylinders", 492},
+ {" b move beginning of data in a partition", 493},
+ {" e list extended partitions", 494},
+ {" g create an IRIX partition table", 495},
+ {"You must set", 496},
+ {"heads", 497},
+ {"sectors", 498},
+ {"cylinders", 499},
{"\
%s%s.\n\
-You can do this from the extra functions menu.\n", 444},
- {" and ", 445},
- {"Bad offset in primary extended partition\n", 446},
- {"Warning: deleting partitions after %d\n", 447},
- {"Warning: extra link pointer in partition table %d\n", 448},
- {"Warning: ignoring extra data in partition table %d\n", 449},
+You can do this from the extra functions menu.\n", 500},
+ {" and ", 501},
+ {"Bad offset in primary extended partition\n", 502},
+ {"Warning: deleting partitions after %d\n", 503},
+ {"Warning: extra link pointer in partition table %d\n", 504},
+ {"Warning: ignoring extra data in partition table %d\n", 505},
{"\
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", 450},
- {"You will not be able to write the partition table.\n", 451},
- {"Note: sector size is %d (not %d)\n", 452},
+\n", 506},
+ {"You will not be able to write the partition table.\n", 507},
+ {"Note: sector size is %d (not %d)\n", 508},
{"\
Device contains neither a valid DOS partition table, nor Sun or SGI \
-disklabel\n", 453},
- {"Internal error\n", 454},
- {"Ignoring extra extended partition %d\n", 455},
+disklabel\n", 509},
+ {"Internal error\n", 510},
+ {"Ignoring extra extended partition %d\n", 511},
{"\
Warning: invalid flag 0x%04x of partition table %d will be corrected by \
-w(rite)\n", 456},
+w(rite)\n", 512},
{"\
\n\
-got EOF thrice - exiting..\n", 457},
- {"Hex code (type L to list codes): ", 458},
- {"%s (%d-%d, default %d): ", 459},
- {"Using default value %d\n", 460},
- {"Value out of range.\n", 461},
- {"Partition number", 462},
- {"Warning: partition %d has empty type\n", 463},
- {"cylinder", 464},
- {"sector", 465},
- {"Changing display/entry units to %s\n", 466},
- {"WARNING: Partition %d is an extended partition\n", 467},
- {"DOS Compatibility flag is set\n", 468},
- {"DOS Compatibility flag is not set\n", 469},
- {"Partition %d does not exist yet!\n", 470},
+got EOF thrice - exiting..\n", 513},
+ {"Hex code (type L to list codes): ", 514},
+ {"%s (%d-%d, default %d): ", 515},
+ {"Using default value %d\n", 516},
+ {"Value out of range.\n", 517},
+ {"Partition number", 518},
+ {"Warning: partition %d has empty type\n", 519},
+ {"cylinder", 520},
+ {"sector", 521},
+ {"Changing display/entry units to %s\n", 522},
+ {"WARNING: Partition %d is an extended partition\n", 523},
+ {"DOS Compatibility flag is set\n", 524},
+ {"DOS Compatibility flag is not set\n", 525},
+ {"Partition %d does not exist yet!\n", 526},
{"\
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", 471},
+a partition using the `d' command.\n", 527},
{"\
You cannot change a partition into an extended one or vice versa\n\
-Delete it first.\n", 472},
+Delete it first.\n", 528},
{"\
Consider leaving partition 3 as Whole disk (5),\n\
as SunOS/Solaris expects it and even Linux likes it.\n\
-\n", 473},
+\n", 529},
{"\
Consider leaving partition 9 as volume header (0),\n\
and partition 11 as entire volume (6)as IRIX expects it.\n\
-\n", 474},
- {"Changed system type of partition %d to %x (%s)\n", 475},
- {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 476},
- {" phys=(%d, %d, %d) ", 477},
- {"logical=(%d, %d, %d)\n", 478},
- {"Partition %d has different physical/logical endings:\n", 479},
- {"Partition %i does not start on cylinder boundary:\n", 480},
- {"should be (%d, %d, 1)\n", 481},
- {"Partition %i does not end on cylinder boundary:\n", 482},
- {"should be (%d, %d, %d)\n", 483},
+\n", 530},
+ {"Changed system type of partition %d to %x (%s)\n", 531},
+ {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 532},
+ {" phys=(%d, %d, %d) ", 533},
+ {"logical=(%d, %d, %d)\n", 534},
+ {"Partition %d has different physical/logical endings:\n", 535},
+ {"Partition %i does not start on cylinder boundary:\n", 536},
+ {"should be (%d, %d, 1)\n", 537},
+ {"Partition %i does not end on cylinder boundary:\n", 538},
+ {"should be (%d, %d, %d)\n", 539},
{"\
\n\
Disk %s: %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * %d bytes\n\
-\n", 484},
- {"%*s Boot Start End Blocks Id System\n", 485},
- {"Device", 486},
+\n", 540},
+ {"%*s Boot Start End Blocks Id System\n", 541},
+ {"Device", 542},
{"\
\n\
Disk %s: %d heads, %d sectors, %d cylinders\n\
-\n", 487},
- {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 488},
- {"Warning: partition %d contains sector 0\n", 489},
- {"Partition %d: head %d greater than maximum %d\n", 490},
- {"Partition %d: sector %d greater than maximum %d\n", 491},
- {"Partitions %d: cylinder %d greater than maximum %d\n", 492},
- {"Partition %d: previous sectors %d disagrees with total %d\n", 493},
- {"Warning: bad start-of-data in partition %d\n", 494},
- {"Warning: partition %d overlaps partition %d.\n", 495},
- {"Warning: partition %d is empty\n", 496},
- {"Logical partition %d not entirely in partition %d\n", 497},
- {"Total allocated sectors %d greater than the maximum %d\n", 498},
- {"%d unallocated sectors\n", 499},
- {"Partition %d is already defined. Delete it before re-adding it.\n", 500},
- {"First %s", 501},
- {"Sector %d is already allocated\n", 502},
- {"No free sectors available\n", 503},
- {"Last %s or +size or +sizeM or +sizeK", 504},
- {"Warning: partition %d has an odd number of sectors.\n", 505},
- {"The maximum number of partitions has been created\n", 506},
- {"You must delete some partition and add an extended partition first\n", 507},
+\n", 543},
+ {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 544},
+ {"Warning: partition %d contains sector 0\n", 545},
+ {"Partition %d: head %d greater than maximum %d\n", 546},
+ {"Partition %d: sector %d greater than maximum %d\n", 547},
+ {"Partitions %d: cylinder %d greater than maximum %d\n", 548},
+ {"Partition %d: previous sectors %d disagrees with total %d\n", 549},
+ {"Warning: bad start-of-data in partition %d\n", 550},
+ {"Warning: partition %d overlaps partition %d.\n", 551},
+ {"Warning: partition %d is empty\n", 552},
+ {"Logical partition %d not entirely in partition %d\n", 553},
+ {"Total allocated sectors %d greater than the maximum %d\n", 554},
+ {"%d unallocated sectors\n", 555},
+ {"Partition %d is already defined. Delete it before re-adding it.\n", 556},
+ {"First %s", 557},
+ {"Sector %d is already allocated\n", 558},
+ {"No free sectors available\n", 559},
+ {"Last %s or +size or +sizeM or +sizeK", 560},
+ {"Warning: partition %d has an odd number of sectors.\n", 561},
+ {"The maximum number of partitions has been created\n", 562},
+ {"You must delete some partition and add an extended partition first\n", 563},
{"\
Command action\n\
%s\n\
- p primary partition (1-4)\n", 508},
- {"l logical (5 or over)", 509},
- {"e extended", 510},
- {"Invalid partition number for type `%c'\n", 511},
+ p primary partition (1-4)\n", 564},
+ {"l logical (5 or over)", 565},
+ {"e extended", 566},
+ {"Invalid partition number for type `%c'\n", 567},
{"\
The partition table has been altered!\n\
-\n", 512},
- {"Calling ioctl() to re-read partition table.\n", 513},
- {"Syncing disks.\n", 514},
+\n", 568},
+ {"Calling ioctl() to re-read partition table.\n", 569},
{"\
Re-read table failed with error %d: %s.\n\
-Reboot your system to ensure the partition table is updated.\n", 515},
+Reboot your system to ensure the partition table is updated.\n", 570},
{"\
\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", 516},
- {"Device: %s\n", 517},
- {"Partition %d has no data area\n", 518},
- {"New beginning of data", 519},
- {"Expert command (m for help): ", 520},
- {"Number of cylinders", 521},
- {"Number of heads", 522},
- {"Number of sectors", 523},
- {"Warning: setting sector offset for DOS compatiblity\n", 524},
- {"Disk %s doesn't contain a valid partition table\n", 525},
- {"Cannot open %s\n", 526},
- {"This kernel finds the sector size itself - -b option ignored\n", 527},
+information.\n", 571},
+ {"Syncing disks.\n", 572},
+ {"Device: %s\n", 573},
+ {"Partition %d has no data area\n", 574},
+ {"New beginning of data", 575},
+ {"Expert command (m for help): ", 576},
+ {"Number of cylinders", 577},
+ {"Number of heads", 578},
+ {"Number of sectors", 579},
+ {"Warning: setting sector offset for DOS compatiblity\n", 580},
+ {"Disk %s doesn't contain a valid partition table\n", 581},
+ {"Cannot open %s\n", 582},
+ {"cannot open %s\n", 583},
+ {"This kernel finds the sector size itself - -b option ignored\n", 584},
{"\
Warning: the -b (set sector size) option should be used with one specified \
-device\n", 528},
- {"Command (m for help): ", 529},
+device\n", 585},
+ {"Command (m for help): ", 586},
{"\
\n\
-The current boot file is: %s\n", 530},
- {"Please enter the name of the new boot file: ", 531},
- {"Boot file unchanged\n", 532},
+The current boot file is: %s\n", 587},
+ {"Please enter the name of the new boot file: ", 588},
+ {"Boot file unchanged\n", 589},
{"\
\n\
\tSorry, no experts menu for SGI partition tables available.\n\
-\n", 533},
+\n", 590},
{"\
\n\
\tThere is a valid AIX label on this disk.\n\
@@ -716,93 +800,93 @@ The current boot file is: %s\n", 530},
\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).", 534},
+\t machine. (Otherwise you become an AIXpert).", 591},
{"\
\n\
-BSD label for device: %s\n", 535},
- {" d delete a BSD partition", 536},
- {" e edit drive data", 537},
- {" i install bootstrap", 538},
- {" l list known filesystem types", 539},
- {" n add a new BSD partition", 540},
- {" p print BSD partition table", 541},
- {" s show complete disklabel", 542},
- {" t change a partition's filesystem id", 543},
- {" w write disklabel to disk", 544},
- {" x link BSD partition to non-BSD partition", 545},
- {"Partition %s%d has invalid starting sector 0.\n", 546},
- {"Reading disklabel of %s%d at sector %d.\n", 547},
- {"There is no *BSD partition on %s.\n", 548},
- {"BSD disklabel command (m for help): ", 549},
- {"type: %s\n", 550},
- {"type: %d\n", 551},
- {"disk: %.*s\n", 552},
- {"label: %.*s\n", 553},
- {"flags:", 554},
- {" removable", 555},
- {" ecc", 556},
- {" badsect", 557},
- {"bytes/sector: %ld\n", 558},
- {"sectors/track: %ld\n", 559},
- {"tracks/cylinder: %ld\n", 560},
- {"sectors/cylinder: %ld\n", 561},
- {"cylinders: %ld\n", 562},
- {"rpm: %d\n", 563},
- {"interleave: %d\n", 564},
- {"trackskew: %d\n", 565},
- {"cylinderskew: %d\n", 566},
- {"headswitch: %ld\t\t# milliseconds\n", 567},
- {"track-to-track seek: %ld\t# milliseconds\n", 568},
- {"drivedata: ", 569},
+BSD label for device: %s\n", 592},
+ {" d delete a BSD partition", 593},
+ {" e edit drive data", 594},
+ {" i install bootstrap", 595},
+ {" l list known filesystem types", 596},
+ {" n add a new BSD partition", 597},
+ {" p print BSD partition table", 598},
+ {" s show complete disklabel", 599},
+ {" t change a partition's filesystem id", 600},
+ {" w write disklabel to disk", 601},
+ {" x link BSD partition to non-BSD partition", 602},
+ {"Partition %s%d has invalid starting sector 0.\n", 603},
+ {"Reading disklabel of %s%d at sector %d.\n", 604},
+ {"There is no *BSD partition on %s.\n", 605},
+ {"BSD disklabel command (m for help): ", 606},
+ {"type: %s\n", 607},
+ {"type: %d\n", 608},
+ {"disk: %.*s\n", 609},
+ {"label: %.*s\n", 610},
+ {"flags:", 611},
+ {" removable", 612},
+ {" ecc", 613},
+ {" badsect", 614},
+ {"bytes/sector: %ld\n", 615},
+ {"sectors/track: %ld\n", 616},
+ {"tracks/cylinder: %ld\n", 617},
+ {"sectors/cylinder: %ld\n", 618},
+ {"cylinders: %ld\n", 619},
+ {"rpm: %d\n", 620},
+ {"interleave: %d\n", 621},
+ {"trackskew: %d\n", 622},
+ {"cylinderskew: %d\n", 623},
+ {"headswitch: %ld\t\t# milliseconds\n", 624},
+ {"track-to-track seek: %ld\t# milliseconds\n", 625},
+ {"drivedata: ", 626},
{"\
\n\
-%d partitions:\n", 570},
- {"# size offset fstype [fsize bsize cpg]\n", 571},
- {"Writing disklabel to %s%d.\n", 572},
- {"Writing disklabel to %s.\n", 573},
- {"%s%d contains no disklabel.\n", 574},
- {"%s contains no disklabel.\n", 575},
- {"Do you want to create a disklabel? (y/n) ", 576},
- {"bytes/sector", 577},
- {"sectors/track", 578},
- {"tracks/cylinder", 579},
- {"sectors/cylinder", 580},
- {"Must be <= sectors/track * tracks/cylinder (default).\n", 581},
- {"rpm", 582},
- {"interleave", 583},
- {"trackskew", 584},
- {"cylinderskew", 585},
- {"headswitch", 586},
- {"track-to-track seek", 587},
- {"Bootstrap: %sboot -> boot%s (%s): ", 588},
- {"Bootstrap overlaps with disk label!\n", 589},
- {"Bootstrap installed on %s%d.\n", 590},
- {"Bootstrap installed on %s.\n", 591},
- {"Partition (a-%c): ", 592},
- {"This partition already exists.\n", 593},
- {"Warning: too many partitions (%d, maximum is %d).\n", 594},
+%d partitions:\n", 627},
+ {"# size offset fstype [fsize bsize cpg]\n", 628},
+ {"Writing disklabel to %s%d.\n", 629},
+ {"Writing disklabel to %s.\n", 630},
+ {"%s%d contains no disklabel.\n", 631},
+ {"%s contains no disklabel.\n", 632},
+ {"Do you want to create a disklabel? (y/n) ", 633},
+ {"bytes/sector", 634},
+ {"sectors/track", 635},
+ {"tracks/cylinder", 636},
+ {"sectors/cylinder", 637},
+ {"Must be <= sectors/track * tracks/cylinder (default).\n", 638},
+ {"rpm", 639},
+ {"interleave", 640},
+ {"trackskew", 641},
+ {"cylinderskew", 642},
+ {"headswitch", 643},
+ {"track-to-track seek", 644},
+ {"Bootstrap: %sboot -> boot%s (%s): ", 645},
+ {"Bootstrap overlaps with disk label!\n", 646},
+ {"Bootstrap installed on %s%d.\n", 647},
+ {"Bootstrap installed on %s.\n", 648},
+ {"Partition (a-%c): ", 649},
+ {"This partition already exists.\n", 650},
+ {"Warning: too many partitions (%d, maximum is %d).\n", 651},
{"\
\n\
-Syncing disks.\n", 595},
- {"SGI volhdr", 596},
- {"SGI trkrepl", 597},
- {"SGI secrepl", 598},
- {"SGI raw", 599},
- {"SGI bsd", 600},
- {"SGI sysv", 601},
- {"SGI volume", 602},
- {"SGI efs", 603},
- {"SGI lvol", 604},
- {"SGI rlvol", 605},
- {"SGI xfs", 606},
- {"SGI xlvol", 607},
- {"SGI rxlvol", 608},
- {"Linux swap", 609},
- {"Linux native", 610},
+Syncing disks.\n", 652},
+ {"SGI volhdr", 653},
+ {"SGI trkrepl", 654},
+ {"SGI secrepl", 655},
+ {"SGI raw", 656},
+ {"SGI bsd", 657},
+ {"SGI sysv", 658},
+ {"SGI volume", 659},
+ {"SGI efs", 660},
+ {"SGI lvol", 661},
+ {"SGI rlvol", 662},
+ {"SGI xfs", 663},
+ {"SGI xlvol", 664},
+ {"SGI rxlvol", 665},
+ {"Linux swap", 666},
+ {"Linux native", 667},
{"\
According to MIPS Computer Systems, Inc the Label must not contain more than \
-512 bytes\n", 611},
- {"Detected sgi disklabel with wrong checksum.\n", 612},
+512 bytes\n", 668},
+ {"Detected sgi disklabel with wrong checksum.\n", 669},
{"\
\n\
Disk %s (SGI disk label): %d heads, %d sectors\n\
@@ -810,139 +894,139 @@ Disk %s (SGI disk label): %d heads, %d sectors\n\
%d extra sects/cyl, interleave %d:1\n\
%s\n\
Units = %s of %d * 512 bytes\n\
-\n", 613},
+\n", 670},
{"\
\n\
Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * 512 bytes\n\
-\n", 614},
+\n", 671},
{"\
----- partitions -----\n\
-%*s Info Start End Sectors Id System\n", 615},
+%*s Info Start End Sectors Id System\n", 672},
{"\
----- bootinfo -----\n\
Bootfile: %s\n\
------ directory entries -----\n", 616},
- {"%2d: %-10s sector%5u size%8u\n", 617},
+----- directory entries -----\n", 673},
+ {"%2d: %-10s sector%5u size%8u\n", 674},
{"\
\n\
Invalid Bootfile!\n\
\tThe bootfile must be an absolute non-zero pathname,\n\
-\te.g. \"/unix\" or \"/unix.save\".\n", 618},
+\te.g. \"/unix\" or \"/unix.save\".\n", 675},
{"\
\n\
-\tName of Bootfile too long: 16 bytes maximum.\n", 619},
+\tName of Bootfile too long: 16 bytes maximum.\n", 676},
{"\
\n\
-\tBootfile must have a fully qualified pathname.\n", 620},
+\tBootfile must have a fully qualified pathname.\n", 677},
{"\
\n\
\tBe aware, that the bootfile is not checked for existence.\n\
-\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 621},
+\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 678},
{"\
\n\
-\tBootfile is changed to \"%s\".\n", 622},
- {"More than one entire disk entry present.\n", 623},
- {"No partitions defined\n", 624},
- {"IRIX likes when Partition 11 covers the entire disk.\n", 625},
+\tBootfile is changed to \"%s\".\n", 679},
+ {"More than one entire disk entry present.\n", 680},
+ {"No partitions defined\n", 681},
+ {"IRIX likes when Partition 11 covers the entire disk.\n", 682},
{"\
The entire disk partition should start at block 0,\n\
-not at diskblock %d.\n", 626},
+not at diskblock %d.\n", 683},
{"\
The entire disk partition is only %d diskblock large,\n\
-but the disk is %d diskblocks long.\n", 627},
- {"One Partition (#11) should cover the entire disk.\n", 628},
- {"Partition %d does not start on cylinder boundary.\n", 629},
- {"Partition %d does not end on cylinder boundary.\n", 630},
- {"The Partition %d and %d overlap by %d sectors.\n", 631},
- {"Unused gap of %8d sectors - sectors %8d-%d\n", 632},
+but the disk is %d diskblocks long.\n", 684},
+ {"One Partition (#11) should cover the entire disk.\n", 685},
+ {"Partition %d does not start on cylinder boundary.\n", 686},
+ {"Partition %d does not end on cylinder boundary.\n", 687},
+ {"The Partition %d and %d overlap by %d sectors.\n", 688},
+ {"Unused gap of %8d sectors - sectors %8d-%d\n", 689},
{"\
\n\
-The boot partition does not exist.\n", 633},
+The boot partition does not exist.\n", 690},
{"\
\n\
-The swap partition does not exist.\n", 634},
+The swap partition does not exist.\n", 691},
{"\
\n\
-The swap partition has no swap type.\n", 635},
- {"\tYou have chosen an unusual boot file name.\n", 636},
- {"Sorry You may change the Tag of non-empty partitions.\n", 637},
+The swap partition has no swap type.\n", 692},
+ {"\tYou have chosen an unusual boot file name.\n", 693},
+ {"Sorry You may change the Tag of non-empty partitions.\n", 694},
{"\
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", 638},
- {"Do You know, You got a partition overlap on the disk?\n", 639},
- {"Attempting to generate entire disk entry automatically.\n", 640},
- {"The entire disk is already covered with partitions.\n", 641},
- {"You got a partition overlap on the disk. Fix it first!\n", 642},
+Type YES if you are sure about tagging this partition differently.\n", 695},
+ {"Do You know, You got a partition overlap on the disk?\n", 696},
+ {"Attempting to generate entire disk entry automatically.\n", 697},
+ {"The entire disk is already covered with partitions.\n", 698},
+ {"You got a partition overlap on the disk. Fix it first!\n", 699},
{"\
It is highly recommended that eleventh partition\n\
-covers the entire disk and is of type `SGI volume'\n", 643},
- {"You will get a partition overlap on the disk. Fix it first!\n", 644},
- {" Last %s", 645},
+covers the entire disk and is of type `SGI volume'\n", 700},
+ {"You will get a partition overlap on the disk. Fix it first!\n", 701},
+ {" Last %s", 702},
{"\
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 unrecoverable lost.\n\
-\n", 646},
- {"Trying to keep parameters of partition %d.\n", 647},
- {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 648},
- {"Empty", 649},
- {"SunOS root", 650},
- {"SunOS swap", 651},
- {"SunOS usr", 652},
- {"Whole disk", 653},
- {"SunOS stand", 654},
- {"SunOS var", 655},
- {"SunOS home", 656},
+\n", 703},
+ {"Trying to keep parameters of partition %d.\n", 704},
+ {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 705},
+ {"Empty", 706},
+ {"SunOS root", 707},
+ {"SunOS swap", 708},
+ {"SunOS usr", 709},
+ {"Whole disk", 710},
+ {"SunOS stand", 711},
+ {"SunOS var", 712},
+ {"SunOS home", 713},
{"\
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", 657},
- {"Autoconfigure found a %s%s%s\n", 658},
+or force a fresh label (s command in main menu)\n", 714},
+ {"Autoconfigure found a %s%s%s\n", 715},
{"\
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", 659},
+\n", 716},
{"\
Drive type\n\
? auto configure\n\
- 0 custom (with hardware detected defaults)", 660},
- {"Select type (? for auto, 0 for custom): ", 661},
- {"Autoconfigure failed.\n", 662},
- {"Sectors/track", 663},
- {"Alternate cylinders", 664},
- {"Physical cylinders", 665},
- {"Rotation speed (rpm)", 666},
- {"Interleave factor", 667},
- {"Extra sectors per cylinder", 668},
- {"You may change all the disk params from the x menu", 669},
- {"3,5\" floppy", 670},
- {"Linux custom", 671},
- {"Partition %d doesn't end on cylinder boundary\n", 672},
- {"Partition %d overlaps with others in sectors %d-%d\n", 673},
- {"Unused gap - sectors 0-%d\n", 674},
- {"Unused gap - sectors %d-%d\n", 675},
+ 0 custom (with hardware detected defaults)", 717},
+ {"Select type (? for auto, 0 for custom): ", 718},
+ {"Autoconfigure failed.\n", 719},
+ {"Sectors/track", 720},
+ {"Alternate cylinders", 721},
+ {"Physical cylinders", 722},
+ {"Rotation speed (rpm)", 723},
+ {"Interleave factor", 724},
+ {"Extra sectors per cylinder", 725},
+ {"You may change all the disk params from the x menu", 726},
+ {"3,5\" floppy", 727},
+ {"Linux custom", 728},
+ {"Partition %d doesn't end on cylinder boundary\n", 729},
+ {"Partition %d overlaps with others in sectors %d-%d\n", 730},
+ {"Unused gap - sectors 0-%d\n", 731},
+ {"Unused gap - sectors %d-%d\n", 732},
{"\
Other partitions already cover the whole disk.\n\
-Delete some/shrink them before retry.\n", 676},
+Delete some/shrink them before retry.\n", 733},
{"\
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", 677},
+to %d %s\n", 734},
{"\
If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\
-partition as Whole disk (5), starting at 0, with %u sectors\n", 678},
+partition as Whole disk (5), starting at 0, with %u sectors\n", 735},
{"\
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): ", 679},
+tagged with 82 (Linux swap): ", 736},
{"\
\n\
Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
@@ -950,1091 +1034,1088 @@ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
%d extra sects/cyl, interleave %d:1\n\
%s\n\
Units = %s of %d * 512 bytes\n\
-\n", 680},
+\n", 737},
{"\
\n\
Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * 512 bytes\n\
-\n", 681},
- {"%*s Flag Start End Blocks Id System\n", 682},
- {"Number of alternate cylinders", 683},
- {"Number of physical cylinders", 684},
- {"FAT12", 685},
- {"XENIX root", 686},
- {"XENIX usr", 687},
- {"FAT16 <32M", 688},
- {"Extended", 689},
- {"FAT16", 690},
- {"HPFS/NTFS", 691},
- {"AIX", 692},
- {"AIX bootable", 693},
- {"OS/2 Boot Manager", 694},
- {"Win95 FAT32", 695},
- {"Win95 FAT32 (LBA)", 696},
- {"Win95 FAT16 (LBA)", 697},
- {"Win95 Ext'd (LBA)", 698},
- {"OPUS", 699},
- {"Hidden FAT12", 700},
- {"Compaq diagnostics", 701},
- {"Hidden FAT16 <32M", 702},
- {"Hidden FAT16", 703},
- {"Hidden HPFS/NTFS", 704},
- {"AST Windows swapfile", 705},
- {"Hidden Win95 FAT32", 706},
- {"Hidden Win95 FAT32 (LBA)", 707},
- {"Hidden Win95 FAT16 (LBA)", 708},
- {"NEC DOS", 709},
- {"PartitionMagic recovery", 710},
- {"Venix 80286", 711},
- {"PPC PReP Boot", 712},
- {"SFS", 713},
- {"QNX4.x", 714},
- {"QNX4.x 2nd part", 715},
- {"QNX4.x 3rd part", 716},
- {"OnTrack DM", 717},
- {"OnTrack DM6 Aux1", 718},
- {"CP/M", 719},
- {"OnTrack DM6 Aux3", 720},
- {"OnTrackDM6", 721},
- {"EZ-Drive", 722},
- {"Golden Bow", 723},
- {"Priam Edisk", 724},
- {"SpeedStor", 725},
- {"GNU HURD or SysV", 726},
- {"Novell Netware 286", 727},
- {"Novell Netware 386", 728},
- {"DiskSecure Multi-Boot", 729},
- {"PC/IX", 730},
- {"Old Minix", 731},
- {"Minix / old Linux", 732},
- {"OS/2 hidden C: drive", 733},
- {"Linux extended", 734},
- {"NTFS volume set", 735},
- {"Amoeba", 736},
- {"Amoeba BBT", 737},
- {"IBM Thinkpad hibernation", 738},
- {"BSD/386", 739},
- {"OpenBSD", 740},
- {"NeXTSTEP", 741},
- {"BSDI fs", 742},
- {"BSDI swap", 743},
- {"DRDOS/sec (FAT-12)", 744},
- {"DRDOS/sec (FAT-16 < 32M)", 745},
- {"DRDOS/sec (FAT-16)", 746},
- {"Syrinx", 747},
- {"CP/M / CTOS / ...", 748},
- {"DOS access", 749},
- {"DOS R/O", 750},
- {"BeOS fs", 751},
- {"DOS secondary", 752},
- {"Linux raid autodetect", 753},
- {"LANstep", 754},
- {"BBT", 755},
- {"seek error on %s - cannot seek to %lu\n", 756},
- {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 757},
- {"out of memory - giving up\n", 758},
- {"read error on %s - cannot read sector %lu\n", 759},
- {"ERROR: sector %lu does not have an msdos signature\n", 760},
- {"write error on %s - cannot write sector %lu\n", 761},
- {"cannot open partition sector save file (%s)\n", 762},
- {"write error on %s\n", 763},
- {"cannot stat partition restore file (%s)\n", 764},
- {"partition restore file has wrong size - not restoring\n", 765},
- {"out of memory?\n", 766},
- {"cannot open partition restore file (%s)\n", 767},
- {"error reading %s\n", 768},
- {"cannot open device %s for writing\n", 769},
- {"error writing sector %lu on %s\n", 770},
+\n", 738},
+ {"%*s Flag Start End Blocks Id System\n", 739},
+ {"Number of alternate cylinders", 740},
+ {"Number of physical cylinders", 741},
+ {"FAT12", 742},
+ {"XENIX root", 743},
+ {"XENIX usr", 744},
+ {"FAT16 <32M", 745},
+ {"Extended", 746},
+ {"FAT16", 747},
+ {"HPFS/NTFS", 748},
+ {"AIX", 749},
+ {"AIX bootable", 750},
+ {"OS/2 Boot Manager", 751},
+ {"Win95 FAT32", 752},
+ {"Win95 FAT32 (LBA)", 753},
+ {"Win95 FAT16 (LBA)", 754},
+ {"Win95 Ext'd (LBA)", 755},
+ {"OPUS", 756},
+ {"Hidden FAT12", 757},
+ {"Compaq diagnostics", 758},
+ {"Hidden FAT16 <32M", 759},
+ {"Hidden FAT16", 760},
+ {"Hidden HPFS/NTFS", 761},
+ {"AST Windows swapfile", 762},
+ {"Hidden Win95 FAT32", 763},
+ {"Hidden Win95 FAT32 (LBA)", 764},
+ {"Hidden Win95 FAT16 (LBA)", 765},
+ {"NEC DOS", 766},
+ {"PartitionMagic recovery", 767},
+ {"Venix 80286", 768},
+ {"PPC PReP Boot", 769},
+ {"SFS", 770},
+ {"QNX4.x", 771},
+ {"QNX4.x 2nd part", 772},
+ {"QNX4.x 3rd part", 773},
+ {"OnTrack DM", 774},
+ {"OnTrack DM6 Aux1", 775},
+ {"CP/M", 776},
+ {"OnTrack DM6 Aux3", 777},
+ {"OnTrackDM6", 778},
+ {"EZ-Drive", 779},
+ {"Golden Bow", 780},
+ {"Priam Edisk", 781},
+ {"SpeedStor", 782},
+ {"GNU HURD or SysV", 783},
+ {"Novell Netware 286", 784},
+ {"Novell Netware 386", 785},
+ {"DiskSecure Multi-Boot", 786},
+ {"PC/IX", 787},
+ {"Old Minix", 788},
+ {"Minix / old Linux", 789},
+ {"OS/2 hidden C: drive", 790},
+ {"Linux extended", 791},
+ {"NTFS volume set", 792},
+ {"Amoeba", 793},
+ {"Amoeba BBT", 794},
+ {"IBM Thinkpad hibernation", 795},
+ {"BSD/386", 796},
+ {"OpenBSD", 797},
+ {"NeXTSTEP", 798},
+ {"BSDI fs", 799},
+ {"BSDI swap", 800},
+ {"DRDOS/sec (FAT-12)", 801},
+ {"DRDOS/sec (FAT-16 < 32M)", 802},
+ {"DRDOS/sec (FAT-16)", 803},
+ {"Syrinx", 804},
+ {"CP/M / CTOS / ...", 805},
+ {"DOS access", 806},
+ {"DOS R/O", 807},
+ {"BeOS fs", 808},
+ {"DOS secondary", 809},
+ {"Linux raid autodetect", 810},
+ {"LANstep", 811},
+ {"BBT", 812},
+ {"seek error on %s - cannot seek to %lu\n", 813},
+ {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 814},
+ {"out of memory - giving up\n", 815},
+ {"read error on %s - cannot read sector %lu\n", 816},
+ {"ERROR: sector %lu does not have an msdos signature\n", 817},
+ {"write error on %s - cannot write sector %lu\n", 818},
+ {"cannot open partition sector save file (%s)\n", 819},
+ {"write error on %s\n", 820},
+ {"cannot stat partition restore file (%s)\n", 821},
+ {"partition restore file has wrong size - not restoring\n", 822},
+ {"out of memory?\n", 823},
+ {"cannot open partition restore file (%s)\n", 824},
+ {"error reading %s\n", 825},
+ {"cannot open device %s for writing\n", 826},
+ {"error writing sector %lu on %s\n", 827},
{"\
Warning: start=%d - 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", 771},
- {"Warning: HDIO_GETGEO says that there are %d heads\n", 772},
- {"Warning: HDIO_GETGEO says that there are %d sectors\n", 773},
- {"Warning: HDIO_GETGEO says that there are %d cylinders\n", 774},
- {"Disk %s: cannot get geometry\n", 775},
+[Use the --force option if you really want this]\n", 828},
+ {"Warning: HDIO_GETGEO says that there are %d heads\n", 829},
+ {"Warning: HDIO_GETGEO says that there are %d sectors\n", 830},
+ {"Warning: HDIO_GETGEO says that there are %d cylinders\n", 831},
+ {"Disk %s: cannot get geometry\n", 832},
{"\
Warning: unlikely number of sectors (%d) - usually at most 63\n\
-This will give problems with all software that uses C/H/S addressing.\n", 776},
+This will give problems with all software that uses C/H/S addressing.\n", 833},
{"\
\n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 777},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 834},
{"\
-%s of partition %s has impossible value for head: %d (should be in 0-%d)\n", 778},
+%s of partition %s has impossible value for head: %d (should be in 0-%d)\n", 835},
{"\
-%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n", 779},
+%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n", 836},
{"\
%s of partition %s has impossible value for cylinders: %d (should be in \
-0-%d)\n", 780},
+0-%d)\n", 837},
{"\
Id Name\n\
-\n", 781},
- {"Re-reading the partition table ...\n", 782},
+\n", 838},
+ {"Re-reading the partition table ...\n", 839},
{"\
The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 783},
- {"Error closing %s\n", 784},
- {"%s: no such partition\n", 785},
- {"unrecognized format - using sectors\n", 786},
- {"# partition table of %s\n", 787},
- {"\
-unit: sectors\n\
-\n", 788},
- {"unimplemented format - using %s\n", 789},
+Reboot your system now, before using mkfs\n", 840},
+ {"Error closing %s\n", 841},
+ {"%s: no such partition\n", 842},
+ {"unrecognized format - using sectors\n", 843},
+ {"# partition table of %s\n", 844},
+ {"unimplemented format - using %s\n", 845},
{"\
Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 790},
- {" Device Boot Start End #cyls #blocks Id System\n", 791},
+\n", 846},
+ {" Device Boot Start End #cyls #blocks Id System\n", 847},
{"\
Units = sectors of 512 bytes, counting from %d\n\
-\n", 792},
- {" Device Boot Start End #sectors Id System\n", 793},
+\n", 848},
+ {" Device Boot Start End #sectors Id System\n", 849},
{"\
Units = blocks of 1024 bytes, counting from %d\n\
-\n", 794},
- {" Device Boot Start End #blocks Id System\n", 795},
+\n", 850},
+ {" Device Boot Start End #blocks Id System\n", 851},
{"\
Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 796},
- {" Device Boot Start End MB #blocks Id System\n", 797},
- {" start=%9lu", 798},
- {", size=%8lu", 799},
- {", Id=%2x", 800},
- {", bootable", 801},
- {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 802},
- {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 803},
- {"partition ends on cylinder %ld, beyond the end of the disk\n", 804},
- {"No partitions found\n", 805},
+\n", 852},
+ {" Device Boot Start End MB #blocks Id System\n", 853},
+ {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 854},
+ {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 855},
+ {"partition ends on cylinder %ld, beyond the end of the disk\n", 856},
+ {"No partitions found\n", 857},
{"\
Warning: The first partition 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", 806},
- {"no partition table present.\n", 807},
- {"strange, only %d partitions defined.\n", 808},
- {"Warning: partition %s has size 0 but is not marked Empty\n", 809},
- {"Warning: partition %s has size 0 and is bootable\n", 810},
- {"Warning: partition %s has size 0 and nonzero start\n", 811},
- {"Warning: partition %s ", 812},
- {"is not contained in partition %s\n", 813},
- {"Warning: partitions %s ", 814},
- {"and %s overlap\n", 815},
- {"Warning: partition %s contains part of ", 816},
- {"the partition table (sector %lu),\n", 817},
- {"and will destroy it when filled\n", 818},
- {"Warning: partition %s starts at sector 0\n", 819},
- {"Warning: partition %s extends past end of disk\n", 820},
- {"Among the primary partitions, at most one can be extended\n", 821},
- {" (although this is not a problem under Linux)\n", 822},
- {"Warning: partition %s does not start at a cylinder boundary\n", 823},
- {"Warning: partition %s does not end at a cylinder boundary\n", 824},
+For this listing I'll assume that geometry.\n", 858},
+ {"no partition table present.\n", 859},
+ {"strange, only %d partitions defined.\n", 860},
+ {"Warning: partition %s has size 0 but is not marked Empty\n", 861},
+ {"Warning: partition %s has size 0 and is bootable\n", 862},
+ {"Warning: partition %s has size 0 and nonzero start\n", 863},
+ {"Warning: partition %s ", 864},
+ {"is not contained in partition %s\n", 865},
+ {"Warning: partitions %s ", 866},
+ {"and %s overlap\n", 867},
+ {"Warning: partition %s contains part of ", 868},
+ {"the partition table (sector %lu),\n", 869},
+ {"and will destroy it when filled\n", 870},
+ {"Warning: partition %s starts at sector 0\n", 871},
+ {"Warning: partition %s extends past end of disk\n", 872},
+ {"Among the primary partitions, at most one can be extended\n", 873},
+ {" (although this is not a problem under Linux)\n", 874},
+ {"Warning: partition %s does not start at a cylinder boundary\n", 875},
+ {"Warning: partition %s does not end at a cylinder boundary\n", 876},
{"\
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", 825},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 877},
{"\
Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 826},
+LILO disregards the `bootable' flag.\n", 878},
{"\
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", 827},
- {"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 828},
- {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 829},
- {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 830},
- {"too many partitions - ignoring those past nr (%d)\n", 831},
- {"tree of partitions?\n", 832},
- {"detected Disk Manager - unable to handle that\n", 833},
- {"DM6 signature found - giving up\n", 834},
- {"strange..., an extended partition of size 0?\n", 835},
- {"strange..., a BSD partition of size 0?\n", 836},
- {" %s: unrecognized partition\n", 837},
- {"-n flag was given: Nothing changed\n", 838},
- {"Failed saving the old sectors - aborting\n", 839},
- {"Failed writing the partition on %s\n", 840},
- {"long or incomplete input line - quitting\n", 841},
- {"input error: `=' expected after %s field\n", 842},
- {"input error: unexpected character %c after %s field\n", 843},
- {"unrecognized input: %s\n", 844},
- {"number too big\n", 845},
- {"trailing junk after number\n", 846},
- {"no room for partition descriptor\n", 847},
- {"cannot build surrounding extended partition\n", 848},
- {"too many input fields\n", 849},
- {"No room for more\n", 850},
- {"Illegal type\n", 851},
- {"Warning: exceeds max allowable size (%lu)\n", 852},
- {"Warning: empty partition\n", 853},
- {"Warning: bad partition start (earliest %lu)\n", 854},
- {"unrecognized bootable flag - choose - or *\n", 855},
- {"partial c,h,s specification?\n", 856},
- {"Extended partition not where expected\n", 857},
- {"bad input\n", 858},
- {"too many partitions\n", 859},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 879},
+ {"\
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 880},
+ {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 881},
+ {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 882},
+ {"too many partitions - ignoring those past nr (%d)\n", 883},
+ {"tree of partitions?\n", 884},
+ {"detected Disk Manager - unable to handle that\n", 885},
+ {"DM6 signature found - giving up\n", 886},
+ {"strange..., an extended partition of size 0?\n", 887},
+ {"strange..., a BSD partition of size 0?\n", 888},
+ {" %s: unrecognized partition\n", 889},
+ {"-n flag was given: Nothing changed\n", 890},
+ {"Failed saving the old sectors - aborting\n", 891},
+ {"Failed writing the partition on %s\n", 892},
+ {"long or incomplete input line - quitting\n", 893},
+ {"input error: `=' expected after %s field\n", 894},
+ {"input error: unexpected character %c after %s field\n", 895},
+ {"unrecognized input: %s\n", 896},
+ {"number too big\n", 897},
+ {"trailing junk after number\n", 898},
+ {"no room for partition descriptor\n", 899},
+ {"cannot build surrounding extended partition\n", 900},
+ {"too many input fields\n", 901},
+ {"No room for more\n", 902},
+ {"Illegal type\n", 903},
+ {"Warning: exceeds max allowable size (%lu)\n", 904},
+ {"Warning: empty partition\n", 905},
+ {"Warning: bad partition start (earliest %lu)\n", 906},
+ {"unrecognized bootable flag - choose - or *\n", 907},
+ {"partial c,h,s specification?\n", 908},
+ {"Extended partition not where expected\n", 909},
+ {"bad input\n", 910},
+ {"too many partitions\n", 911},
{"\
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", 860},
- {"version", 861},
- {"Usage: %s [options] device ...\n", 862},
- {"device: something like /dev/hda or /dev/sda", 863},
- {"useful options:", 864},
- {" -s [or --show-size]: list size of a partition", 865},
- {" -c [or --id]: print or change partition Id", 866},
- {" -l [or --list]: list partitions of each device", 867},
- {" -d [or --dump]: idem, but in a format suitable for later input", 868},
- {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 869},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 912},
+ {"version", 913},
+ {"Usage: %s [options] device ...\n", 914},
+ {"device: something like /dev/hda or /dev/sda", 915},
+ {"useful options:", 916},
+ {" -s [or --show-size]: list size of a partition", 917},
+ {" -c [or --id]: print or change partition Id", 918},
+ {" -l [or --list]: list partitions of each device", 919},
+ {" -d [or --dump]: idem, but in a format suitable for later input", 920},
+ {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 921},
{"\
-uS, -uB, -uC, -uM: accept/report in units of \
-sectors/blocks/cylinders/MB", 870},
- {" -T [or --list-types]:list the known partition types", 871},
- {" -D [or --DOS]: for DOS-compatibility: waste a little space", 872},
- {" -R [or --re-read]: make kernel reread partition table", 873},
- {" -N# : change only the partition with number #", 874},
- {" -n : do not actually write to disk", 875},
- {"\
- -O file : save the sectors that will be overwritten to file", 876},
- {" -I file : restore these sectors again", 877},
- {" -v [or --version]: print version", 878},
- {" -? [or --help]: print this message", 879},
- {"dangerous options:", 880},
- {" -g [or --show-geometry]: print the kernel's idea of the geometry", 881},
+sectors/blocks/cylinders/MB", 922},
+ {" -T [or --list-types]:list the known partition types", 923},
+ {" -D [or --DOS]: for DOS-compatibility: waste a little space", 924},
+ {" -R [or --re-read]: make kernel reread partition table", 925},
+ {" -N# : change only the partition with number #", 926},
+ {" -n : do not actually write to disk", 927},
+ {"\
+ -O file : save the sectors that will be overwritten to file", 928},
+ {" -I file : restore these sectors again", 929},
+ {" -v [or --version]: print version", 930},
+ {" -? [or --help]: print this message", 931},
+ {"dangerous options:", 932},
+ {" -g [or --show-geometry]: print the kernel's idea of the geometry", 933},
{"\
-x [or --show-extended]: also list extended partitions on output\n\
- or expect descriptors for them on input", 882},
- {"\
- -L [or --Linux]: do not complain about things irrelevant for Linux", 883},
- {" -q [or --quiet]: suppress warning messages", 884},
- {" You can override the detected geometry using:", 885},
- {" -C# [or --cylinders #]:set the number of cylinders to use", 886},
- {" -H# [or --heads #]: set the number of heads to use", 887},
- {" -S# [or --sectors #]: set the number of sectors to use", 888},
- {"You can disable all consistency checking with:", 889},
- {" -f [or --force]: do what I say, even if it is stupid", 890},
- {"Usage:", 891},
- {"%s device\t\t list active partitions on device\n", 892},
- {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 893},
- {"%s -An device\t activate partition n, inactivate the other ones\n", 894},
- {"no command?\n", 895},
- {"total: %d blocks\n", 896},
- {"usage: sfdisk --print-id device partition-number\n", 897},
- {"usage: sfdisk --change-id device partition-number Id\n", 898},
- {"usage: sfdisk --id device partition-number [Id]\n", 899},
- {"can specify only one device (except with -l or -s)\n", 900},
- {"cannot open %s %s\n", 901},
- {"read-write", 902},
- {"for reading", 903},
- {"%s: OK\n", 904},
- {"%s: %d cylinders, %d heads, %d sectors/track\n", 905},
- {"%s: unknown geometry\n", 906},
- {"BLKGETSIZE ioctl failed for %s\n", 907},
- {"bad active byte: 0x%x instead of 0x80\n", 908},
+ or expect descriptors for them on input", 934},
+ {"\
+ -L [or --Linux]: do not complain about things irrelevant for Linux", 935},
+ {" -q [or --quiet]: suppress warning messages", 936},
+ {" You can override the detected geometry using:", 937},
+ {" -C# [or --cylinders #]:set the number of cylinders to use", 938},
+ {" -H# [or --heads #]: set the number of heads to use", 939},
+ {" -S# [or --sectors #]: set the number of sectors to use", 940},
+ {"You can disable all consistency checking with:", 941},
+ {" -f [or --force]: do what I say, even if it is stupid", 942},
+ {"Usage:", 943},
+ {"%s device\t\t list active partitions on device\n", 944},
+ {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 945},
+ {"%s -An device\t activate partition n, inactivate the other ones\n", 946},
+ {"no command?\n", 947},
+ {"total: %d blocks\n", 948},
+ {"usage: sfdisk --print-id device partition-number\n", 949},
+ {"usage: sfdisk --change-id device partition-number Id\n", 950},
+ {"usage: sfdisk --id device partition-number [Id]\n", 951},
+ {"can specify only one device (except with -l or -s)\n", 952},
+ {"cannot open %s %s\n", 953},
+ {"read-write", 954},
+ {"for reading", 955},
+ {"%s: OK\n", 956},
+ {"%s: %d cylinders, %d heads, %d sectors/track\n", 957},
+ {"%s: unknown geometry\n", 958},
+ {"BLKGETSIZE ioctl failed for %s\n", 959},
+ {"bad active byte: 0x%x instead of 0x80\n", 960},
{"\
Done\n\
-\n", 909},
+\n", 961},
{"\
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", 910},
- {"partition %s has id %x and is not hidden\n", 911},
- {"Bad Id %x\n", 912},
- {"This disk is currently in use.\n", 913},
- {"Fatal error: cannot find %s\n", 914},
- {"Warning: %s is not a block device\n", 915},
- {"Checking that no-one is using this disk right now ...\n", 916},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 962},
+ {"partition %s has id %x and is not hidden\n", 963},
+ {"Bad Id %x\n", 964},
+ {"This disk is currently in use.\n", 965},
+ {"Fatal error: cannot find %s\n", 966},
+ {"Warning: %s is not a block device\n", 967},
+ {"Checking that no-one is using this disk right now ...\n", 968},
{"\
\n\
This disk is currently in use - repartitioning is probably a bad idea.Umount \
all file systems, and swapoff all swap partitions on this disk.Use the \
---no-reread flag to suppress this check.\n", 917},
- {"Use the --force flag to overrule all checks.\n", 918},
- {"OK", 919},
- {"Old situation:\n", 920},
- {"Partition %d does not exist, cannot change it\n", 921},
- {"New situation:\n", 922},
+--no-reread flag to suppress this check.\n", 969},
+ {"Use the --force flag to overrule all checks.\n", 970},
+ {"OK", 971},
+ {"Old situation:\n", 972},
+ {"Partition %d does not exist, cannot change it\n", 973},
+ {"New situation:\n", 974},
{"\
I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 923},
- {"I don't like this - probably you should answer No\n", 924},
- {"Are you satisfied with this? [ynq] ", 925},
- {"Do you want to write this to disk? [ynq] ", 926},
+(If you really want this, use the --force option.)\n", 975},
+ {"I don't like this - probably you should answer No\n", 976},
+ {"Are you satisfied with this? [ynq] ", 977},
+ {"Do you want to write this to disk? [ynq] ", 978},
{"\
\n\
-sfdisk: premature end of input\n", 927},
- {"Quitting - nothing changed\n", 928},
- {"Please answer one of y,n,q\n", 929},
+sfdisk: premature end of input\n", 979},
+ {"Quitting - nothing changed\n", 980},
+ {"Please answer one of y,n,q\n", 981},
{"\
Successfully wrote the new partition table\n\
-\n", 930},
+\n", 982},
{"\
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", 931},
- {"usage: banner [-w width]\n", 932},
- {"Message: ", 933},
- {"The character '%c' is not in my character set", 934},
- {"Message '%s' is OK\n", 935},
- {"Try `getopt --help' for more information.\n", 936},
- {"empty long option after -l or --long argument", 937},
- {"unknown shell after -s or --shell argument", 938},
- {"Usage: getopt optstring parameters\n", 939},
- {" getopt [options] [--] optstring parameters\n", 940},
- {" getopt [options] -o|--options optstring [options] [--]\n", 941},
- {" parameters\n", 942},
- {"\
- -a, --alternative Allow long options starting with single -\n", 943},
- {" -h, --help This small usage guide\n", 944},
- {" -l, --longoptions=longopts Long options to be recognized\n", 945},
- {"\
- -n, --name=progname The name under which errors are reported\n", 946},
- {" -o, --options=optstring Short options to be recognized\n", 947},
- {" -q, --quiet Disable error reporting by getopt(3)\n", 948},
- {" -Q, --quiet-output No normal output\n", 949},
- {" -s, --shell=shell Set shell quoting conventions\n", 950},
- {" -T, --test Test for getopt(1) version\n", 951},
- {" -V, --version Output version information\n", 952},
- {"missing optstring argument", 953},
- {"getopt (enhanced) 1.0.3\n", 954},
- {"internal error, contact the author.", 955},
- {"calling open_tty\n", 956},
- {"calling termio_init\n", 957},
- {"writing init string\n", 958},
- {"before autobaud\n", 959},
- {"waiting for cr-lf\n", 960},
- {"read %c\n", 961},
- {"reading login name\n", 962},
- {"%s: can't exec %s: %m", 963},
- {"can't malloc initstring", 964},
- {"bad timeout value: %s", 965},
- {"after getopt loop\n", 966},
- {"exiting parseargs\n", 967},
- {"entered parse_speeds\n", 968},
- {"bad speed: %s", 969},
- {"too many alternate speeds", 970},
- {"exiting parsespeeds\n", 971},
- {"%s: open for update: %m", 972},
- {"%s: no utmp entry", 973},
- {"/dev: chdir() failed: %m", 974},
- {"/dev/%s: not a character device", 975},
- {"open(2)\n", 976},
- {"/dev/%s: cannot open as standard input: %m", 977},
- {"%s: not open for read/write", 978},
- {"duping\n", 979},
- {"%s: dup problem: %m", 980},
- {"term_io 2\n", 981},
- {"user", 982},
- {"users", 983},
- {"%s: read: %m", 984},
- {"%s: input overrun", 985},
- {"\
-Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] \
-baud_rate,... line [termtype]\n\
-or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] line \
-baud_rate,... [termtype]\n", 986},
- {"badlogin: %s\n", 987},
- {"sleepexit %d\n", 988},
- {"login: memory low, login may fail\n", 989},
- {"can't malloc for ttyclass", 990},
- {"can't malloc for grplist", 991},
- {"Login on %s from %s denied by default.\n", 992},
- {"Login on %s from %s denied.\n", 993},
- {"%s: you (user %d) don't exist.\n", 994},
- {"%s: user \"%s\" does not exist.\n", 995},
- {"%s: can only change local entries; use yp%s instead.\n", 996},
- {"Changing finger information for %s.\n", 997},
- {"Password error.", 998},
- {"Password: ", 999},
- {"Incorrect password.", 1000},
- {"Finger information not changed.\n", 1001},
- {"Usage: %s [ -f full-name ] [ -o office ] ", 1002},
+(See fdisk(8).)\n", 983},
+ {"usage: banner [-w width]\n", 984},
+ {"Message: ", 985},
+ {"The character '%c' is not in my character set", 986},
+ {"Message '%s' is OK\n", 987},
+ {"Try `getopt --help' for more information.\n", 988},
+ {"empty long option after -l or --long argument", 989},
+ {"unknown shell after -s or --shell argument", 990},
+ {"Usage: getopt optstring parameters\n", 991},
+ {" getopt [options] [--] optstring parameters\n", 992},
+ {" getopt [options] -o|--options optstring [options] [--]\n", 993},
+ {" parameters\n", 994},
+ {"\
+ -a, --alternative Allow long options starting with single -\n", 995},
+ {" -h, --help This small usage guide\n", 996},
+ {" -l, --longoptions=longopts Long options to be recognized\n", 997},
+ {"\
+ -n, --name=progname The name under which errors are reported\n", 998},
+ {" -o, --options=optstring Short options to be recognized\n", 999},
+ {" -q, --quiet Disable error reporting by getopt(3)\n", 1000},
+ {" -Q, --quiet-output No normal output\n", 1001},
+ {" -s, --shell=shell Set shell quoting conventions\n", 1002},
+ {" -T, --test Test for getopt(1) version\n", 1003},
+ {" -V, --version Output version information\n", 1004},
+ {"missing optstring argument", 1005},
+ {"getopt (enhanced) 1.0.3\n", 1006},
+ {"internal error, contact the author.", 1007},
+ {"calling open_tty\n", 1008},
+ {"calling termio_init\n", 1009},
+ {"writing init string\n", 1010},
+ {"before autobaud\n", 1011},
+ {"waiting for cr-lf\n", 1012},
+ {"read %c\n", 1013},
+ {"reading login name\n", 1014},
+ {"%s: can't exec %s: %m", 1015},
+ {"can't malloc initstring", 1016},
+ {"bad timeout value: %s", 1017},
+ {"after getopt loop\n", 1018},
+ {"exiting parseargs\n", 1019},
+ {"entered parse_speeds\n", 1020},
+ {"bad speed: %s", 1021},
+ {"too many alternate speeds", 1022},
+ {"exiting parsespeeds\n", 1023},
+ {"%s: open for update: %m", 1024},
+ {"%s: no utmp entry", 1025},
+ {"/dev: chdir() failed: %m", 1026},
+ {"/dev/%s: not a character device", 1027},
+ {"open(2)\n", 1028},
+ {"/dev/%s: cannot open as standard input: %m", 1029},
+ {"%s: not open for read/write", 1030},
+ {"duping\n", 1031},
+ {"%s: dup problem: %m", 1032},
+ {"term_io 2\n", 1033},
+ {"user", 1034},
+ {"users", 1035},
+ {"%s: read: %m", 1036},
+ {"%s: input overrun", 1037},
+ {"\
+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", 1038},
+ {"badlogin: %s\n", 1039},
+ {"sleepexit %d\n", 1040},
+ {"login: memory low, login may fail\n", 1041},
+ {"can't malloc for ttyclass", 1042},
+ {"can't malloc for grplist", 1043},
+ {"Login on %s from %s denied by default.\n", 1044},
+ {"Login on %s from %s denied.\n", 1045},
+ {"%s: you (user %d) don't exist.\n", 1046},
+ {"%s: user \"%s\" does not exist.\n", 1047},
+ {"%s: can only change local entries; use yp%s instead.\n", 1048},
+ {"Changing finger information for %s.\n", 1049},
+ {"Password error.", 1050},
+ {"Password: ", 1051},
+ {"Incorrect password.", 1052},
+ {"Finger information not changed.\n", 1053},
+ {"Usage: %s [ -f full-name ] [ -o office ] ", 1054},
{"\
[ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1003},
- {"[ --help ] [ --version ]\n", 1004},
+\t[ -h home-phone ] ", 1055},
+ {"[ --help ] [ --version ]\n", 1056},
{"\
\n\
-Aborted.\n", 1005},
- {"field is too long.\n", 1006},
- {"'%c' is not allowed.\n", 1007},
- {"Control characters are not allowed.\n", 1008},
- {"Finger information *NOT* changed. Try again later.\n", 1009},
- {"Finger information changed.\n", 1010},
- {"malloc failed", 1011},
- {"%s: Your shell is not in /etc/shells, shell change denied\n", 1012},
- {"Changing shell for %s.\n", 1013},
- {"New shell", 1014},
- {"Shell not changed.\n", 1015},
- {"Shell *NOT* changed. Try again later.\n", 1016},
- {"Shell changed.\n", 1017},
- {"Usage: %s [ -s shell ] ", 1018},
- {"[ --list-shells ] [ --help ] [ --version ]\n", 1019},
- {" [ username ]\n", 1020},
- {"%s: shell must be a full path name.\n", 1021},
- {"%s: \"%s\" does not exist.\n", 1022},
- {"%s: \"%s\" is not executable.\n", 1023},
- {"%s: '%c' is not allowed.\n", 1024},
- {"%s: Control characters are not allowed.\n", 1025},
- {"Warning: \"%s\" is not listed in /etc/shells\n", 1026},
- {"%s: \"%s\" is not listed in /etc/shells.\n", 1027},
- {"%s: use -l option to see list\n", 1028},
- {"Warning: \"%s\" is not listed in /etc/shells.\n", 1029},
- {"Use %s -l to see list.\n", 1030},
- {"No known shells.\n", 1031},
- {"couldn't open /dev/urandom", 1032},
- {"couldn't read random data from /dev/urandom", 1033},
- {"can't open %s for reading", 1034},
- {"can't stat(%s)", 1035},
- {"%s doesn't have the correct filemodes", 1036},
- {"can't read data from %s", 1037},
- {"Can't read %s, exiting.", 1038},
- {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1039},
- {" still logged in", 1040},
+Aborted.\n", 1057},
+ {"field is too long.\n", 1058},
+ {"'%c' is not allowed.\n", 1059},
+ {"Control characters are not allowed.\n", 1060},
+ {"Finger information *NOT* changed. Try again later.\n", 1061},
+ {"Finger information changed.\n", 1062},
+ {"malloc failed", 1063},
+ {"%s: Your shell is not in /etc/shells, shell change denied\n", 1064},
+ {"Changing shell for %s.\n", 1065},
+ {"New shell", 1066},
+ {"Shell not changed.\n", 1067},
+ {"Shell *NOT* changed. Try again later.\n", 1068},
+ {"Shell changed.\n", 1069},
+ {"Usage: %s [ -s shell ] ", 1070},
+ {"[ --list-shells ] [ --help ] [ --version ]\n", 1071},
+ {" [ username ]\n", 1072},
+ {"%s: shell must be a full path name.\n", 1073},
+ {"%s: \"%s\" does not exist.\n", 1074},
+ {"%s: \"%s\" is not executable.\n", 1075},
+ {"%s: '%c' is not allowed.\n", 1076},
+ {"%s: Control characters are not allowed.\n", 1077},
+ {"Warning: \"%s\" is not listed in /etc/shells\n", 1078},
+ {"%s: \"%s\" is not listed in /etc/shells.\n", 1079},
+ {"%s: use -l option to see list\n", 1080},
+ {"Warning: \"%s\" is not listed in /etc/shells.\n", 1081},
+ {"Use %s -l to see list.\n", 1082},
+ {"No known shells.\n", 1083},
+ {"couldn't open /dev/urandom", 1084},
+ {"couldn't read random data from /dev/urandom", 1085},
+ {"can't open %s for reading", 1086},
+ {"can't stat(%s)", 1087},
+ {"%s doesn't have the correct filemodes", 1088},
+ {"can't read data from %s", 1089},
+ {"Can't read %s, exiting.", 1090},
+ {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1091},
+ {" still logged in", 1092},
{"\
\n\
-wtmp begins %s", 1041},
- {"last: malloc failure.\n", 1042},
- {"last: gethostname", 1043},
+wtmp begins %s", 1093},
+ {"last: malloc failure.\n", 1094},
+ {"last: gethostname", 1095},
{"\
\n\
-interrupted %10.10s %5.5s \n", 1044},
- {"login: -h for super-user only.\n", 1045},
- {"usage: login [-fp] [username]\n", 1046},
- {"login: PAM Failure, aborting: %s\n", 1047},
- {"Couldn't initialize PAM: %s", 1048},
- {"FAILED LOGIN %d FROM %s FOR %s, %s", 1049},
+interrupted %10.10s %5.5s \n", 1096},
+ {"login: -h for super-user only.\n", 1097},
+ {"usage: login [-fp] [username]\n", 1098},
+ {"login: PAM Failure, aborting: %s\n", 1099},
+ {"Couldn't initialize PAM: %s", 1100},
+ {"login: ", 1101},
+ {"FAILED LOGIN %d FROM %s FOR %s, %s", 1102},
{"\
Login incorrect\n\
-\n", 1050},
- {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1051},
- {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1052},
+\n", 1103},
+ {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1104},
+ {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1105},
{"\
\n\
-Login incorrect\n", 1053},
- {"Illegal username", 1054},
- {"%s login refused on this terminal.\n", 1055},
- {"LOGIN %s REFUSED FROM %s ON TTY %s", 1056},
- {"LOGIN %s REFUSED ON TTY %s", 1057},
- {"Login incorrect\n", 1058},
+Login incorrect\n", 1106},
+ {"Illegal username", 1107},
+ {"%s login refused on this terminal.\n", 1108},
+ {"LOGIN %s REFUSED FROM %s ON TTY %s", 1109},
+ {"LOGIN %s REFUSED ON TTY %s", 1110},
+ {"Login incorrect\n", 1111},
{"\
Too many users logged on already.\n\
-Try again later.\n", 1059},
- {"You have too many processes running.\n", 1060},
- {"Warning: no Kerberos tickets issued\n", 1061},
- {"Sorry -- your password has expired.\n", 1062},
- {"Warning: your password expires on %s %d, %d\n", 1063},
- {"Sorry -- your account has expired.\n", 1064},
- {"Warning: your account expires on %s %d, %d\n", 1065},
- {"DIALUP AT %s BY %s", 1066},
- {"ROOT LOGIN ON %s FROM %s", 1067},
- {"ROOT LOGIN ON %s", 1068},
- {"LOGIN ON %s BY %s FROM %s", 1069},
- {"LOGIN ON %s BY %s", 1070},
- {"You have %smail.\n", 1071},
- {"new ", 1072},
- {"login: failure forking: %s", 1073},
- {"setuid() failed", 1074},
- {"No directory %s!\n", 1075},
- {"Logging in with home = \"/\".\n", 1076},
- {"login: no memory for shell script.\n", 1077},
- {"login: couldn't exec shell script: %s.\n", 1078},
- {"login: no shell: %s.\n", 1079},
+Try again later.\n", 1112},
+ {"You have too many processes running.\n", 1113},
+ {"Warning: no Kerberos tickets issued\n", 1114},
+ {"Sorry -- your password has expired.\n", 1115},
+ {"Warning: your password expires on %s %d, %d\n", 1116},
+ {"Sorry -- your account has expired.\n", 1117},
+ {"Warning: your account expires on %s %d, %d\n", 1118},
+ {"DIALUP AT %s BY %s", 1119},
+ {"ROOT LOGIN ON %s FROM %s", 1120},
+ {"ROOT LOGIN ON %s", 1121},
+ {"LOGIN ON %s BY %s FROM %s", 1122},
+ {"LOGIN ON %s BY %s", 1123},
+ {"You have %smail.\n", 1124},
+ {"new ", 1125},
+ {"login: failure forking: %s", 1126},
+ {"setuid() failed", 1127},
+ {"No directory %s!\n", 1128},
+ {"Logging in with home = \"/\".\n", 1129},
+ {"login: no memory for shell script.\n", 1130},
+ {"login: couldn't exec shell script: %s.\n", 1131},
+ {"login: no shell: %s.\n", 1132},
{"\
\n\
-%s login: ", 1080},
- {"login name much too long.\n", 1081},
- {"NAME too long", 1082},
- {"login names may not start with '-'.\n", 1083},
- {"too many bare linefeeds.\n", 1084},
- {"EXCESSIVE linefeeds", 1085},
- {"Login timed out after %d seconds\n", 1086},
- {"Last login: %.*s ", 1087},
- {"from %.*s\n", 1088},
- {"on %.*s\n", 1089},
- {"LOGIN FAILURE FROM %s, %s", 1090},
- {"LOGIN FAILURE ON %s, %s", 1091},
- {"%d LOGIN FAILURES FROM %s, %s", 1092},
- {"%d LOGIN FAILURES ON %s, %s", 1093},
- {"is y\n", 1094},
- {"is n\n", 1095},
- {"usage: mesg [y | n]\n", 1096},
- {"newgrp: Who are you?", 1097},
- {"newgrp: setgid", 1098},
- {"newgrp: No such group.", 1099},
- {"newgrp: Permission denied", 1100},
- {"newgrp: setuid", 1101},
- {"No shell", 1102},
- {"The password must have at least 6 characters, try again.\n", 1103},
- {"The password must contain characters out of two of the following\n", 1104},
- {"classes: upper and lower case letters, digits and non alphanumeric\n", 1105},
- {"characters. See passwd(1) for more information.\n", 1106},
- {"You cannot reuse the old password.\n", 1107},
- {"Please don't use something like your username as password!\n", 1108},
- {"Please don't use something like your realname as password!\n", 1109},
- {"Usage: passwd [username [password]]\n", 1110},
- {"Only root may use the one and two argument forms.\n", 1111},
- {"Usage: passwd [-foqsvV] [user [password]]\n", 1112},
- {"Can't exec %s: %s\n", 1113},
- {"Cannot find login name", 1114},
- {"Only root can change the password for others.\n", 1115},
- {"Too many arguments.\n", 1116},
- {"Can't find username anywhere. Is `%s' really a user?", 1117},
- {"Sorry, I can only change local passwords. Use yppasswd instead.", 1118},
- {"UID and username does not match, imposter!", 1119},
- {"Changing password for %s\n", 1120},
- {"Enter old password: ", 1121},
- {"Illegal password, imposter.", 1122},
- {"Enter new password: ", 1123},
- {"Password not changed.", 1124},
- {"Re-type new password: ", 1125},
- {"You misspelled it. Password not changed.", 1126},
- {"password changed, user %s", 1127},
- {"ROOT PASSWORD CHANGED", 1128},
- {"password changed by root, user %s", 1129},
- {"calling setpwnam to set password.\n", 1130},
- {"Password *NOT* changed. Try again later.\n", 1131},
- {"Password changed.\n", 1132},
- {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1133},
- {"Shutdown process aborted", 1134},
- {"%s: Only root can shut a system down.\n", 1135},
- {"That must be tomorrow, can't you wait till then?\n", 1136},
- {"for maintenance; bounce, bounce", 1137},
- {"timeout = %d, quiet = %d, reboot = %d\n", 1138},
- {"The system is being shut down within 5 minutes", 1139},
- {"Login is therefore prohibited.", 1140},
- {"%s by %s: %s", 1141},
- {"rebooted", 1142},
- {"halted", 1143},
+%s login: ", 1133},
+ {"login name much too long.\n", 1134},
+ {"NAME too long", 1135},
+ {"login names may not start with '-'.\n", 1136},
+ {"too many bare linefeeds.\n", 1137},
+ {"EXCESSIVE linefeeds", 1138},
+ {"Login timed out after %d seconds\n", 1139},
+ {"Last login: %.*s ", 1140},
+ {"from %.*s\n", 1141},
+ {"on %.*s\n", 1142},
+ {"LOGIN FAILURE FROM %s, %s", 1143},
+ {"LOGIN FAILURE ON %s, %s", 1144},
+ {"%d LOGIN FAILURES FROM %s, %s", 1145},
+ {"%d LOGIN FAILURES ON %s, %s", 1146},
+ {"is y\n", 1147},
+ {"is n\n", 1148},
+ {"usage: mesg [y | n]\n", 1149},
+ {"newgrp: Who are you?", 1150},
+ {"newgrp: setgid", 1151},
+ {"newgrp: No such group.", 1152},
+ {"newgrp: Permission denied", 1153},
+ {"newgrp: setuid", 1154},
+ {"No shell", 1155},
+ {"The password must have at least 6 characters, try again.\n", 1156},
+ {"The password must contain characters out of two of the following\n", 1157},
+ {"classes: upper and lower case letters, digits and non alphanumeric\n", 1158},
+ {"characters. See passwd(1) for more information.\n", 1159},
+ {"You cannot reuse the old password.\n", 1160},
+ {"Please don't use something like your username as password!\n", 1161},
+ {"Please don't use something like your realname as password!\n", 1162},
+ {"Usage: passwd [username [password]]\n", 1163},
+ {"Only root may use the one and two argument forms.\n", 1164},
+ {"Usage: passwd [-foqsvV] [user [password]]\n", 1165},
+ {"Can't exec %s: %s\n", 1166},
+ {"Cannot find login name", 1167},
+ {"Only root can change the password for others.\n", 1168},
+ {"Too many arguments.\n", 1169},
+ {"Can't find username anywhere. Is `%s' really a user?", 1170},
+ {"Sorry, I can only change local passwords. Use yppasswd instead.", 1171},
+ {"UID and username does not match, imposter!", 1172},
+ {"Changing password for %s\n", 1173},
+ {"Enter old password: ", 1174},
+ {"Illegal password, imposter.", 1175},
+ {"Enter new password: ", 1176},
+ {"Password not changed.", 1177},
+ {"Re-type new password: ", 1178},
+ {"You misspelled it. Password not changed.", 1179},
+ {"password changed, user %s", 1180},
+ {"ROOT PASSWORD CHANGED", 1181},
+ {"password changed by root, user %s", 1182},
+ {"calling setpwnam to set password.\n", 1183},
+ {"Password *NOT* changed. Try again later.\n", 1184},
+ {"Password changed.\n", 1185},
+ {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1186},
+ {"Shutdown process aborted", 1187},
+ {"%s: Only root can shut a system down.\n", 1188},
+ {"That must be tomorrow, can't you wait till then?\n", 1189},
+ {"for maintenance; bounce, bounce", 1190},
+ {"timeout = %d, quiet = %d, reboot = %d\n", 1191},
+ {"The system is being shut down within 5 minutes", 1192},
+ {"Login is therefore prohibited.", 1193},
+ {"%s by %s: %s", 1194},
+ {"rebooted", 1195},
+ {"halted", 1196},
{"\
\n\
-Why am I still alive after reboot?", 1144},
+Why am I still alive after reboot?", 1197},
{"\
\n\
-Now you can turn off the power...", 1145},
- {"Calling kernel power-off facility...\n", 1146},
- {"Error powering off\t%s\n", 1147},
- {"Executing the program \"%s\" ...\n", 1148},
- {"Error executing\t%s\n", 1149},
- {"URGENT: broadcast message from %s:", 1150},
- {"System going down IMMEDIATELY!\n", 1151},
- {"System going down in %d hour%s %d minutes", 1152},
- {"s", 1153},
- {"System going down in %d minute%s\n", 1154},
- {"\t... %s ...\n", 1155},
- {"Cannot fork for swapoff. Shrug!", 1156},
- {"Cannot exec swapoff, hoping umount will do the trick.", 1157},
- {"Cannot fork for umount, trying manually.", 1158},
- {"Cannot exec %s, trying umount.\n", 1159},
- {"Cannot exec umount, giving up on umount.", 1160},
- {"Unmounting any remaining filesystems...", 1161},
- {"shutdown: Couldn't umount %s\n", 1162},
- {"Booting to single user mode.\n", 1163},
- {"exec of single user shell failed\n", 1164},
- {"fork of single user shell failed\n", 1165},
+Now you can turn off the power...", 1198},
+ {"Calling kernel power-off facility...\n", 1199},
+ {"Error powering off\t%s\n", 1200},
+ {"Executing the program \"%s\" ...\n", 1201},
+ {"Error executing\t%s\n", 1202},
+ {"URGENT: broadcast message from %s:", 1203},
+ {"System going down IMMEDIATELY!\n", 1204},
+ {"System going down in %d hour%s %d minutes", 1205},
+ {"s", 1206},
+ {"System going down in %d minute%s\n", 1207},
+ {"\t... %s ...\n", 1208},
+ {"Cannot fork for swapoff. Shrug!", 1209},
+ {"Cannot exec swapoff, hoping umount will do the trick.", 1210},
+ {"Cannot fork for umount, trying manually.", 1211},
+ {"Cannot exec %s, trying umount.\n", 1212},
+ {"Cannot exec umount, giving up on umount.", 1213},
+ {"Unmounting any remaining filesystems...", 1214},
+ {"shutdown: Couldn't umount %s\n", 1215},
+ {"Booting to single user mode.\n", 1216},
+ {"exec of single user shell failed\n", 1217},
+ {"fork of single user shell failed\n", 1218},
{"\
\n\
-Wrong password.\n", 1166},
- {"exec rc failed\n", 1167},
- {"open of rc file failed\n", 1168},
- {"fork of rc shell failed\n", 1169},
- {"fork failed\n", 1170},
- {"exec failed\n", 1171},
- {"cannot open inittab\n", 1172},
- {"no TERM or cannot stat tty\n", 1173},
- {"too many iov's (change code in wall/ttymsg.c)", 1174},
- {"excessively long line arg", 1175},
- {"cannot fork", 1176},
- {"fork: %s", 1177},
- {"%s: BAD ERROR", 1178},
- {"%s: the %s file is busy.\n", 1179},
- {"%s: the %s file is busy (%s present)\n", 1180},
- {"%s: can't link %s: %s\n", 1181},
- {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1182},
- {"%s: Cannot fork\n", 1183},
- {"%s: %s unchanged\n", 1184},
- {"%s: no changes made\n", 1185},
- {"usage: %s [file]\n", 1186},
- {"%s: can't open temporary file.\n", 1187},
- {"Broadcast Message from %s@%s", 1188},
- {"%s: can't read %s.\n", 1189},
- {"%s: can't stat temporary file.\n", 1190},
- {"%s: can't read temporary file.\n", 1191},
- {"illegal month value: use 1-12", 1192},
- {"illegal year value: use 1-9999", 1193},
- {"usage: cal [-mjy] [[month] year]\n", 1194},
- {"usage: %s [+format] [day month year]\n", 1195},
- {"St. Tib's Day", 1196},
- {"%s: unknown signal %s\n", 1197},
- {"%s: can't find process \"%s\"\n", 1198},
- {"%s: unknown signal %s; valid signals:\n", 1199},
- {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1200},
- {" %s -l [ signal ]\n", 1201},
- {"logger: %s: %s.\n", 1202},
- {"logger: unknown facility name: %s.\n", 1203},
- {"logger: unknown priority name: %s.\n", 1204},
- {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1205},
- {"Out of memory", 1206},
- {"usage: look [-dfa] [-t char] string [file]\n", 1207},
- {"Could not open %s\n", 1208},
- {"Got %d bytes from %s\n", 1209},
- {"namei: unable to get current directory - %s\n", 1210},
- {"namei: unable to chdir to %s - %s (%d)\n", 1211},
- {"usage: namei [-mx] pathname [pathname ...]\n", 1212},
- {"namei: could not chdir to root!\n", 1213},
- {"namei: could not stat root!\n", 1214},
- {" ? could not chdir into %s - %s (%d)\n", 1215},
- {" ? problems reading symlink %s - %s (%d)\n", 1216},
- {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***", 1217},
- {"namei: unknown file type 0%06o on file %s\n", 1218},
- {"usage: script [-a] [file]\n", 1219},
- {"Script started, file is %s\n", 1220},
- {"Script started on %s", 1221},
+Wrong password.\n", 1219},
+ {"exec rc failed\n", 1220},
+ {"open of rc file failed\n", 1221},
+ {"fork of rc shell failed\n", 1222},
+ {"fork failed\n", 1223},
+ {"exec failed\n", 1224},
+ {"cannot open inittab\n", 1225},
+ {"no TERM or cannot stat tty\n", 1226},
+ {"too many iov's (change code in wall/ttymsg.c)", 1227},
+ {"excessively long line arg", 1228},
+ {"cannot fork", 1229},
+ {"fork: %s", 1230},
+ {"%s: BAD ERROR", 1231},
+ {"%s: the %s file is busy.\n", 1232},
+ {"%s: the %s file is busy (%s present)\n", 1233},
+ {"%s: can't link %s: %s\n", 1234},
+ {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1235},
+ {"%s: Cannot fork\n", 1236},
+ {"%s: %s unchanged\n", 1237},
+ {"%s: no changes made\n", 1238},
+ {"usage: %s [file]\n", 1239},
+ {"%s: can't open temporary file.\n", 1240},
+ {"Broadcast Message from %s@%s", 1241},
+ {"%s: can't read %s.\n", 1242},
+ {"%s: can't stat temporary file.\n", 1243},
+ {"%s: can't read temporary file.\n", 1244},
+ {"illegal month value: use 1-12", 1245},
+ {"illegal year value: use 1-9999", 1246},
+ {"usage: cal [-mjyV] [[month] year]\n", 1247},
+ {"usage: %s [+format] [day month year]\n", 1248},
+ {"St. Tib's Day", 1249},
+ {"%s: unknown signal %s\n", 1250},
+ {"%s: can't find process \"%s\"\n", 1251},
+ {"%s: unknown signal %s; valid signals:\n", 1252},
+ {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1253},
+ {" %s -l [ signal ]\n", 1254},
+ {"logger: %s: %s.\n", 1255},
+ {"logger: unknown facility name: %s.\n", 1256},
+ {"logger: unknown priority name: %s.\n", 1257},
+ {"\
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1258},
+ {"usage: look [-dfa] [-t char] string [file]\n", 1259},
+ {"Could not open %s\n", 1260},
+ {"Got %d bytes from %s\n", 1261},
+ {"namei: unable to get current directory - %s\n", 1262},
+ {"namei: unable to chdir to %s - %s (%d)\n", 1263},
+ {"usage: namei [-mx] pathname [pathname ...]\n", 1264},
+ {"namei: could not chdir to root!\n", 1265},
+ {"namei: could not stat root!\n", 1266},
+ {" ? could not chdir into %s - %s (%d)\n", 1267},
+ {" ? problems reading symlink %s - %s (%d)\n", 1268},
+ {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1269},
+ {"namei: unknown file type 0%06o on file %s\n", 1270},
+ {"usage: script [-a] [file]\n", 1271},
+ {"Script started, file is %s\n", 1272},
+ {"Script started on %s", 1273},
{"\
\n\
-Script done on %s", 1222},
- {"Script done, file is %s\n", 1223},
- {"openpty failed\n", 1224},
- {"Out of pty's\n", 1225},
- {"%s: Argument error, usage\n", 1226},
- {" [ -term terminal_name ]\n", 1227},
- {" [ -reset ]\n", 1228},
- {" [ -initialize ]\n", 1229},
- {" [ -cursor [on|off] ]\n", 1230},
- {" [ -snow [on|off] ]\n", 1231},
- {" [ -softscroll [on|off] ]\n", 1232},
- {" [ -keyboard pc|olivetti|dutch|extended ]\n", 1233},
- {" [ -repeat [on|off] ]\n", 1234},
- {" [ -appcursorkeys [on|off] ]\n", 1235},
- {" [ -linewrap [on|off] ]\n", 1236},
- {" [ -default ]\n", 1237},
- {" [ -foreground black|blue|green|cyan", 1238},
- {"|red|magenta|yellow|white|default ]\n", 1239},
- {" [ -background black|blue|green|cyan", 1240},
- {" [ -ulcolor black|grey|blue|green|cyan", 1241},
- {"|red|magenta|yellow|white ]\n", 1242},
- {" [ -ulcolor bright blue|green|cyan", 1243},
- {" [ -hbcolor black|grey|blue|green|cyan", 1244},
- {" [ -hbcolor bright blue|green|cyan", 1245},
- {" [ -standout [ attr ] ]\n", 1246},
- {" [ -inversescreen [on|off] ]\n", 1247},
- {" [ -bold [on|off] ]\n", 1248},
- {" [ -half-bright [on|off] ]\n", 1249},
- {" [ -blink [on|off] ]\n", 1250},
- {" [ -reverse [on|off] ]\n", 1251},
- {" [ -underline [on|off] ]\n", 1252},
- {" [ -store ]\n", 1253},
- {" [ -clear [all|rest] ]\n", 1254},
- {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1255},
- {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1256},
- {" [ -regtabs [1-160] ]\n", 1257},
- {" [ -blank [0-60] ]\n", 1258},
- {" [ -dump [1-NR_CONSOLES] ]\n", 1259},
- {" [ -append [1-NR_CONSOLES] ]\n", 1260},
- {" [ -file dumpfilename ]\n", 1261},
- {" [ -msg [on|off] ]\n", 1262},
- {" [ -msglevel [0-8] ]\n", 1263},
- {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1264},
- {" [ -powerdown [0-60] ]\n", 1265},
- {" [ -blength [0-2000] ]\n", 1266},
- {" [ -bfreq freqnumber ]\n", 1267},
- {"keyboard.pc", 1268},
- {"keyboard.olivetti", 1269},
- {"keyboard.dutch", 1270},
- {"keyboard.extended", 1271},
- {"snow.on", 1272},
- {"snow.off", 1273},
- {"softscroll.on", 1274},
- {"softscroll.off", 1275},
- {"cannot (un)set powersave mode\n", 1276},
- {"klogctl error: %s\n", 1277},
- {"Error reading %s\n", 1278},
- {"Error writing screendump\n", 1279},
- {"couldn't read %s, and cannot ioctl dump\n", 1280},
- {"%s: $TERM is not defined.\n", 1281},
- {"usage: tsort [ inputfile ]\n", 1282},
- {"tsort: odd data count.\n", 1283},
- {"tsort: cycle in data.\n", 1284},
- {"tsort: internal error -- could not find cycle.\n", 1285},
- {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1286},
- {"write: can't find your tty's name\n", 1287},
- {"write: you have write permission turned off.\n", 1288},
- {"write: %s is not logged in on %s.\n", 1289},
- {"write: %s has messages disabled on %s\n", 1290},
- {"usage: write user [tty]\n", 1291},
- {"write: %s is not logged in\n", 1292},
- {"write: %s has messages disabled\n", 1293},
- {"write: %s is logged in more than once; writing to %s\n", 1294},
- {"Message from %s@%s on %s at %s ...", 1295},
- {"warning: error reading %s: %s", 1296},
- {"warning: can't open %s: %s", 1297},
- {"mount: could not open %s - using %s instead\n", 1298},
- {"can't create lock file %s: %s (use -n flag to override)", 1299},
- {"can't link lock file %s: %s (use -n flag to override)", 1300},
- {"can't open lock file %s: %s (use -n flag to override)", 1301},
- {"Can't lock lock file %s: %s\n", 1302},
- {"can't lock lock file %s: %s", 1303},
- {"timed out", 1304},
- {"cannot open %s (%s) - mtab not updated", 1305},
- {"mount: warning: cannot change mounted device with a remount\n", 1306},
- {"mount: warning: cannot change filesystem type with a remount\n", 1307},
- {"error writing %s: %s", 1308},
- {"error changing mode of %s: %s\n", 1309},
- {"can't rename %s to %s: %s\n", 1310},
- {"loop: can't open device %s: %s\n", 1311},
- {"loop: can't get info on device %s: %s\n", 1312},
- {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1313},
- {"mount: could not find any device /dev/loop#", 1314},
+Script done on %s", 1274},
+ {"Script done, file is %s\n", 1275},
+ {"openpty failed\n", 1276},
+ {"Out of pty's\n", 1277},
+ {"%s: Argument error, usage\n", 1278},
+ {" [ -term terminal_name ]\n", 1279},
+ {" [ -reset ]\n", 1280},
+ {" [ -initialize ]\n", 1281},
+ {" [ -cursor [on|off] ]\n", 1282},
+ {" [ -snow [on|off] ]\n", 1283},
+ {" [ -softscroll [on|off] ]\n", 1284},
+ {" [ -repeat [on|off] ]\n", 1285},
+ {" [ -appcursorkeys [on|off] ]\n", 1286},
+ {" [ -linewrap [on|off] ]\n", 1287},
+ {" [ -default ]\n", 1288},
+ {" [ -foreground black|blue|green|cyan", 1289},
+ {"|red|magenta|yellow|white|default ]\n", 1290},
+ {" [ -background black|blue|green|cyan", 1291},
+ {" [ -ulcolor black|grey|blue|green|cyan", 1292},
+ {"|red|magenta|yellow|white ]\n", 1293},
+ {" [ -ulcolor bright blue|green|cyan", 1294},
+ {" [ -hbcolor black|grey|blue|green|cyan", 1295},
+ {" [ -hbcolor bright blue|green|cyan", 1296},
+ {" [ -standout [ attr ] ]\n", 1297},
+ {" [ -inversescreen [on|off] ]\n", 1298},
+ {" [ -bold [on|off] ]\n", 1299},
+ {" [ -half-bright [on|off] ]\n", 1300},
+ {" [ -blink [on|off] ]\n", 1301},
+ {" [ -reverse [on|off] ]\n", 1302},
+ {" [ -underline [on|off] ]\n", 1303},
+ {" [ -store ]\n", 1304},
+ {" [ -clear [all|rest] ]\n", 1305},
+ {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1306},
+ {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1307},
+ {" [ -regtabs [1-160] ]\n", 1308},
+ {" [ -blank [0-60] ]\n", 1309},
+ {" [ -dump [1-NR_CONSOLES] ]\n", 1310},
+ {" [ -append [1-NR_CONSOLES] ]\n", 1311},
+ {" [ -file dumpfilename ]\n", 1312},
+ {" [ -msg [on|off] ]\n", 1313},
+ {" [ -msglevel [0-8] ]\n", 1314},
+ {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1315},
+ {" [ -powerdown [0-60] ]\n", 1316},
+ {" [ -blength [0-2000] ]\n", 1317},
+ {" [ -bfreq freqnumber ]\n", 1318},
+ {"snow.on", 1319},
+ {"snow.off", 1320},
+ {"softscroll.on", 1321},
+ {"softscroll.off", 1322},
+ {"cannot (un)set powersave mode\n", 1323},
+ {"klogctl error: %s\n", 1324},
+ {"Error reading %s\n", 1325},
+ {"Error writing screendump\n", 1326},
+ {"couldn't read %s, and cannot ioctl dump\n", 1327},
+ {"%s: $TERM is not defined.\n", 1328},
+ {"usage: tsort [ inputfile ]\n", 1329},
+ {"tsort: odd data count.\n", 1330},
+ {"tsort: cycle in data.\n", 1331},
+ {"tsort: internal error -- could not find cycle.\n", 1332},
+ {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1333},
+ {"write: can't find your tty's name\n", 1334},
+ {"write: you have write permission turned off.\n", 1335},
+ {"write: %s is not logged in on %s.\n", 1336},
+ {"write: %s has messages disabled on %s\n", 1337},
+ {"usage: write user [tty]\n", 1338},
+ {"write: %s is not logged in\n", 1339},
+ {"write: %s has messages disabled\n", 1340},
+ {"write: %s is logged in more than once; writing to %s\n", 1341},
+ {"Message from %s@%s on %s at %s ...", 1342},
+ {"warning: error reading %s: %s", 1343},
+ {"warning: can't open %s: %s", 1344},
+ {"mount: could not open %s - using %s instead\n", 1345},
+ {"can't create lock file %s: %s (use -n flag to override)", 1346},
+ {"can't link lock file %s: %s (use -n flag to override)", 1347},
+ {"can't open lock file %s: %s (use -n flag to override)", 1348},
+ {"Can't lock lock file %s: %s\n", 1349},
+ {"can't lock lock file %s: %s", 1350},
+ {"timed out", 1351},
+ {"\
+Cannot create link %s\n\
+Perhaps there is a stale lock file?\n", 1352},
+ {"cannot open %s (%s) - mtab not updated", 1353},
+ {"mount: warning: cannot change mounted device with a remount\n", 1354},
+ {"mount: warning: cannot change filesystem type with a remount\n", 1355},
+ {"error writing %s: %s", 1356},
+ {"error changing mode of %s: %s\n", 1357},
+ {"can't rename %s to %s: %s\n", 1358},
+ {"loop: can't open device %s: %s\n", 1359},
+ {"loop: can't get info on device %s: %s\n", 1360},
+ {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1361},
+ {"mount: could not find any device /dev/loop#", 1362},
{"\
mount: Could not find any loop device.\n\
- Maybe /dev/loop# has a wrong major number?", 1315},
+ Maybe /dev/loop# has a wrong major number?", 1363},
{"\
mount: Could not find any loop device, and, according to %s,\n\
this kernel does not know about the loop device.\n\
- (If so, then recompile or `insmod loop.o'.)", 1316},
+ (If so, then recompile or `insmod loop.o'.)", 1364},
{"\
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?", 1317},
- {"mount: could not find any free loop device", 1318},
- {"Unsupported encryption type %s\n", 1319},
- {"Init (up to 16 hex digits): ", 1320},
- {"Non-hex digit '%c'.\n", 1321},
- {"Don't know how to get key for encryption system %d\n", 1322},
- {"set_loop(%s,%s,%d): success\n", 1323},
- {"loop: can't delete device %s: %s\n", 1324},
- {"del_loop(%s): success\n", 1325},
- {"This mount was compiled without loop support. Please recompile.\n", 1326},
- {"Cannot get loop info", 1327},
+ maybe /dev/loop# has the wrong major number?", 1365},
+ {"mount: could not find any free loop device", 1366},
+ {"Unsupported encryption type %s\n", 1367},
+ {"Init (up to 16 hex digits): ", 1368},
+ {"Non-hex digit '%c'.\n", 1369},
+ {"Don't know how to get key for encryption system %d\n", 1370},
+ {"set_loop(%s,%s,%d): success\n", 1371},
+ {"loop: can't delete device %s: %s\n", 1372},
+ {"del_loop(%s): success\n", 1373},
+ {"This mount was compiled without loop support. Please recompile.\n", 1374},
+ {"Cannot get loop info", 1375},
{"\
usage:\n\
%s loop_device # give info\n\
%s -d loop_device # delete\n\
- %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1328},
- {"No loop support was available at compile time. Please recompile.\n", 1329},
- {"[mntent]: warning: no final newline at the end of %s\n", 1330},
- {"[mntent]: line %d in %s is bad%s\n", 1331},
- {"; rest of file ignored", 1332},
- {"mount: according to mtab, %s is already mounted on %s", 1333},
- {"mount: according to mtab, %s is mounted on %s", 1334},
- {"mount: can't open %s for writing: %s", 1335},
- {"mount: error writing %s: %s", 1336},
- {"mount: error changing mode of %s: %s", 1337},
- {"mount failed", 1338},
- {"mount: only root can mount %s on %s", 1339},
- {"mount: loop device specified twice", 1340},
- {"mount: type specified twice", 1341},
- {"mount: skipping the setup of a loop device\n", 1342},
- {"mount: going to use the loop device %s\n", 1343},
- {"mount: failed setting up loop device\n", 1344},
- {"mount: setup loop device successfully\n", 1345},
- {"mount: this version was compiled without support for the type `nfs'", 1346},
- {"mount: cannot fork: %s", 1347},
- {"mount: can't open %s: %s", 1348},
- {"mount: you must specify the filesystem type", 1349},
- {"mount: mount point %s is not a directory", 1350},
- {"mount: permission denied", 1351},
- {"mount: must be superuser to use mount", 1352},
- {"mount: %s is busy", 1353},
- {"mount: proc already mounted", 1354},
- {"mount: %s already mounted or %s busy", 1355},
- {"mount: mount point %s does not exist", 1356},
- {"mount: mount point %s is a symbolic link to nowhere", 1357},
- {"mount: special device %s does not exist", 1358},
+ %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1376},
+ {"No loop support was available at compile time. Please recompile.\n", 1377},
+ {"[mntent]: warning: no final newline at the end of %s\n", 1378},
+ {"[mntent]: line %d in %s is bad%s\n", 1379},
+ {"; rest of file ignored", 1380},
+ {"mount: according to mtab, %s is already mounted on %s", 1381},
+ {"mount: according to mtab, %s is mounted on %s", 1382},
+ {"mount: can't open %s for writing: %s", 1383},
+ {"mount: error writing %s: %s", 1384},
+ {"mount: error changing mode of %s: %s", 1385},
+ {"%s looks like swapspace - not mounted", 1386},
+ {"mount failed", 1387},
+ {"mount: only root can mount %s on %s", 1388},
+ {"mount: loop device specified twice", 1389},
+ {"mount: type specified twice", 1390},
+ {"mount: skipping the setup of a loop device\n", 1391},
+ {"mount: going to use the loop device %s\n", 1392},
+ {"mount: failed setting up loop device\n", 1393},
+ {"mount: setup loop device successfully\n", 1394},
+ {"mount: this version was compiled without support for the type `nfs'", 1395},
+ {"mount: cannot fork: %s", 1396},
+ {"mount: can't open %s: %s", 1397},
+ {"\
+mount: I could not determine the filesystem type, and none was specified", 1398},
+ {"mount: you must specify the filesystem type", 1399},
+ {"mount: mount failed", 1400},
+ {"mount: mount point %s is not a directory", 1401},
+ {"mount: permission denied", 1402},
+ {"mount: must be superuser to use mount", 1403},
+ {"mount: %s is busy", 1404},
+ {"mount: proc already mounted", 1405},
+ {"mount: %s already mounted or %s busy", 1406},
+ {"mount: mount point %s does not exist", 1407},
+ {"mount: mount point %s is a symbolic link to nowhere", 1408},
+ {"mount: special device %s does not exist", 1409},
{"\
mount: special device %s does not exist\n\
- (a path prefix is not a directory)\n", 1359},
- {"mount: %s not mounted already, or bad option", 1360},
+ (a path prefix is not a directory)\n", 1410},
+ {"mount: %s not mounted already, or bad option", 1411},
{"\
mount: wrong fs type, bad option, bad superblock on %s,\n\
- or too many mounted file systems", 1361},
- {"mount table full", 1362},
- {"mount: %s: can't read superblock", 1363},
- {"mount: %s has wrong major or minor number", 1364},
- {"mount: fs type %s not supported by kernel", 1365},
- {"mount: probably you meant %s", 1366},
- {"mount: maybe you meant iso9660 ?", 1367},
- {"mount: %s has wrong device number or fs type %s not supported", 1368},
- {"mount: %s is not a block device, and stat fails?", 1369},
+ or too many mounted file systems", 1412},
+ {"mount table full", 1413},
+ {"mount: %s: can't read superblock", 1414},
+ {"mount: %s has wrong major or minor number", 1415},
+ {"mount: fs type %s not supported by kernel", 1416},
+ {"mount: probably you meant %s", 1417},
+ {"mount: maybe you meant iso9660 ?", 1418},
+ {"mount: %s has wrong device number or fs type %s not supported", 1419},
+ {"mount: %s is not a block device, and stat fails?", 1420},
{"\
mount: the kernel does not recognize %s as a block device\n\
- (maybe `insmod driver'?)", 1370},
- {"mount: %s is not a block device (maybe try `-o loop'?)", 1371},
- {"mount: %s is not a block device", 1372},
- {"mount: %s is not a valid block device", 1373},
- {"mount: block device %s is not permitted on its filesystem", 1374},
- {"mount: %s%s is write-protected, mounting read-only", 1375},
- {"block device ", 1376},
- {"mount: consider mounting %s by %s\n", 1377},
- {"UUID", 1378},
- {"label", 1379},
- {"mount: no such partition found", 1380},
- {"mount: no type was given - I'll assume nfs because of the colon\n", 1381},
- {"mount: backgrounding \"%s\"\n", 1382},
- {"mount: giving up \"%s\"\n", 1383},
- {"mount: %s already mounted on %s\n", 1384},
+ (maybe `insmod driver'?)", 1421},
+ {"mount: %s is not a block device (maybe try `-o loop'?)", 1422},
+ {"mount: %s is not a block device", 1423},
+ {"mount: %s is not a valid block device", 1424},
+ {"mount: block device %s is not permitted on its filesystem", 1425},
+ {"mount: %s%s is write-protected, mounting read-only", 1426},
+ {"block device ", 1427},
+ {"mount: consider mounting %s by %s\n", 1428},
+ {"UUID", 1429},
+ {"label", 1430},
+ {"mount: no such partition found", 1431},
+ {"mount: no type was given - I'll assume nfs because of the colon\n", 1432},
+ {"mount: backgrounding \"%s\"\n", 1433},
+ {"mount: giving up \"%s\"\n", 1434},
+ {"mount: %s already mounted on %s\n", 1435},
{"\
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", 1385},
- {"mount: only root can do that", 1386},
- {"mount: no %s found - creating it..\n", 1387},
- {"mount: mounting %s\n", 1388},
- {"not mounted anything", 1389},
- {"mount: cannot find %s in %s", 1390},
- {"mount: can't find %s in %s or %s", 1391},
- {"mount: bad UUID", 1392},
- {"mount: you didn't specify a filesystem type for %s\n", 1393},
- {" I will try type %s\n", 1394},
- {" I will try all types mentioned in %s or %s\n", 1395},
- {"mount: excessively long host:dir argument\n", 1396},
- {"mount: warning: multiple hostnames not supported\n", 1397},
- {"mount: directory to mount not in host:dir format\n", 1398},
- {"mount: can't get address for %s\n", 1399},
- {"mount: got bad hp->h_length\n", 1400},
- {"mount: excessively long option argument\n", 1401},
- {"Warning: Unrecognized proto= option.\n", 1402},
- {"Warning: Option namlen is not supported.\n", 1403},
- {"unknown nfs mount parameter: %s=%d\n", 1404},
- {"Warning: option nolock is not supported.\n", 1405},
- {"unknown nfs mount option: %s%s\n", 1406},
- {"mount: got bad hp->h_length?\n", 1407},
- {"mount: %s:%s failed, reason given by server: %s\n", 1408},
- {"NFS over TCP is not supported.\n", 1409},
- {"nfs socket", 1410},
- {"nfs bindresvport", 1411},
- {"used portmapper to find NFS port\n", 1412},
- {"using port %d for nfs deamon\n", 1413},
- {"nfs connect", 1414},
- {"unknown nfs status return value: %d", 1415},
- {"not enough memory", 1416},
- {"bug in xstrndup call", 1417},
+ A special device can be indicated by -L label or -U uuid .\n", 1436},
+ {"mount: only root can do that", 1437},
+ {"mount: no %s found - creating it..\n", 1438},
+ {"mount: mounting %s\n", 1439},
+ {"not mounted anything", 1440},
+ {"mount: cannot find %s in %s", 1441},
+ {"mount: can't find %s in %s or %s", 1442},
+ {"mount: bad UUID", 1443},
+ {"mount: you didn't specify a filesystem type for %s\n", 1444},
+ {" I will try all types mentioned in %s or %s\n", 1445},
+ {" and it looks like this is swapspace\n", 1446},
+ {" I will try type %s\n", 1447},
+ {"Trying %s\n", 1448},
+ {"mount: excessively long host:dir argument\n", 1449},
+ {"mount: warning: multiple hostnames not supported\n", 1450},
+ {"mount: directory to mount not in host:dir format\n", 1451},
+ {"mount: can't get address for %s\n", 1452},
+ {"mount: got bad hp->h_length\n", 1453},
+ {"mount: excessively long option argument\n", 1454},
+ {"Warning: Unrecognized proto= option.\n", 1455},
+ {"Warning: Option namlen is not supported.\n", 1456},
+ {"unknown nfs mount parameter: %s=%d\n", 1457},
+ {"Warning: option nolock is not supported.\n", 1458},
+ {"unknown nfs mount option: %s%s\n", 1459},
+ {"mount: got bad hp->h_length?\n", 1460},
+ {"mount: %s:%s failed, reason given by server: %s\n", 1461},
+ {"NFS over TCP is not supported.\n", 1462},
+ {"nfs socket", 1463},
+ {"nfs bindresvport", 1464},
+ {"used portmapper to find NFS port\n", 1465},
+ {"using port %d for nfs deamon\n", 1466},
+ {"nfs connect", 1467},
+ {"unknown nfs status return value: %d", 1468},
+ {"not enough memory", 1469},
+ {"bug in xstrndup call", 1470},
{"\
usage: %s [-hV]\n\
%s -a [-v]\n\
%s [-v] [-p priority] special ...\n\
- %s [-s]\n", 1418},
- {"%s on %s\n", 1419},
- {"swapon: cannot stat %s: %s\n", 1420},
- {"swapon: warning: %s has insecure permissions %04o, 0600 suggested\n", 1421},
- {"swapon: Skipping file %s - it appears to have holes.\n", 1422},
- {"%s: cannot open %s: %s\n", 1423},
- {"umount: compiled without support for -f\n", 1424},
- {"host: %s, directory: %s\n", 1425},
- {"umount: can't get address for %s\n", 1426},
- {"umount: got bad hostp->h_length\n", 1427},
- {"umount: %s: invalid block device", 1428},
- {"umount: %s: not mounted", 1429},
- {"umount: %s: can't write superblock", 1430},
- {"umount: %s: device is busy", 1431},
- {"umount: %s: not found", 1432},
- {"umount: %s: must be superuser to umount", 1433},
- {"umount: %s: block devices not permitted on fs", 1434},
- {"umount: %s: %s", 1435},
- {"no umount2, trying umount...\n", 1436},
- {"could not umount %s - trying %s instead\n", 1437},
- {"umount: %s busy - remounted read-only\n", 1438},
- {"umount: could not remount %s read-only\n", 1439},
- {"%s umounted\n", 1440},
- {"umount: cannot find list of filesystems to unmount", 1441},
+ %s [-s]\n", 1471},
+ {"%s on %s\n", 1472},
+ {"swapon: cannot stat %s: %s\n", 1473},
+ {"swapon: warning: %s has insecure permissions %04o, 0600 suggested\n", 1474},
+ {"swapon: Skipping file %s - it appears to have holes.\n", 1475},
+ {"%s: cannot open %s: %s\n", 1476},
+ {"umount: compiled without support for -f\n", 1477},
+ {"host: %s, directory: %s\n", 1478},
+ {"umount: can't get address for %s\n", 1479},
+ {"umount: got bad hostp->h_length\n", 1480},
+ {"umount: %s: invalid block device", 1481},
+ {"umount: %s: not mounted", 1482},
+ {"umount: %s: can't write superblock", 1483},
+ {"umount: %s: device is busy", 1484},
+ {"umount: %s: not found", 1485},
+ {"umount: %s: must be superuser to umount", 1486},
+ {"umount: %s: block devices not permitted on fs", 1487},
+ {"umount: %s: %s", 1488},
+ {"no umount2, trying umount...\n", 1489},
+ {"could not umount %s - trying %s instead\n", 1490},
+ {"umount: %s busy - remounted read-only\n", 1491},
+ {"umount: could not remount %s read-only\n", 1492},
+ {"%s umounted\n", 1493},
+ {"umount: cannot find list of filesystems to unmount", 1494},
{"\
Usage: umount [-hV]\n\
umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\
- umount [-f] [-r] [-n] [-v] special | node...\n", 1442},
- {"umount: only root can do that", 1443},
- {"Trying to umount %s\n", 1444},
- {"Could not find %s in mtab\n", 1445},
- {"umount: %s is not mounted (according to mtab)", 1446},
- {"umount: it seems %s is mounted multiple times", 1447},
- {"umount: %s is not in the fstab (and you are not root)", 1448},
- {"umount: %s mount disagrees with the fstab", 1449},
- {"umount: only root can unmount %s from %s", 1450},
- {"umount: only %s can unmount %s from %s", 1451},
- {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1452},
- {"Usage: ctrlaltdel hard|soft\n", 1453},
+ umount [-f] [-r] [-n] [-v] special | node...\n", 1495},
+ {"umount: only root can do that", 1496},
+ {"Trying to umount %s\n", 1497},
+ {"Could not find %s in mtab\n", 1498},
+ {"umount: %s is not mounted (according to mtab)", 1499},
+ {"umount: it seems %s is mounted multiple times", 1500},
+ {"umount: %s is not in the fstab (and you are not root)", 1501},
+ {"umount: %s mount disagrees with the fstab", 1502},
+ {"umount: only root can unmount %s from %s", 1503},
+ {"umount: only %s can unmount %s from %s", 1504},
+ {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1505},
+ {"Usage: ctrlaltdel hard|soft\n", 1506},
{"\
File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1454},
+and the maximum transfer rate in characters/second was %f\n", 1507},
{"\
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", 1455},
- {"Invalid interval value: %s\n", 1456},
- {"Invalid set value: %s\n", 1457},
- {"Invalid default value: %s\n", 1458},
- {"Invalid set time value: %s\n", 1459},
- {"Invalid default time value: %s\n", 1460},
+and the maximum transfer rate in characters/second was %f\n", 1508},
+ {"Invalid interval value: %s\n", 1509},
+ {"Invalid set value: %s\n", 1510},
+ {"Invalid default value: %s\n", 1511},
+ {"Invalid set time value: %s\n", 1512},
+ {"Invalid default time value: %s\n", 1513},
{"\
Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \
-[-g|-G] file [file...]\n", 1461},
- {"Can't open %s: %s\n", 1462},
- {"Can't set %s to threshold %d: %s\n", 1463},
- {"Can't set %s to time threshold %d: %s\n", 1464},
- {"Can't get threshold for %s: %s\n", 1465},
- {"Can't get timeout for %s: %s\n", 1466},
- {"%s: %ld %s threshold and %ld %s timeout\n", 1467},
- {"current", 1468},
- {"default", 1469},
- {"Can't set signal handler", 1470},
- {"gettimeofday failed", 1471},
- {"Can't issue CYGETMON on %s: %s\n", 1472},
- {"%s: %lu ints, %lu/%lu chars; ", 1473},
- {"fifo: %lu thresh, %lu tmout, ", 1474},
- {"%lu max, %lu now\n", 1475},
- {" %f int/sec; %f rec, %f send (char/sec)\n", 1476},
- {"\
-%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1477},
- {" %f int/sec; %f rec (char/sec)\n", 1478},
- {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1479},
- {"usage: %s [shm | msg | sem] id\n", 1480},
- {"usage: %s [-shm | -msg | -sem] id\n", 1481},
- {"resource deleted\n", 1482},
- {"usage : %s -asmq -tclup \n", 1483},
- {"\t%s [-s -m -q] -i id\n", 1484},
- {"\t%s -h for help.\n", 1485},
- {"%s provides information on ipc facilities for", 1486},
- {" which you have read access.\n", 1487},
+[-g|-G] file [file...]\n", 1514},
+ {"Can't open %s: %s\n", 1515},
+ {"Can't set %s to threshold %d: %s\n", 1516},
+ {"Can't set %s to time threshold %d: %s\n", 1517},
+ {"Can't get threshold for %s: %s\n", 1518},
+ {"Can't get timeout for %s: %s\n", 1519},
+ {"%s: %ld %s threshold and %ld %s timeout\n", 1520},
+ {"current", 1521},
+ {"default", 1522},
+ {"Can't set signal handler", 1523},
+ {"gettimeofday failed", 1524},
+ {"Can't issue CYGETMON on %s: %s\n", 1525},
+ {"%s: %lu ints, %lu/%lu chars; ", 1526},
+ {"fifo: %lu thresh, %lu tmout, ", 1527},
+ {"%lu max, %lu now\n", 1528},
+ {" %f int/sec; %f rec, %f send (char/sec)\n", 1529},
+ {"\
+%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1530},
+ {" %f int/sec; %f rec (char/sec)\n", 1531},
+ {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1532},
+ {"usage: %s [shm | msg | sem] id\n", 1533},
+ {"usage: %s [-shm | -msg | -sem] id\n", 1534},
+ {"resource deleted\n", 1535},
+ {"usage : %s -asmq -tclup \n", 1536},
+ {"\t%s [-s -m -q] -i id\n", 1537},
+ {"\t%s -h for help.\n", 1538},
+ {"%s provides information on ipc facilities for", 1539},
+ {" which you have read access.\n", 1540},
{"\
Resource Specification:\n\
\t-m : shared_mem\n\
-\t-q : messages\n", 1488},
+\t-q : messages\n", 1541},
{"\
\t-s : semaphores\n\
-\t-a : all (default)\n", 1489},
+\t-a : all (default)\n", 1542},
{"\
Output Format:\n\
\t-t : time\n\
\t-p : pid\n\
-\t-c : creator\n", 1490},
+\t-c : creator\n", 1543},
{"\
\t-l : limits\n\
-\t-u : summary\n", 1491},
- {"-i id [-s -q -m] : details on resource identified by id\n", 1492},
- {"kernel not configured for shared memory\n", 1493},
- {"------ Shared Memory Limits --------\n", 1494},
- {"max number of segments = %d\n", 1495},
- {"max seg size (kbytes) = %d\n", 1496},
- {"max total shared memory (kbytes) = %d\n", 1497},
- {"min seg size (bytes) = %d\n", 1498},
- {"------ Shared Memory Status --------\n", 1499},
- {"segments allocated %d\n", 1500},
- {"pages allocated %ld\n", 1501},
- {"pages resident %ld\n", 1502},
- {"pages swapped %ld\n", 1503},
- {"Swap performance: %ld attempts\t %ld successes\n", 1504},
- {"------ Shared Memory Segment Creators/Owners --------\n", 1505},
- {"%-10s%-10s%-10s%-10s%-10s%-10s\n", 1506},
- {"shmid", 1507},
- {"perms", 1508},
- {"cuid", 1509},
- {"cgid", 1510},
- {"uid", 1511},
- {"gid", 1512},
- {"------ Shared Memory Attach/Detach/Change Times --------\n", 1513},
- {"%-10s%-10s %-20s%-20s%-20s\n", 1514},
- {"owner", 1515},
- {"attached", 1516},
- {"detached", 1517},
- {"changed", 1518},
- {"------ Shared Memory Creator/Last-op --------\n", 1519},
- {"%-10s%-10s%-10s%-10s\n", 1520},
- {"cpid", 1521},
- {"lpid", 1522},
- {"------ Shared Memory Segments --------\n", 1523},
- {"%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n", 1524},
- {"key", 1525},
- {"bytes", 1526},
- {"nattch", 1527},
- {"status", 1528},
- {"Not set", 1529},
- {"dest", 1530},
- {"locked", 1531},
- {"kernel not configured for semaphores\n", 1532},
- {"------ Semaphore Limits --------\n", 1533},
- {"max number of arrays = %d\n", 1534},
- {"max semaphores per array = %d\n", 1535},
- {"max semaphores system wide = %d\n", 1536},
- {"max ops per semop call = %d\n", 1537},
- {"semaphore max value = %d\n", 1538},
- {"------ Semaphore Status --------\n", 1539},
- {"used arrays = %d\n", 1540},
- {"allocated semaphores = %d\n", 1541},
- {"------ Semaphore Arrays Creators/Owners --------\n", 1542},
- {"semid", 1543},
- {"------ Shared Memory Operation/Change Times --------\n", 1544},
- {"%-8s%-10s %-26.24s %-26.24s\n", 1545},
- {"last-op", 1546},
- {"last-changed", 1547},
- {"------ Semaphore Arrays --------\n", 1548},
- {"%-10s%-10s%-10s%-10s%-10s%-12s\n", 1549},
- {"nsems", 1550},
- {"------ Messages: Limits --------\n", 1551},
- {"max queues system wide = %d\n", 1552},
- {"max size of message (bytes) = %d\n", 1553},
- {"default max size of queue (bytes) = %d\n", 1554},
- {"------ Messages: Status --------\n", 1555},
- {"allocated queues = %d\n", 1556},
- {"used headers = %d\n", 1557},
- {"used space = %d bytes\n", 1558},
- {"------ Message Queues: Creators/Owners --------\n", 1559},
- {"msqid", 1560},
- {"------ Message Queues Send/Recv/Change Times --------\n", 1561},
- {"%-8s%-10s %-20s%-20s%-20s\n", 1562},
- {"send", 1563},
- {"recv", 1564},
- {"change", 1565},
- {"------ Message Queues PIDs --------\n", 1566},
- {"lspid", 1567},
- {"lrpid", 1568},
- {"------ Message Queues --------\n", 1569},
- {"%-10s%-10s%-10s%-10s%-12s%-12s\n", 1570},
- {"used-bytes", 1571},
- {"messages", 1572},
+\t-u : summary\n", 1544},
+ {"-i id [-s -q -m] : details on resource identified by id\n", 1545},
+ {"kernel not configured for shared memory\n", 1546},
+ {"------ Shared Memory Limits --------\n", 1547},
+ {"max number of segments = %d\n", 1548},
+ {"max seg size (kbytes) = %d\n", 1549},
+ {"max total shared memory (kbytes) = %d\n", 1550},
+ {"min seg size (bytes) = %d\n", 1551},
+ {"------ Shared Memory Status --------\n", 1552},
+ {"segments allocated %d\n", 1553},
+ {"pages allocated %ld\n", 1554},
+ {"pages resident %ld\n", 1555},
+ {"pages swapped %ld\n", 1556},
+ {"Swap performance: %ld attempts\t %ld successes\n", 1557},
+ {"------ Shared Memory Segment Creators/Owners --------\n", 1558},
+ {"%-10s%-10s%-10s%-10s%-10s%-10s\n", 1559},
+ {"shmid", 1560},
+ {"perms", 1561},
+ {"cuid", 1562},
+ {"cgid", 1563},
+ {"uid", 1564},
+ {"gid", 1565},
+ {"------ Shared Memory Attach/Detach/Change Times --------\n", 1566},
+ {"%-10s%-10s %-20s%-20s%-20s\n", 1567},
+ {"owner", 1568},
+ {"attached", 1569},
+ {"detached", 1570},
+ {"changed", 1571},
+ {"------ Shared Memory Creator/Last-op --------\n", 1572},
+ {"%-10s%-10s%-10s%-10s\n", 1573},
+ {"cpid", 1574},
+ {"lpid", 1575},
+ {"------ Shared Memory Segments --------\n", 1576},
+ {"%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n", 1577},
+ {"key", 1578},
+ {"bytes", 1579},
+ {"nattch", 1580},
+ {"status", 1581},
+ {"Not set", 1582},
+ {"dest", 1583},
+ {"locked", 1584},
+ {"kernel not configured for semaphores\n", 1585},
+ {"------ Semaphore Limits --------\n", 1586},
+ {"max number of arrays = %d\n", 1587},
+ {"max semaphores per array = %d\n", 1588},
+ {"max semaphores system wide = %d\n", 1589},
+ {"max ops per semop call = %d\n", 1590},
+ {"semaphore max value = %d\n", 1591},
+ {"------ Semaphore Status --------\n", 1592},
+ {"used arrays = %d\n", 1593},
+ {"allocated semaphores = %d\n", 1594},
+ {"------ Semaphore Arrays Creators/Owners --------\n", 1595},
+ {"semid", 1596},
+ {"------ Shared Memory Operation/Change Times --------\n", 1597},
+ {"%-8s%-10s %-26.24s %-26.24s\n", 1598},
+ {"last-op", 1599},
+ {"last-changed", 1600},
+ {"------ Semaphore Arrays --------\n", 1601},
+ {"%-10s%-10s%-10s%-10s%-10s%-12s\n", 1602},
+ {"nsems", 1603},
+ {"------ Messages: Limits --------\n", 1604},
+ {"max queues system wide = %d\n", 1605},
+ {"max size of message (bytes) = %d\n", 1606},
+ {"default max size of queue (bytes) = %d\n", 1607},
+ {"------ Messages: Status --------\n", 1608},
+ {"allocated queues = %d\n", 1609},
+ {"used headers = %d\n", 1610},
+ {"used space = %d bytes\n", 1611},
+ {"------ Message Queues: Creators/Owners --------\n", 1612},
+ {"msqid", 1613},
+ {"------ Message Queues Send/Recv/Change Times --------\n", 1614},
+ {"%-8s%-10s %-20s%-20s%-20s\n", 1615},
+ {"send", 1616},
+ {"recv", 1617},
+ {"change", 1618},
+ {"------ Message Queues PIDs --------\n", 1619},
+ {"lspid", 1620},
+ {"lrpid", 1621},
+ {"------ Message Queues --------\n", 1622},
+ {"%-10s%-10s%-10s%-10s%-12s%-12s\n", 1623},
+ {"used-bytes", 1624},
+ {"messages", 1625},
{"\
\n\
-Shared memory Segment shmid=%d\n", 1573},
- {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1574},
- {"mode=%#o\taccess_perms=%#o\n", 1575},
- {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n", 1576},
- {"att_time=%s", 1577},
- {"Not set\n", 1578},
- {"det_time=%s", 1579},
- {"change_time=%s", 1580},
+Shared memory Segment shmid=%d\n", 1626},
+ {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1627},
+ {"mode=%#o\taccess_perms=%#o\n", 1628},
+ {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n", 1629},
+ {"att_time=%s", 1630},
+ {"Not set\n", 1631},
+ {"det_time=%s", 1632},
+ {"change_time=%s", 1633},
{"\
\n\
-Message Queue msqid=%d\n", 1581},
- {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1582},
- {"cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n", 1583},
- {"send_time=%srcv_time=%schange_time=%s", 1584},
- {"Not Set\n", 1585},
+Message Queue msqid=%d\n", 1634},
+ {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1635},
+ {"cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n", 1636},
+ {"send_time=%srcv_time=%schange_time=%s", 1637},
+ {"Not Set\n", 1638},
{"\
\n\
-Semaphore Array semid=%d\n", 1586},
- {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1587},
- {"mode=%#o, access_perms=%#o\n", 1588},
- {"nsems = %d\n", 1589},
- {"otime = %s", 1590},
- {"ctime = %s", 1591},
- {"%-10s%-10s%-10s%-10s%-10s\n", 1592},
- {"semnum", 1593},
- {"value", 1594},
- {"ncount", 1595},
- {"zcount", 1596},
- {"pid", 1597},
- {"usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1598},
- {"\
- rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1599},
- {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1600},
- {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1601},
- {" rdev -s /dev/fd0 /dev/hda2 set the SWAP device", 1602},
- {" rdev -r /dev/fd0 627 set the RAMDISK size", 1603},
- {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1604},
- {" rdev -o N ... use the byte offset N", 1605},
- {" rootflags ... same as rdev -R", 1606},
- {" swapdev ... same as rdev -s", 1607},
- {" ramsize ... same as rdev -r", 1608},
- {" vidmode ... same as rdev -v", 1609},
- {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1610},
- {" use -R 1 to mount root readonly, -R 0 for read/write.", 1611},
+Semaphore Array semid=%d\n", 1639},
+ {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1640},
+ {"mode=%#o, access_perms=%#o\n", 1641},
+ {"nsems = %d\n", 1642},
+ {"otime = %s", 1643},
+ {"ctime = %s", 1644},
+ {"%-10s%-10s%-10s%-10s%-10s\n", 1645},
+ {"semnum", 1646},
+ {"value", 1647},
+ {"ncount", 1648},
+ {"zcount", 1649},
+ {"pid", 1650},
+ {"usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1651},
+ {"\
+ rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1652},
+ {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1653},
+ {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1654},
+ {" rdev -s /dev/fd0 /dev/hda2 set the SWAP device", 1655},
+ {" rdev -r /dev/fd0 627 set the RAMDISK size", 1656},
+ {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1657},
+ {" rdev -o N ... use the byte offset N", 1658},
+ {" rootflags ... same as rdev -R", 1659},
+ {" swapdev ... same as rdev -s", 1660},
+ {" ramsize ... same as rdev -r", 1661},
+ {" vidmode ... same as rdev -v", 1662},
+ {"\
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1663},
+ {" use -R 1 to mount root readonly, -R 0 for read/write.", 1664},
{"\
%s: Usage: \"%s [options]\n\
\t -m <mapfile> (default = \"%s\")\n\
@@ -2043,109 +2124,110 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1
\t -v print verbose data\n\
\t -a print all symbols, even if count is 0\n\
\t -r reset all the counters (root only)\n\
-\t -V print version and exit\n", 1612},
- {"%s Version %s\n", 1613},
- {"anything\n", 1614},
- {"Sampling_step: %i\n", 1615},
- {"%s: %s(%i): wrong map line\n", 1616},
- {"%s: can't find \"_stext\" in %s\n", 1617},
- {"total", 1618},
- {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1619},
- {"renice: %s: unknown user\n", 1620},
- {"renice: %s: bad value\n", 1621},
- {"getpriority", 1622},
- {"setpriority", 1623},
- {"%d: old priority %d, new priority %d\n", 1624},
- {"usage: %s program [arg ...]\n", 1625},
+\t -V print version and exit\n", 1665},
+ {"%s Version %s\n", 1666},
+ {"anything\n", 1667},
+ {"Sampling_step: %i\n", 1668},
+ {"%s: %s(%i): wrong map line\n", 1669},
+ {"%s: can't find \"_stext\" in %s\n", 1670},
+ {"total", 1671},
+ {"\
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1672},
+ {"renice: %s: unknown user\n", 1673},
+ {"renice: %s: bad value\n", 1674},
+ {"getpriority", 1675},
+ {"setpriority", 1676},
+ {"%d: old priority %d, new priority %d\n", 1677},
+ {"usage: %s program [arg ...]\n", 1678},
{"\
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", 1626},
- {"malloc error", 1627},
- {"sscanf error", 1628},
- {"%s: %s not an lp device.\n", 1629},
- {"%s status is %d", 1630},
- {", busy", 1631},
- {", ready", 1632},
- {", out of paper", 1633},
- {", on-line", 1634},
- {", error", 1635},
- {"LPGETIRQ error", 1636},
- {"%s using IRQ %d\n", 1637},
- {"%s using polling\n", 1638},
- {"col: bad -l argument %s.\n", 1639},
- {"usage: col [-bfx] [-l nline]\n", 1640},
- {"col: write error.\n", 1641},
- {"col: warning: can't back up %s.\n", 1642},
- {"past first line", 1643},
- {"-- line already flushed", 1644},
- {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1645},
- {"line too long", 1646},
- {"usage: column [-tx] [-c columns] [file ...]\n", 1647},
- {"hexdump: bad length value.\n", 1648},
- {"hexdump: bad skip value.\n", 1649},
- {"\
-hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1650},
- {"usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n", 1651},
+ -T [on|off] ]\n", 1679},
+ {"malloc error", 1680},
+ {"%s: bad value\n", 1681},
+ {"%s: %s not an lp device.\n", 1682},
+ {"%s status is %d", 1683},
+ {", busy", 1684},
+ {", ready", 1685},
+ {", out of paper", 1686},
+ {", on-line", 1687},
+ {", error", 1688},
+ {"LPGETIRQ error", 1689},
+ {"%s using IRQ %d\n", 1690},
+ {"%s using polling\n", 1691},
+ {"col: bad -l argument %s.\n", 1692},
+ {"usage: col [-bfx] [-l nline]\n", 1693},
+ {"col: write error.\n", 1694},
+ {"col: warning: can't back up %s.\n", 1695},
+ {"past first line", 1696},
+ {"-- line already flushed", 1697},
+ {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1698},
+ {"line too long", 1699},
+ {"usage: column [-tx] [-c columns] [file ...]\n", 1700},
+ {"hexdump: bad length value.\n", 1701},
+ {"hexdump: bad skip value.\n", 1702},
+ {"\
+hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1703},
+ {"usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n", 1704},
{"\
\n\
*** %s: directory ***\n\
-\n", 1652},
+\n", 1705},
{"\
\n\
******** %s: Not a text file ********\n\
-\n", 1653},
- {"[Use q or Q to quit]", 1654},
- {"--More--", 1655},
- {"(Next file: %s)", 1656},
- {"[Press space to continue, 'q' to quit.]", 1657},
- {"...back %d page", 1658},
- {"...skipping %d line", 1659},
+\n", 1706},
+ {"[Use q or Q to quit]", 1707},
+ {"--More--", 1708},
+ {"(Next file: %s)", 1709},
+ {"[Press space to continue, 'q' to quit.]", 1710},
+ {"...back %d page", 1711},
+ {"...skipping %d line", 1712},
{"\
\n\
***Back***\n\
-\n", 1660},
- {"Can't open help file", 1661},
- {"[Press 'h' for instructions.]", 1662},
- {"\"%s\" line %d", 1663},
- {"[Not a file] line %d", 1664},
- {" Overflow\n", 1665},
- {"...skipping\n", 1666},
- {"Regular expression botch", 1667},
+\n", 1713},
+ {"Can't open help file", 1714},
+ {"[Press 'h' for instructions.]", 1715},
+ {"\"%s\" line %d", 1716},
+ {"[Not a file] line %d", 1717},
+ {" Overflow\n", 1718},
+ {"...skipping\n", 1719},
+ {"Regular expression botch", 1720},
{"\
\n\
-Pattern not found\n", 1668},
- {"Pattern not found", 1669},
- {"can't fork\n", 1670},
+Pattern not found\n", 1721},
+ {"Pattern not found", 1722},
+ {"can't fork\n", 1723},
{"\
\n\
-...Skipping ", 1671},
- {"...Skipping ", 1672},
- {"to file ", 1673},
- {"back to file ", 1674},
- {"Line too long", 1675},
- {"No previous command to substitute for", 1676},
- {"od: od(1) has been deprecated for hexdump(1).\n", 1677},
- {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1678},
- {"; see strings(1).", 1679},
- {"hexdump: can't read %s.\n", 1680},
- {"hexdump: line too long.\n", 1681},
- {"hexdump: byte count with multiple conversion characters.\n", 1682},
- {"hexdump: bad byte count for conversion character %s.\n", 1683},
- {"hexdump: %%s requires a precision or a byte count.\n", 1684},
- {"hexdump: bad format {%s}\n", 1685},
- {"hexdump: bad conversion character %%%s.\n", 1686},
- {"Unable to allocate bufferspace\n", 1687},
- {"usage: rev [file ...]\n", 1688},
- {"usage: %s [ -i ] [ -tTerm ] file...\n", 1689},
- {"trouble reading terminfo", 1690},
- {"Unknown escape sequence in input: %o, %o\n", 1691},
- {"Unable to allocate buffer.\n", 1692},
- {"Input line too long.\n", 1693},
- {"Out of memory when growing buffer.\n", 1694},
- {"Typematic Rate set to %.1f cps (delay = %d ms)\n", 1695},
- {"Cannot open /dev/port", 1696},
+...Skipping ", 1724},
+ {"...Skipping ", 1725},
+ {"to file ", 1726},
+ {"back to file ", 1727},
+ {"Line too long", 1728},
+ {"No previous command to substitute for", 1729},
+ {"od: od(1) has been deprecated for hexdump(1).\n", 1730},
+ {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1731},
+ {"; see strings(1).", 1732},
+ {"hexdump: can't read %s.\n", 1733},
+ {"hexdump: line too long.\n", 1734},
+ {"hexdump: byte count with multiple conversion characters.\n", 1735},
+ {"hexdump: bad byte count for conversion character %s.\n", 1736},
+ {"hexdump: %%s requires a precision or a byte count.\n", 1737},
+ {"hexdump: bad format {%s}\n", 1738},
+ {"hexdump: bad conversion character %%%s.\n", 1739},
+ {"Unable to allocate bufferspace\n", 1740},
+ {"usage: rev [file ...]\n", 1741},
+ {"usage: %s [ -i ] [ -tTerm ] file...\n", 1742},
+ {"trouble reading terminfo", 1743},
+ {"Unknown escape sequence in input: %o, %o\n", 1744},
+ {"Unable to allocate buffer.\n", 1745},
+ {"Input line too long.\n", 1746},
+ {"Out of memory when growing buffer.\n", 1747},
+ {"Typematic Rate set to %.1f cps (delay = %d ms)\n", 1748},
+ {"Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n", 1749},
+ {"Cannot open /dev/port", 1750},
};
-int _msg_tbl_length = 1696;
+int _msg_tbl_length = 1750;
diff --git a/po/cs.po b/po/cs.po
index 87ee5b5de..422f35a5c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,11 +1,11 @@
-# Czech translation of util-linux.
+# Czech translation of util-linux.
# Jiří Pavlovský <pavlovsk@ff.cuni.cz>, 1999.
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux-2.9u\n"
-"POT-Creation-Date: 1999-07-10 16:38+0200\n"
-"PO-Revision-Date: 1999-07-13 23:44+0200\n"
+"Project-Id-Version: util-linux-2.10\n"
+"POT-Creation-Date: 1999-11-03 21:24+0100\n"
+"PO-Revision-Date: 1999-11-03 21:38+0100\n"
"Last-Translator: Jiří Pavlovský <pavlovsk@ff.cuni.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
@@ -52,16 +52,47 @@ msgstr "%s: přístup k portu nelze získat: volání iopl(3) selhalo.\n"
msgid "Probably you need root privileges.\n"
msgstr "Pravděpodobně je třeba mít práva superuľivatele.\n"
-#: clock/hwclock.c:253
+#: clock/hwclock.c:213
+#, 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"
+
+#: clock/hwclock.c:214 clock/hwclock.c:303
+msgid "UTC"
+msgstr "greenwichský"
+
+#: clock/hwclock.c:214 clock/hwclock.c:302
+msgid "local"
+msgstr "místní"
+
+#: clock/hwclock.c:286
+#, 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"
+
+#: clock/hwclock.c:288
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Očekáváno `UTC', `LOCAL' či nic.)\n"
+
+#: clock/hwclock.c:297
#, c-format
msgid "Last drift adjustment done at %d seconds after 1969\n"
msgstr "Poslední oprava posunu proběhla %d vteřin od roku 1969.\n"
-#: clock/hwclock.c:255
+#: clock/hwclock.c:299
#, c-format
msgid "Last calibration done at %d seconds after 1969\n"
msgstr "Poslední kalibrace proběhla %d vteřin od roku 1969.\n"
+#: clock/hwclock.c:301
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "Hodiny reálného času jsou nastaveny na %s čas.\n"
+
+#: clock/hwclock.c:303
+msgid "unknown"
+msgstr "neznámý"
+
#. -----------------------------------------------------------------------------
#. Wait until the falling edge of the Hardware Clock's update flag so
#. that any time that is read from the clock immediately after we
@@ -76,41 +107,41 @@ msgstr "Poslední kalibrace proběhla %d vteřin od roku 1969.\n"
#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
#.
#. -----------------------------------------------------------------------------
-#: clock/hwclock.c:278
+#: clock/hwclock.c:325
msgid "Waiting for clock tick...\n"
msgstr "čekám na tiknutí hodin...\n"
-#: clock/hwclock.c:282
+#: clock/hwclock.c:329
msgid "...got clock tick\n"
msgstr "...hodiny tikly\n"
-#: clock/hwclock.c:334
+#: clock/hwclock.c:381
#, c-format
msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
"Hodiny reálného času obsahují chybné hodnoty: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: clock/hwclock.c:343
+#: clock/hwclock.c:390
#, c-format
msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
msgstr "Hodiny reálného času ukazují %.2d:%.2d:%.2d = %d vteřin od roku 1969\n"
-#: clock/hwclock.c:369
+#: clock/hwclock.c:416
#, c-format
msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
msgstr "Hodiny reálného času ukazují %02d:%02d:%02d\n"
-#: clock/hwclock.c:395
+#: clock/hwclock.c:442
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
msgstr ""
"Nastavuji hodiny reálného času na %.2d:%.2d:%.2d = %d vteřin od roku 1969\n"
-#: clock/hwclock.c:401
+#: clock/hwclock.c:448
msgid "Clock not changed - testing only.\n"
msgstr "Testovací reľim - Čas nezměněn.\n"
-#: clock/hwclock.c:449
+#: clock/hwclock.c:496
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -119,7 +150,7 @@ msgstr ""
"Počet vteřin uplynulých od referenčního času: %.6f.\n"
"Čekám, dokud neuplyne daląí celá vteřina.\n"
-#: clock/hwclock.c:473
+#: clock/hwclock.c:520
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"
@@ -133,39 +164,39 @@ msgstr ""
#.
#. Compute display value for time
#. Cut off trailing newline
-#: clock/hwclock.c:485
+#: clock/hwclock.c:532
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f vteřiny\n"
-#: clock/hwclock.c:519
+#: clock/hwclock.c:566
msgid "No --date option specified.\n"
msgstr "Přepínač --date vyľaduje argument.\n"
#. Quotation marks in date_opt would ruin the date command we construct.
#.
-#: clock/hwclock.c:524
+#: clock/hwclock.c:571
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
msgstr ""
"Argument přepínače --date není platným datem. Konkrétně obsahuje uvozovky.\n"
-#: clock/hwclock.c:530
+#: clock/hwclock.c:577
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Spouątím příkaz 'date': %s\n"
-#: clock/hwclock.c:534
+#: clock/hwclock.c:581
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."
-#: clock/hwclock.c:540
+#: clock/hwclock.c:587
#, c-format
msgid "response from date command = %s\n"
msgstr "odpověď příkazu 'date' = %s\n"
-#: clock/hwclock.c:542
+#: clock/hwclock.c:589
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -180,7 +211,7 @@ msgstr ""
"Odpověď:\n"
" %s\n"
-#: clock/hwclock.c:551
+#: clock/hwclock.c:598
#, c-format
msgid ""
"The date command issued by %s returnedsomething other than an integer where "
@@ -197,12 +228,12 @@ msgstr ""
"Odpověď:\n"
" %s\n"
-#: clock/hwclock.c:561
+#: clock/hwclock.c:608
#, c-format
msgid "date string %s equates to %d seconds since 1969.\n"
msgstr "Datum %s odpovídá %d vteřinám od roku 1969.\n"
-#: clock/hwclock.c:596
+#: clock/hwclock.c:643
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -210,33 +241,33 @@ msgstr ""
"Systémový čas nelze podle hodin reálného času nastavit, protoľe neukazují\n"
"platný čas.\n"
-#: clock/hwclock.c:612
+#: clock/hwclock.c:659
msgid "Calling settimeofday:\n"
msgstr "Volám settimeofday:\n"
-#: clock/hwclock.c:613
+#: clock/hwclock.c:660
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: clock/hwclock.c:615
+#: clock/hwclock.c:662
#, c-format
msgid "\ttz.tz_minuteswest = %ld\n"
msgstr "\ttz.tz_minuteswest = %ld\n"
-#: clock/hwclock.c:618
+#: clock/hwclock.c:665
msgid "Not setting system clock because running in test mode.\n"
msgstr "Testovací reľim - systémový čas nezměněn.\n"
-#: clock/hwclock.c:630
+#: clock/hwclock.c:677
msgid "Must be superuser to set system clock.\n"
msgstr "Nastavit systémový čas můľe pouze superuľivatel.\n"
-#: clock/hwclock.c:632
+#: clock/hwclock.c:679
msgid "settimeofday() failed"
msgstr "volání settimeofday() selhalo"
-#: clock/hwclock.c:665
+#: clock/hwclock.c:712
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -244,7 +275,7 @@ msgstr ""
"Neopravuji míru posunu, protoľe hodiny reálného času posledně obsahovaly\n"
"neplatné hodnoty.\n"
-#: clock/hwclock.c:669
+#: clock/hwclock.c:716
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -252,7 +283,7 @@ msgstr ""
"Neopravuji míru posunu, protoľe poslední kalibrace jeątě neuplynul celý "
"den.\n"
-#: clock/hwclock.c:678
+#: clock/hwclock.c:725
#, c-format
msgid ""
"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -264,21 +295,21 @@ msgstr ""
"je nastavena na %3$f vteřin/den.\n"
"Opravuji míru posunu o %4$f vteřin.\n"
-#: clock/hwclock.c:729
+#: clock/hwclock.c:776
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Počet vteřin od poslední opravy: %d\n"
-#: clock/hwclock.c:731
+#: clock/hwclock.c:778
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "Potřebná změna času: vteřin vpřed: %d ; vteřin zpět: %.6f\n"
-#: clock/hwclock.c:759
+#: clock/hwclock.c:807
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Testovací reľim - soubor adjtime nezměněn.\n"
-#: clock/hwclock.c:760
+#: clock/hwclock.c:808
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -287,33 +318,33 @@ msgstr ""
"Do %s by bylo uloľeno následující:\n"
"%s"
-#: clock/hwclock.c:784
+#: clock/hwclock.c:832
msgid "Drift adjustment parameters not updated.\n"
msgstr "Parametry opravy posunu nezměněny.\n"
-#: clock/hwclock.c:825
+#: clock/hwclock.c:873
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"
-#: clock/hwclock.c:849
+#: clock/hwclock.c:897
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "Potřebná oprava je menąí neľ 1 vteřina, proto hodiny nenastavuji.\n"
-#: clock/hwclock.c:875
+#: clock/hwclock.c:923
#, c-format
msgid "Using %s.\n"
msgstr "Pouľívám %s.\n"
-#: clock/hwclock.c:877
+#: clock/hwclock.c:925
msgid "No usable clock interface found.\n"
msgstr "Nebylo nalezeno ľádné pouľitelné rozhraní k hodinám.\n"
-#: clock/hwclock.c:965
+#: clock/hwclock.c:1020
msgid "Unable to set system clock.\n"
msgstr "Systémový čas nelze nastavit.\n"
-#: clock/hwclock.c:994
+#: clock/hwclock.c:1049
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -326,37 +357,37 @@ msgstr ""
"Tento program nebyl přeloľen pro Alpha systém ( a tudíľ pravděpodobně nyní\n"
"neběľí na Alphě). Ignorováno.\n"
-#: clock/hwclock.c:1003
+#: clock/hwclock.c:1058
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Počátek epochy nelze z jádra zjistit.\n"
-#: clock/hwclock.c:1005
+#: clock/hwclock.c:1060
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Jádro pokládá za počátek epochy %lu.\n"
-#: clock/hwclock.c:1008
+#: clock/hwclock.c:1063
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"
-#: clock/hwclock.c:1011
+#: clock/hwclock.c:1066
#, 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"
-#: clock/hwclock.c:1014
+#: clock/hwclock.c:1069
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Hodnotu počátku epochy v jádře nelze nastavit.\n"
-#: clock/hwclock.c:1094
+#: clock/hwclock.c:1151
#, 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"
-#: clock/hwclock.c:1102
+#: clock/hwclock.c:1159
msgid ""
"You have specified multiple function options.\n"
"You can only perform one function at a time.\n"
@@ -364,21 +395,29 @@ msgstr ""
"Zadal jste vícero funkčních přepínačů. Program můľe provést maximálně jednu\n"
"funkci najednou.\n"
-#: clock/hwclock.c:1115
+#: clock/hwclock.c:1165
+#, 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"
+
+#: clock/hwclock.c:1178
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Nebyl zadán platný čas, který mám nastavit. Hodiny nelze nastavit.\n"
-#: clock/hwclock.c:1130
+#: clock/hwclock.c:1193
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Hodiny reálného času můľe nastavit pouze superuľivatel.\n"
-#: clock/hwclock.c:1134
+#: clock/hwclock.c:1197
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"
-#: clock/hwclock.c:1150
+#: clock/hwclock.c:1213
msgid ""
"Cannot access the Hardware Clock via any known method. Use --debug option "
"to see the details of our search for an access method.\n"
@@ -386,40 +425,35 @@ msgstr ""
"®ádným ze známých způsobů nelze získat přístup k hodinám reálného času.\n"
"Pro zjiątění podrobností pouľijte přepínač --debug.\n"
-#: clock/hwclock.c:1164
-#, c-format
-msgid "%s: %s, errno=%d: %s.\n"
-msgstr "%s: %s, errno=%d: %s.\n"
-
-#: clock/kd.c:40
+#: clock/kd.c:41
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Ve smyčce se pokouąím zjistit čas pomocí KDGHWCLK.\n"
-#: clock/kd.c:43
+#: clock/kd.c:44
msgid "KDGHWCLK ioctl to read time failed"
msgstr "volání KDGHWCLK ioctl selhalo."
-#: clock/kd.c:50 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:144
msgid "Timed out waiting for time change.\n"
msgstr "V Časovém limitu se nepodařilo zjistit čas.\n"
-#: clock/kd.c:54
+#: clock/kd.c:69
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "volání KDGHWCLK ioctl ve smyčce selhalo."
-#: clock/kd.c:76
+#: clock/kd.c:91
msgid "ioctl() failed to read time from /dev/tty1"
msgstr "čas se pomocí volání ioctl() pro /dev/tty1 nepodařilo zjistit"
-#: clock/kd.c:112
+#: clock/kd.c:127
msgid "ioctl() to open /dev/tty1 failed"
msgstr "volání ioctl() pro /dev/tty1 selhalo"
-#: clock/kd.c:142
+#: clock/kd.c:157
msgid "KDGHWCLK ioctl failed"
msgstr "volání ioctl KDGHWCLK selhalo"
-#: clock/kd.c:146
+#: clock/kd.c:161
msgid "Can't open /dev/tty1"
msgstr "/dev/tty1 nelze otevřít"
@@ -604,40 +638,45 @@ msgstr "2"
msgid "Single"
msgstr "1"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:198
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Pouľití: %s [ -larvsmf ] jméno zařízení\n"
+
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr "%s je jiľ připojeno.\t"
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr "Chcete opravdu pokračovat"
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr "prohlídka ukončena.\n"
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
msgstr "číslo Zóny < FIRSTZONE v souboru `"
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
msgstr "číslo Zóny >= počet ZÓN v souboru `"
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
msgstr "Odstranit blok"
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
msgid "Read error: unable to seek to block in file '"
msgstr "Chyba při čtení: nelze posunout ukazovátko na blok v souboru '"
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
msgid "Read error: bad block in file '"
msgstr "Chyba při čtení: chybný blok v souboru '"
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
@@ -645,178 +684,284 @@ msgstr ""
"Vnitřní chyba: pokus o zápis chybného bloku.\n"
"®ádost o zápis ignorována.\n"
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr "chyba při posunu ukazovátka ve write_block"
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
msgstr "Chyba při zápisu: chybný blok v souboru '"
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr "chyba při posunu ukazovátka ve write_super_block"
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr "superblok nelze zapsat"
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr "mapu i-uzlů nelze zapsat"
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr "mapu zón nelze zapsat"
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr "i-uzly nelze zapsat"
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr "chyba při posunu ukazovátka"
+
+#: disk-utils/fsck.minix.c:560
+msgid "unable to read super block"
+msgstr "superblok nelze číst"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr "superblok obsahuje chybné magické číslo"
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr "podporovány jsou pouze 1kilobajtové bloky/zóny"
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr "superblok obsahuje chybnou poloľku s_imap_blocks"
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "superblok obsahuje chybnou poloľku s_zmap_blocks"
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr "buffer pro mapu i-uzlů nelze alokovat"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr "buffer pro i-uzly nelze alokovat"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr "buffer pro počítadlo i-uzlů nelze alokovat"
+
#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr "buffer pro počítadlo zón nelze alokovat"
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr "mapu i-uzlů nelze číst"
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr "mapu zón nelze číst"
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr "i-uzly nelze číst"
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr "Varování: Firstzone != Norm_firstzone\n"
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
#, c-format
msgid "%ld inodes\n"
msgstr "i-uzlů: %ld\n"
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
#, c-format
msgid "%ld blocks\n"
msgstr "bloků: %ld\n"
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
msgstr "Firstdatazone=%ld (%ld)\n"
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
#, c-format
msgid "Zonesize=%d\n"
msgstr "Velikost zóny=%d\n"
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr "Maxvelikost=%ld\n"
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr "Stav systému souborů=%d\n"
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
"\n"
msgstr "namelen=%d\n"
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
msgstr "I-uzel %d je označen jako nepouľívaný, ale je pouľit pro soubor '"
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
msgstr "Označen jako pouľívaný"
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
msgstr " mód je %05o\n"
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr "Varování: počet i-uzlů je přílią veliký.\n"
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr "root i-uzel není adresářem"
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
msgstr "Blok byl pouľit jiľ předtím. Nyní v souboru `"
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr "Smazat"
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
msgstr "Blok %d v souboru `"
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
msgstr " je označen jako nepouľívaný."
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
msgstr "Opravit"
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
msgstr " obsahuje chybné číslo i-uzlu pro soubor '"
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
msgstr " Odstranit"
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
msgstr ": chybný adresář: '.' není první\n"
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
msgstr ": chybný adresář: '..' není druhý\n"
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+msgid "internal error"
+msgstr "vnitřní chyba"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
msgstr ": chybný adresář: velikost<32"
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
msgstr ": chybný adresář: velikost < 32"
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr "chyba při posunu ukazovátka v bad_zone"
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
msgstr "Mód I-uzlu %d není smazán."
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
#, c-format
msgid "Inode %d not used, marked used in the bitmap."
msgstr "I-uzel %d není pouľíván a v bitmapě označen jako pouľívaný."
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
msgstr "I-uzel %d je pouľíván a v bitmapě označen jako nepouľívaný."
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
msgstr "I-uzel %d (mode = %07o), i_nlinks=%d, napočítáno=%d."
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
msgstr "Nastavit i_nlinks na počet"
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
#, c-format
msgid "Zone %d: marked in use, no file uses it."
msgstr "Zóna %d je označena jako pouľívaná a ľádné soubory ji nepouľívají."
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
msgstr "Odznačit"
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
msgstr "Zóna %d: %spouľívaná, napočítáno=%d\n"
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
msgstr "není "
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
msgid "Set"
msgstr "Nastavit"
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr "chybná velikost i-uzlu"
+
+#: disk-utils/fsck.minix.c:1257
+msgid "bad v2 inode size"
+msgstr "chybná velikost v2 i-uzlu"
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr "opravy s účastí uľivatele vyľadují terminál"
+
+#: disk-utils/fsck.minix.c:1287
+#, c-format
+msgid "unable to open '%s'"
+msgstr "'%s' nelze otevřít"
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
msgstr "%s je 'čisté', ověřování vynecháno.\n"
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr "Kontrola systému souborů na %s vynucena.\n"
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr "Systém souborů na %s je 'ąpinavý', je třeba jej zkontrolovat.\n"
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
@@ -824,11 +969,11 @@ msgstr ""
"\n"
"pouľívaných i-uzlů: %6ld (%ld%%)\n"
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
msgstr "pouľívaných zón: %6ld (%ld%%)\n"
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -851,29 +996,30 @@ msgstr ""
"------\n"
"souborů: %6d\n"
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
"----------------------------\n"
msgstr ""
"----------------------------\n"
-"SOUBOROVÝ SYSTÉM BYL ZMĚNĚN \n"
+"SYSTÉM SOUBORŮ BYL ZMĚNĚN \n"
"----------------------------\n"
#: disk-utils/mkfs.c:66
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:80 fdisk/cfdisk.c:330 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:221 mount/sundries.c:195
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
msgstr "%s: Nedostatek paměti!\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
-msgstr "mkfs verze "
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs verze %s (%s)\n"
#: disk-utils/mkfs.minix.c:186
#, c-format
@@ -897,10 +1043,6 @@ msgstr "startovací blok nelze smazat"
msgid "seek failed in write_tables"
msgstr "chyba při posunu ukazovátka ve write_tables"
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr "superblok nelze zapsat"
-
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
msgstr "mapu i-uzlů nelze zapsat"
@@ -913,10 +1055,6 @@ msgstr "mapu zón nelze zapsat"
msgid "unable to write inodes"
msgstr "i-uzly nelze zapsat"
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr "chyba při posunu ukazovátka ve write_block"
-
#: disk-utils/mkfs.minix.c:292
msgid "write failed in write_block"
msgstr "chyba při zápisu ve write_block"
@@ -956,7 +1094,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:585
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
msgid "seek failed in check_blocks"
msgstr "chyba při posunu ukazovátka v check_blocks"
@@ -977,10 +1115,6 @@ msgstr "chybných bloků: 1\n"
msgid "can't open file of bad blocks"
msgstr "soubor chybných bloků nelze otevřít"
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
-msgid "bad inode size"
-msgstr "chybná velikost i-uzlu"
-
#: disk-utils/mkfs.minix.c:669
#, c-format
msgid "%s: not compiled with minix v2 support\n"
@@ -1010,41 +1144,64 @@ msgstr "nebudu se pokouąet vytvořit systém souborů na '%s'"
msgid "Assuming pages of size %d\n"
msgstr "Předpokládám velikost stránek %d\n"
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:185
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr "Pouľití: %s [-c] [-v0|-v1] jméno zařízení [bloky]\n"
+
+#: disk-utils/mkswap.c:208
+msgid "too many bad pages"
+msgstr "přílią mnoho chybných stránek"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1100
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
+msgstr "Nedostatek paměti"
+
+#: disk-utils/mkswap.c:239
msgid "one bad page\n"
msgstr "chybných stránek: 1\n"
-#: disk-utils/mkswap.c:236
+#: disk-utils/mkswap.c:241
#, c-format
msgid "%d bad pages\n"
msgstr "chybných stránek: %d\n"
-#: disk-utils/mkswap.c:340
+#: disk-utils/mkswap.c:345
#, 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:349
+#: disk-utils/mkswap.c:354
#, c-format
msgid "%s: error: size %ld is larger than device size %d\n"
msgstr "%s: chyba: zadaná velikost (%ld) je větąí neľ velikost zařízení (%d)\n"
-#: disk-utils/mkswap.c:367
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr "%s: chyba: neznámá verze %d\n"
-#: disk-utils/mkswap.c:373
+#: disk-utils/mkswap.c:378
#, 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:392
+#: disk-utils/mkswap.c:397
#, 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:419
+#: disk-utils/mkswap.c:409
+#, 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:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr "osudová chyba: první stránka je nečitelná"
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1058,11 +1215,27 @@ msgstr ""
"opravdu\n"
"chcete vytvořit odkládací prostor v0, pouľijte přepínač -f pro vynucení.\n"
-#: disk-utils/mkswap.c:444
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr "Odkládací prostor nelze nastavit: nečitelné"
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr "Vytvářím odkládací prostor verze %d, velikost (v bajtech) = %ld\n"
+#: disk-utils/mkswap.c:455
+msgid "unable to rewind swap-device"
+msgstr "odkládací prostor nelze převinout"
+
+#: disk-utils/mkswap.c:458
+msgid "unable to write signature page"
+msgstr "stránku signatur nelze zapsat"
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr "volání fsync selhalo"
+
#: disk-utils/setfdprm.c:30
#, c-format
msgid "Invalid number: %s\n"
@@ -1101,46 +1274,46 @@ msgstr " %s [ -c | -y | -n | -d ] zařízení\n"
msgid " %s [ -c | -y | -n ] dev\n"
msgstr " %s [ -c | -y | -n ] zařízení\n"
-#: fdisk/cfdisk.c:355 fdisk/cfdisk.c:1860
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr "Nepouľitelné"
-#: fdisk/cfdisk.c:357 fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
msgid "Free Space"
msgstr "Volný prostor"
-#: fdisk/cfdisk.c:360
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr "Linux ext2"
#. also Solaris
-#: fdisk/cfdisk.c:362 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr "Linux"
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:367
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:371
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:382
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr "Na disku byly provedeny změny.\n"
-#: fdisk/cfdisk.c:383
+#: fdisk/cfdisk.c:423
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:386
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -1152,304 +1325,295 @@ 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:481
+#: fdisk/cfdisk.c:521
msgid "FATAL ERROR"
msgstr "OSUDOVÁ CHYBA"
-#: fdisk/cfdisk.c:490
+#: fdisk/cfdisk.c:530
msgid "Press any key to exit cfdisk"
msgstr "Stiskněte jakoukoliv klávesu pro ukončení programu cfdisk"
-#: fdisk/cfdisk.c:526 fdisk/cfdisk.c:534
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
msgid "Cannot seek on disk drive"
msgstr "Nelze posunout ukazovátko na disku"
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:568
msgid "Cannot read disk drive"
msgstr "Z disku nelze číst"
-#: fdisk/cfdisk.c:536
+#: fdisk/cfdisk.c:576
msgid "Cannot write disk drive"
msgstr "Nelze zapisovat na disk"
-#: fdisk/cfdisk.c:773
+#: fdisk/cfdisk.c:815
msgid "Too many partitions"
msgstr "přílią mnoho diskových oddílů"
-#: fdisk/cfdisk.c:778
+#: fdisk/cfdisk.c:820
msgid "Partition begins before sector 0"
msgstr "Diskový oddíl začíná před sektorem 0"
-#: fdisk/cfdisk.c:783
+#: fdisk/cfdisk.c:825
msgid "Partition ends before sector 0"
msgstr "Diskový oddíl končí před sektorem 0"
-#: fdisk/cfdisk.c:788
+#: fdisk/cfdisk.c:830
msgid "Partition begins after end-of-disk"
msgstr "Diskový oddíl začíná za koncem disku"
-#: fdisk/cfdisk.c:793
+#: fdisk/cfdisk.c:835
msgid "Partition ends after end-of-disk"
msgstr "Diskový oddíl končí za koncem disku"
-#: fdisk/cfdisk.c:816
+#: fdisk/cfdisk.c:859
msgid "logical partitions not in disk order"
msgstr "logické diskový oddíl jsou chybně seřazeny"
-#: fdisk/cfdisk.c:819
+#: fdisk/cfdisk.c:862
msgid "logical partitions overlap"
msgstr "logické diskové oddíly se vzájemně překrývají"
-#: fdisk/cfdisk.c:821
-msgid "extended logical partitions overlap"
-msgstr "roząířené diskové oddíly se vzájemně překrývají"
+#: fdisk/cfdisk.c:864
+msgid "enlarged logical partitions overlap"
+msgstr "zvětąené logické diskové oddíly se vzájemně překrývají"
-#: fdisk/cfdisk.c:851
+#: fdisk/cfdisk.c:894
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:862 fdisk/cfdisk.c:874
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
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:1024
+#: fdisk/cfdisk.c:1067
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:1080
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr "Nabídka nemá zadaný směr. Pouľívám horizontální."
-#: fdisk/cfdisk.c:1210
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr "Chybná klávesa"
-#: fdisk/cfdisk.c:1233
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Stiskněte klávesu pro pokračování"
-#: fdisk/cfdisk.c:1280 fdisk/cfdisk.c:1831 fdisk/cfdisk.c:2354
-#: fdisk/cfdisk.c:2356
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "Primární"
-#: fdisk/cfdisk.c:1280
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "Vytvořit nový primární diskový oddíl"
-#: fdisk/cfdisk.c:1281 fdisk/cfdisk.c:1831 fdisk/cfdisk.c:2353
-#: fdisk/cfdisk.c:2356
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "Logický"
-#: fdisk/cfdisk.c:1281
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "Vytvořit nový logický diskový oddíl"
-#: fdisk/cfdisk.c:1282 fdisk/cfdisk.c:1335 fdisk/cfdisk.c:2043
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Zruąit"
-#: fdisk/cfdisk.c:1282 fdisk/cfdisk.c:1335
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "Nevytvářet diskový oddíl"
-#: fdisk/cfdisk.c:1298
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "!!! Vnitřní chyba !!!"
-#: fdisk/cfdisk.c:1301
+#: fdisk/cfdisk.c:1344
msgid "Size (in MB): "
msgstr "Velikost (v MB): "
-#: fdisk/cfdisk.c:1333
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "Začátek"
-#: fdisk/cfdisk.c:1333
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "Vytvořit diskový oddíl na začátku volného prostoru"
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "Konec"
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr "Vytvořit diskový oddíl na konci volného prostoru"
-#: fdisk/cfdisk.c:1352
+#: fdisk/cfdisk.c:1397
msgid "No room to create the extended partition"
msgstr "Pro roząířený diskový oddíl není dostatek místa"
-#. probably a file or cdrom
-#: fdisk/cfdisk.c:1384
-msgid "Cannot read disk drive geometry"
-msgstr "Geometrii disku nelze zjistit"
-
-#: fdisk/cfdisk.c:1399
+#: fdisk/cfdisk.c:1436
msgid "Bad signature on partition table"
msgstr "Chybný podpis na tabulce rozdělení disku"
-#: fdisk/cfdisk.c:1402
-msgid "Cannot get disk size"
-msgstr "Velikost disku nelze zjistit"
-
-#: fdisk/cfdisk.c:1420
-msgid "Cannot derive a geometry from an empty partition table"
-msgstr "Z prázdné tabulky rozdělení disku nelze odvodit geometrii."
-
-#: fdisk/cfdisk.c:1428
-msgid "Cannot derive a geometry from the partition table"
-msgstr "Z tabulky rozdělení disku nelze odvodit geometrii."
+#: fdisk/cfdisk.c:1474
+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:1461
+#: fdisk/cfdisk.c:1504
msgid "Cannot open disk drive"
msgstr "Disk nelze otevřít"
-#: fdisk/cfdisk.c:1463 fdisk/cfdisk.c:1647
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
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:1527
+msgid "Cannot get disk size"
+msgstr "Velikost disku nelze zjistit"
+
#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1506
+#: fdisk/cfdisk.c:1553
msgid "Bad primary partition"
msgstr "Chybný primární diskový oddíl"
#. avoid snprintf
-#: fdisk/cfdisk.c:1537
+#: fdisk/cfdisk.c:1584
msgid "Bad logical partition"
msgstr "Chybný logický diskový oddíl"
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1699
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:1663
+#: fdisk/cfdisk.c:1703
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? (yes či no):"
-#: fdisk/cfdisk.c:1669
+#: fdisk/cfdisk.c:1709
msgid "no"
msgstr "ne"
-#: fdisk/cfdisk.c:1670
+#: fdisk/cfdisk.c:1710
msgid "Did not write partition table to disk"
msgstr "Neukládat tabulku rozdělení disku na disk"
-#: fdisk/cfdisk.c:1672
+#: fdisk/cfdisk.c:1712
msgid "yes"
msgstr "ano"
-#: fdisk/cfdisk.c:1675
+#: fdisk/cfdisk.c:1715
msgid "Please enter `yes' or `no'"
msgstr "Zadejte `yes' či `no'"
-#: fdisk/cfdisk.c:1679
+#: fdisk/cfdisk.c:1719
msgid "Writing partition table to disk..."
msgstr "Ukládám tabulku rozdělení disku na disk"
-#: fdisk/cfdisk.c:1704 fdisk/cfdisk.c:1708
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
msgid "Wrote partition table to disk"
msgstr "Tabulka rozdělení disku byla uloľena na disk"
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1746
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:1716
+#: fdisk/cfdisk.c:1756
msgid ""
"Not precisely one primary partition is 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:1774 fdisk/cfdisk.c:1892 fdisk/cfdisk.c:1984
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
msgstr "Zadejte jméno souboru či stiskněte RETURN pro zobrazení: "
-#: fdisk/cfdisk.c:1782 fdisk/cfdisk.c:1900 fdisk/cfdisk.c:1992
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
#, c-format
msgid "Cannot open file '%s'"
msgstr "Soubor '%s' nelze otevřít"
-#: fdisk/cfdisk.c:1793
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Disk: %s\n"
-#: fdisk/cfdisk.c:1795
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr "Sektor 0:\n"
-#: fdisk/cfdisk.c:1802
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr "Sektor %d:\n"
-#: fdisk/cfdisk.c:1822
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr " ®ádný "
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr " Pri/Log"
-#: fdisk/cfdisk.c:1826
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr " Primární"
-#: fdisk/cfdisk.c:1828
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr " Logický"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1866 fdisk/fdisk.c:1080 fdisk/fdisk.c:1229
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:560
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "Neznámý"
-#: fdisk/cfdisk.c:1872
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr "Startovací (%02X)"
-#: fdisk/cfdisk.c:1874 fdisk/cfdisk.c:2362
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr "Neznámý (%02X)"
-#: fdisk/cfdisk.c:1876
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr "®ádný (%02X)"
-#: fdisk/cfdisk.c:1911 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr "Tabulka rozdělení disku pro %s\n"
-#: fdisk/cfdisk.c:1913
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr " První Poslední\n"
-#: fdisk/cfdisk.c:1914
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
" # Typ Sektor Sektor Posun Délka ID systému souborů "
"Příznaky\n"
-#: fdisk/cfdisk.c:1915
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
@@ -1457,446 +1621,455 @@ msgstr ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
-#: fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr " ---Počátek--- ----Konec---- Počáteční\n"
-#: fdisk/cfdisk.c:2006
+#: fdisk/cfdisk.c:2038
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:2007
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-#: fdisk/cfdisk.c:2040
+#: fdisk/cfdisk.c:2072
msgid "Raw"
msgstr "Přímý"
-#: fdisk/cfdisk.c:2040
+#: fdisk/cfdisk.c:2072
msgid "Print the table using raw data format"
msgstr "Vytisknout tabulku v přímém datovém formátu"
-#: fdisk/cfdisk.c:2041 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr "Sektory"
-#: fdisk/cfdisk.c:2041
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr "Vytisknout tabulku seřazenou dle sektorů"
-#: fdisk/cfdisk.c:2042
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr "Tabulka"
-#: fdisk/cfdisk.c:2042
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr "Vytisknout pouze tabulku rozdělení disku"
-#: fdisk/cfdisk.c:2043
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr "Netisknout tabulku"
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2103
msgid "Help Screen for cfdisk"
msgstr "Nápověda pro cfdisk"
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2105
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:2074
+#: fdisk/cfdisk.c:2106
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:2075
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr "diskových oddílů na Vaąem pevném disku."
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2109
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr "Příkaz Význam"
-#: fdisk/cfdisk.c:2080
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
msgstr "------- -------"
-#: fdisk/cfdisk.c:2081
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
msgstr " b Přepne aktuálnímu oddílu příznak startovatelnosti"
-#: fdisk/cfdisk.c:2082
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
msgstr " d Smaľe aktuální oddíl"
-#: fdisk/cfdisk.c:2083
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr " g Změní geometrii"
-#: fdisk/cfdisk.c:2084
+#: fdisk/cfdisk.c:2116
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:2085
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr " kteří vědí, co činí."
-#: fdisk/cfdisk.c:2086
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
msgstr " h Vypíąe tuto nápovědu"
-#: fdisk/cfdisk.c:2087
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
msgstr " m Maximálně zvětąí aktuální diskový oddíl "
-#: fdisk/cfdisk.c:2088
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr " Poznámka: Toto můľe učinit oddíl nekompatibilní s"
-#: fdisk/cfdisk.c:2089
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr " DOS, OS/2 ..."
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
msgstr " n Vytvořit na volném místě nový oddíl"
-#: fdisk/cfdisk.c:2091
+#: fdisk/cfdisk.c:2123
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:2092
+#: fdisk/cfdisk.c:2124
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:2093
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr " z několika formátů:"
-#: fdisk/cfdisk.c:2094
+#: fdisk/cfdisk.c:2126
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:2095
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr " s - Tabulka seřazená dle sektorů"
-#: fdisk/cfdisk.c:2096
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr " t - Tabulka v přímém formátu"
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr " q Ukončí program bez uloľení tabulky rozdělení disku"
-#: fdisk/cfdisk.c:2098
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
msgstr " t Změní typ systému souborů"
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
msgstr " u Změní jednotky pro zobrazení velikosti oddílu"
-#: fdisk/cfdisk.c:2100
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2132
+msgid " Rotates through MB, sectors and cylinders"
msgstr " Cykluje mezi MB, sektory a cylindry"
-#: fdisk/cfdisk.c:2101
+#: fdisk/cfdisk.c:2133
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:2102
+#: fdisk/cfdisk.c:2134
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:2103
+#: fdisk/cfdisk.c:2135
msgid " either confirm or deny the write by entering `yes' or"
msgstr " nebo odmítnout napsáním `yes' nebo"
-#: fdisk/cfdisk.c:2104
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr " `no'"
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
msgstr "Nahoru Přesune kurzor na předcházející oddíl."
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
msgstr "Dolů Přesune kurzor na daląí oddíl."
-#: fdisk/cfdisk.c:2107
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr "CTRL-L Překreslí obrazovku"
-#: fdisk/cfdisk.c:2108
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
msgstr " ? Vypíąe tuto nápovědu"
-#: fdisk/cfdisk.c:2110
+#: fdisk/cfdisk.c:2142
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:2111
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr "(s vyjímkou zápisu - W)."
-#: fdisk/cfdisk.c:2141 fdisk/cfdisk.c:2443 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr "Cylindry"
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
msgstr "Změní geometrii cylindrů"
-#: fdisk/cfdisk.c:2142 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "Hlavy"
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
msgstr "Změní geometrii hlav"
-#: fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
msgstr "Změní geometrii sektorů"
-#: fdisk/cfdisk.c:2144
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr "Hotovo"
-#: fdisk/cfdisk.c:2144
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr "Geometrie změněna"
-#: fdisk/cfdisk.c:2157
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr "Zadejte počet cylindrů: "
-#: fdisk/cfdisk.c:2164 fdisk/cfdisk.c:2707
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
msgid "Illegal cylinders value"
msgstr "Chybný počet cylindrů"
-#: fdisk/cfdisk.c:2170
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr "Zadejte počet hlav: "
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
msgid "Illegal heads value"
msgstr "Chybný počet hlav"
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr "Zadejte počet sektorů na stopu: "
-#: fdisk/cfdisk.c:2190 fdisk/cfdisk.c:2724
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
msgid "Illegal sectors value"
msgstr "Chybný počet sektorů"
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr "Zadejte typ systému souborů: "
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2348
msgid "Cannot change FS Type to empty"
msgstr "Nelze nastavit typ SS na prázdný"
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2350
msgid "Cannot change FS Type to extended"
msgstr "Nelze nastavit typ SS na roząířený"
-#: fdisk/cfdisk.c:2331 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "Startovací"
-#: fdisk/cfdisk.c:2333
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
msgstr "Nez(%02X)"
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2339
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
msgstr ", NC"
-#: fdisk/cfdisk.c:2344 fdisk/cfdisk.c:2347
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
msgstr "NC"
-#: fdisk/cfdisk.c:2355
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr "Pri/Log"
-#: fdisk/cfdisk.c:2429
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "Disk: %s"
-#: fdisk/cfdisk.c:2431
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr "Velikostv bajtech: %lld"
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "Hlav: %d Sektorů na stopu: %d Cylindrů: %d"
-#: fdisk/cfdisk.c:2435
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "Jméno"
-#: fdisk/cfdisk.c:2436
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "Příznaky"
-#: fdisk/cfdisk.c:2437
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "Typ oddílu"
-#: fdisk/cfdisk.c:2438
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "Typ SS"
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr "[Jméno]"
-#: fdisk/cfdisk.c:2441
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr " Sektory"
-#: fdisk/cfdisk.c:2445
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "Velikost (MB)"
-#: fdisk/cfdisk.c:2500
+#: fdisk/cfdisk.c:2494
+msgid "Size (GB)"
+msgstr "Velikost (GB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "Start"
-#: fdisk/cfdisk.c:2500
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
msgstr "Přepne příznak startovatelnosti aktuálnímu diskovému oddílu"
-#: fdisk/cfdisk.c:2501
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr "Smazat"
-#: fdisk/cfdisk.c:2501
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
msgstr "Smaľe aktuální diskový oddíl"
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr "Geometrie"
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
msgstr "Změní geometrii disku (pouze pro odborníky)"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr "Nápověda"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
msgstr "Vypíąe nápovědu"
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr "Zvětąení"
-#: fdisk/cfdisk.c:2504
+#: fdisk/cfdisk.c:2553
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:2505
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr "Nový"
-#: fdisk/cfdisk.c:2505
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr "Vytvoří nový diskový oddíl ve volném prostoru"
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr "Tisk"
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2555
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:2507
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr "Konec"
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr "Ukončí program bez uloľení tabulky rozdělení disku"
-#: fdisk/cfdisk.c:2508
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr "Druh"
-#: fdisk/cfdisk.c:2508
+#: fdisk/cfdisk.c:2557
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:2509
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr "Jednotky"
-#: fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2558
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:2510
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr "Uloľit"
-#: fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2559
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:2556
+#: fdisk/cfdisk.c:2605
msgid "Cannot make this partition bootable"
msgstr "Tento oddíl nelze nastavit jako startovací."
-#: fdisk/cfdisk.c:2566
+#: fdisk/cfdisk.c:2615
msgid "Cannot delete an empty partition"
msgstr "Prázdný diskový oddíl nelze smazat."
-#: fdisk/cfdisk.c:2586 fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
msgid "Cannot maximize this partition"
msgstr "Tento diskový oddíl nelze zvětąit."
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2645
msgid "This partition is unusable"
msgstr "Tento diskový oddíl je nepouľitelný."
-#: fdisk/cfdisk.c:2598
+#: fdisk/cfdisk.c:2647
msgid "This partition is already in use"
msgstr "Tento diskový oddíl je jiľ pouľíván."
-#: fdisk/cfdisk.c:2615
+#: fdisk/cfdisk.c:2664
msgid "Cannot change the type of an empty partition"
msgstr "Typ prázdného diskového oddílu nelze změnit."
-#: fdisk/cfdisk.c:2640 fdisk/cfdisk.c:2646
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
msgid "No more partitions"
msgstr "®ádné daląí diskové oddíly"
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2704
msgid "Illegal command"
msgstr "Chybný příkaz"
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2714
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
#. Unfortunately, xgettext does not handle multi-line strings
#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2721
#, c-format
msgid ""
"\n"
@@ -1932,7 +2105,7 @@ msgstr ""
" jádro.\n"
"\n"
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:247
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1952,7 +2125,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:260
+#: fdisk/fdisk.c:259
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1968,225 +2141,213 @@ msgstr ""
" či: fdisk /dev/rd/c0d0 či: fdisk /dev/ida/c0d0 (pro RAID zařízení)\n"
" ...\n"
-#: fdisk/fdisk.c:268
-msgid "A disk block device is needed.\n"
-msgstr "Je třeba blokové zařízení disku.\n"
-
-#: fdisk/fdisk.c:271
-msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
-msgstr ""
-"Zadané jméno neodpovídá diskovému oddílu,\n"
-" a moľná ani blokovému zařízení.\n"
-
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:267
#, c-format
msgid "Unable to open %s\n"
msgstr "%s nelze otevřít\n"
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:270
#, c-format
msgid "Unable to read %s\n"
msgstr "%s nelze číst\n"
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:273
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Ukazovátko nelze posunout na %s.\n"
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:276
#, c-format
msgid "Unable to write %s\n"
msgstr "%s nelze uloľit\n"
-#: fdisk/fdisk.c:287
+#: fdisk/fdisk.c:279
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
-#: fdisk/fdisk.c:291
+#: fdisk/fdisk.c:283
msgid "Unable to allocate any more memory\n"
msgstr "Nelze alokovat více paměti\n"
-#: fdisk/fdisk.c:293
+#: fdisk/fdisk.c:285
msgid "Fatal error\n"
msgstr "Fatální chyba\n"
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:341 fdisk/fdisk.c:348
-#: fdisk/fdisk.c:371 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
msgid "Command action"
msgstr "Příkazy"
-#: fdisk/fdisk.c:305
+#: fdisk/fdisk.c:297
msgid " a toggle a read only flag"
msgstr " a přepne příznak \"pouze pro čtení\""
#. sun
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
msgid " b edit bsd disklabel"
msgstr " b úprava bsd popisu disku"
-#: fdisk/fdisk.c:307
+#: fdisk/fdisk.c:299
msgid " c toggle the mountable flag"
msgstr " c přepne příznak \"připojitelný\""
#. sun
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " d delete a partition"
msgstr " d smaľe diskový oddíl"
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
msgid " l list known partition types"
msgstr " l vypíąe známé typy diskových oddílů"
#. sun
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:342 fdisk/fdisk.c:354
-#: fdisk/fdisk.c:379 fdisk/fdisk.c:396 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
msgid " m print this menu"
msgstr " m vypíąe tuto nabídku"
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
msgid " n add a new partition"
msgstr " n vytvoří nový diskový oddíl"
-#: fdisk/fdisk.c:312 fdisk/fdisk.c:331 fdisk/fdisk.c:343 fdisk/fdisk.c:356
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
msgid " o create a new empty DOS partition table"
msgstr " o vytvoří prázdný DOSOVÝ diskový oddíl"
-#: fdisk/fdisk.c:313 fdisk/fdisk.c:332 fdisk/fdisk.c:357 fdisk/fdisk.c:380
-#: fdisk/fdisk.c:397
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
msgid " p print the partition table"
msgstr " p vypíąe tabulku rozdělení disku"
-#: fdisk/fdisk.c:314 fdisk/fdisk.c:333 fdisk/fdisk.c:344 fdisk/fdisk.c:358
-#: fdisk/fdisk.c:381 fdisk/fdisk.c:398 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
msgid " q quit without saving changes"
msgstr " q ukončí program bez uloľení změn"
-#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:345 fdisk/fdisk.c:359
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
msgid " s create a new empty Sun disklabel"
msgstr " s vytvoří prázdný Sun popis disku"
#. sun
-#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
msgid " t change a partition's system id"
msgstr " t změní id diskového oddílu"
-#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
msgid " u change display/entry units"
msgstr " u změní jednotky v nichľ jsou vypisovány informace"
-#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362 fdisk/fdisk.c:384
-#: fdisk/fdisk.c:401
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
msgid " v verify the partition table"
msgstr " v ověří tabulku rozdělení disku"
-#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:363 fdisk/fdisk.c:385
-#: fdisk/fdisk.c:402
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
msgid " w write table to disk and exit"
msgstr " w uloľí tabulku rozdělení disku a ukončí program"
-#: fdisk/fdisk.c:320 fdisk/fdisk.c:364
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
msgid " x extra functionality (experts only)"
msgstr " x roząiřující funkce (pouze pro odborníky)"
-#: fdisk/fdisk.c:324
+#: fdisk/fdisk.c:316
msgid " a select bootable partition"
msgstr " a nastaví startovací diskový oddíl"
#. sgi flavour
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:317
msgid " b edit bootfile entry"
msgstr " b úprava poloľky startovacího souboru"
#. sgi
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:318
msgid " c select sgi swap partition"
msgstr " c nastaví sgi odkládací diskový oddíl"
-#: fdisk/fdisk.c:349
+#: fdisk/fdisk.c:341
msgid " a toggle a bootable flag"
msgstr " a přepne příznak \"startovací\""
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:343
msgid " c toggle the dos compatibility flag"
msgstr " c přepne příznak \"DOS kompatibilní\""
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:364
msgid " a change number of alternate cylinders"
msgstr " a změní mnoľství alternativních cylindrů"
#. sun
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
msgid " c change number of cylinders"
msgstr " c změní mnoľství cylindrů"
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
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:375
+#: fdisk/fdisk.c:367
msgid " e change number of extra sectors per cylinder"
msgstr " e změní mnoľství extra sektorů na stopu"
#. sun
-#: fdisk/fdisk.c:376 fdisk/fdisk.c:395
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
msgid " h change number of heads"
msgstr " h změní mnoľství hlav"
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:369
msgid " i change interleave factor"
msgstr " i změní prokládací faktor"
#. sun
-#: fdisk/fdisk.c:378
+#: fdisk/fdisk.c:370
msgid " o change rotation speed (rpm)"
msgstr " o změní rychlost otáčení"
-#: fdisk/fdisk.c:382 fdisk/fdisk.c:399 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
msgid " r return to main menu"
msgstr " r návrat do hlavní nabídky"
-#: fdisk/fdisk.c:383 fdisk/fdisk.c:400
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
msgid " s change number of sectors/track"
msgstr " s změní počet sektorů/stopu"
-#: fdisk/fdisk.c:386
+#: fdisk/fdisk.c:378
msgid " y change number of physical cylinders"
msgstr " y změní počet fyzických cylindrů"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:382
msgid " b move beginning of data in a partition"
msgstr " b posune počátek dat v diskovém oddílu"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:385
msgid " e list extended partitions"
msgstr " e vypíąe roząířené diskové oddíly"
#. !sun
-#: fdisk/fdisk.c:394
+#: fdisk/fdisk.c:386
msgid " g create an IRIX partition table"
msgstr " g vytvoří IRIX tabulku rozdělení disku"
-#: fdisk/fdisk.c:490
+#: fdisk/fdisk.c:482
msgid "You must set"
msgstr "Musíte nastavit"
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:496
msgid "heads"
msgstr "hlavy"
-#: fdisk/fdisk.c:506 fdisk/fdisk.c:914 fdisk/sfdisk.c:843
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
msgid "sectors"
msgstr "sektory"
-#: fdisk/fdisk.c:508 fdisk/fdisk.c:914 fdisk/fdiskbsdlabel.c:441
-#: fdisk/sfdisk.c:843
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:442
+#: fdisk/sfdisk.c:842
msgid "cylinders"
msgstr "cylindry"
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:504
#, c-format
msgid ""
"%s%s.\n"
@@ -2195,30 +2356,30 @@ msgstr ""
"%s%s.\n"
"Můľete tak učinit z nabídky roząiřujících funkcí.\n"
-#: fdisk/fdisk.c:513
+#: fdisk/fdisk.c:505
msgid " and "
msgstr " a "
-#: fdisk/fdisk.c:547
+#: fdisk/fdisk.c:539
msgid "Bad offset in primary extended partition\n"
msgstr "Chybný posun v primárním diskovém oddílu\n"
-#: fdisk/fdisk.c:554
+#: fdisk/fdisk.c:546
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Varování: maľu diskový oddíl za %d\n"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:567
#, 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:583
+#: fdisk/fdisk.c:575
#, 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:609
+#: fdisk/fdisk.c:601
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"
@@ -2231,16 +2392,16 @@ msgstr ""
"data\n"
"pochopitelně dostupná.\n"
-#: fdisk/fdisk.c:645
+#: fdisk/fdisk.c:637
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:654
+#: fdisk/fdisk.c:646
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
-#: fdisk/fdisk.c:702
+#: fdisk/fdisk.c:694
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
@@ -2249,16 +2410,16 @@ msgstr ""
"popis\n"
"disku\n"
-#: fdisk/fdisk.c:718
+#: fdisk/fdisk.c:710
msgid "Internal error\n"
msgstr "Vnitřní chyba\n"
-#: fdisk/fdisk.c:728
+#: fdisk/fdisk.c:720
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Nadbytečný roząířený diskový oddíl %d ignorován.\n"
-#: fdisk/fdisk.c:735
+#: fdisk/fdisk.c:727
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2267,7 +2428,7 @@ msgstr ""
"Varování: chybný příznak 0x%04x tabulky rozdělení disku %d bude opraven "
"zápisem(w)\n"
-#: fdisk/fdisk.c:756
+#: fdisk/fdisk.c:748
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2275,65 +2436,65 @@ msgstr ""
"\n"
"třikrát jsem nalezl EOF - končím..\n"
-#: fdisk/fdisk.c:793
+#: fdisk/fdisk.c:785
msgid "Hex code (type L to list codes): "
msgstr "©estnáctkově (L vypíąe kódy):"
-#: fdisk/fdisk.c:832
+#: fdisk/fdisk.c:824
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, implicitně %d): "
-#: fdisk/fdisk.c:886
+#: fdisk/fdisk.c:878
#, c-format
msgid "Using default value %d\n"
msgstr "Pouľívám implicitní hodnotu %d\n"
-#: fdisk/fdisk.c:890
+#: fdisk/fdisk.c:882
msgid "Value out of range.\n"
msgstr "Hodnota je mimo meze.\n"
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:889
msgid "Partition number"
msgstr "Číslo diskového oddílu"
-#: fdisk/fdisk.c:905
+#: fdisk/fdisk.c:897
#, 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:912
+#: fdisk/fdisk.c:904
msgid "cylinder"
msgstr "cylindr"
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:904
msgid "sector"
msgstr "sektor"
-#: fdisk/fdisk.c:921
+#: fdisk/fdisk.c:913
#, 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:931
+#: fdisk/fdisk.c:923
#, 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:944
+#: fdisk/fdisk.c:936
msgid "DOS Compatibility flag is set\n"
msgstr "Příznak DOSOVÉ kompatibility je nastaven.\n"
-#: fdisk/fdisk.c:948
+#: fdisk/fdisk.c:940
msgid "DOS Compatibility flag is not set\n"
msgstr "Příznak DOSOVÉ kompatibility není nastaven.\n"
-#: fdisk/fdisk.c:1034
+#: fdisk/fdisk.c:1026
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Diskový oddíl %d zatím neexistuje!\n"
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1031
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2344,7 +2505,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:1048
+#: fdisk/fdisk.c:1040
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2352,7 +2513,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:1057
+#: fdisk/fdisk.c:1049
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2362,7 +2523,7 @@ msgstr ""
"nebo» SunOS/Solaris to očekává a i Linux tomu dává přednost.\n"
"\n"
-#: fdisk/fdisk.c:1063
+#: fdisk/fdisk.c:1055
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2373,53 +2534,53 @@ msgstr ""
"a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to očekává.\n"
"\n"
-#: fdisk/fdisk.c:1077
+#: fdisk/fdisk.c:1069
#, 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:1130
+#: fdisk/fdisk.c:1122
#, 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:1132 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149 fdisk/fdisk.c:1158
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fyz=(%d, %d, %d) "
-#: fdisk/fdisk.c:1133 fdisk/fdisk.c:1141
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logický=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1130
#, 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:1147
+#: fdisk/fdisk.c:1139
#, 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:1150
+#: fdisk/fdisk.c:1142
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "mělo by být (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1156
+#: fdisk/fdisk.c:1148
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Diskový oddíl %i nekončí na hranici cylindru:\n"
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1151
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "mělo by být (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1166
+#: fdisk/fdisk.c:1158
#, c-format
msgid ""
"\n"
@@ -2429,20 +2590,20 @@ msgid ""
msgstr ""
"\n"
"Disk %s: hlav: %d, sektorů: %d, cylindrů: %d\n"
-"Jednotky = %sy po %d * %d bajtech\n"
+"Jednotky = %s po %d * %d bajtech\n"
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1203
+#: fdisk/fdisk.c:1195
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
-msgstr "%*s Boot Začátek Konec Bloky Id Systém\n"
+msgstr "%*s Boot Začátek Konec Bloky Id Systém\n"
-#: fdisk/fdisk.c:1204 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr "Zařízení"
-#: fdisk/fdisk.c:1244
+#: fdisk/fdisk.c:1236
#, c-format
msgid ""
"\n"
@@ -2453,106 +2614,106 @@ msgstr ""
"Disk %s: hlav: %d, sektorů: %d, cylindrů: %d\n"
"\n"
-#: fdisk/fdisk.c:1246
+#: fdisk/fdisk.c:1238
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
-msgstr "Č AF Hd Sek Cyl Hd Sek Cyl Start Vel ID\n"
+msgstr "Č AF Hd Sek Cyl Hd Sek Cyl Start Vel ID\n"
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1277
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
-#: fdisk/fdisk.c:1288
+#: fdisk/fdisk.c:1280
#, 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:1291
+#: fdisk/fdisk.c:1283
#, 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:1294
+#: fdisk/fdisk.c:1286
#, 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:1298
+#: fdisk/fdisk.c:1290
#, 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:1328
+#: fdisk/fdisk.c:1320
#, 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:1336
+#: fdisk/fdisk.c:1328
#, 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:1354
+#: fdisk/fdisk.c:1346
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Varování: diskový oddíl %d je prázdný.\n"
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1351
#, 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:1365
+#: fdisk/fdisk.c:1357
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "Celkový počet alokovaných sektorů (%d) je větąí neľ maximum (%d).\n"
-#: fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1360
#, c-format
msgid "%d unallocated sectors\n"
msgstr "nealokovaných sektorů: %d\n"
-#: fdisk/fdisk.c:1380 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, 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:1401 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr "První %s"
-#: fdisk/fdisk.c:1416 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor %d je jiľ alokován\n"
-#: fdisk/fdisk.c:1448
+#: fdisk/fdisk.c:1440
msgid "No free sectors available\n"
msgstr "Nejsou ľádné volné sektory.\n"
-#: fdisk/fdisk.c:1458 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Poslední %s či +velikost či +velikostM či velikostK"
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1480
#, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
msgstr "Varování: diskový oddíl %d má lichý počet sektorů.\n"
-#: fdisk/fdisk.c:1525 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:591
msgid "The maximum number of partitions has been created\n"
msgstr "Jiľ bylo vytvořeno maximální mnoľství diskových oddílů.\n"
-#: fdisk/fdisk.c:1535
+#: fdisk/fdisk.c:1527
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:1539
+#: fdisk/fdisk.c:1531
#, c-format
msgid ""
"Command action\n"
@@ -2563,34 +2724,30 @@ msgstr ""
" %s\n"
" p primární diskový oddíl (1-4)\n"
-#: fdisk/fdisk.c:1541
+#: fdisk/fdisk.c:1533
msgid "l logical (5 or over)"
msgstr "l logický (5 a více)"
-#: fdisk/fdisk.c:1541
+#: fdisk/fdisk.c:1533
msgid "e extended"
msgstr "e roząířený"
-#: fdisk/fdisk.c:1558
+#: fdisk/fdisk.c:1550
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Chybné číslo diskového oddílu pro typ `%c'.\n"
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1582
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr "Tabulka rozdělení disku byla změněna!\n"
-#: fdisk/fdisk.c:1592
+#: fdisk/fdisk.c:1591
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Volám ioctl() pro znovunačtení tabulky rozdělení disku.\n"
-#: fdisk/fdisk.c:1609
-msgid "Syncing disks.\n"
-msgstr "Synchronizují se disky.\n"
-
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1607
#, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
@@ -2599,7 +2756,7 @@ msgstr ""
"Opětovné načtení tabulky rozdělení disku skončilo s chybou %d: %s.\n"
"Restartujte systém, aby tabulka byla změněna.\n"
-#: fdisk/fdisk.c:1620
+#: fdisk/fdisk.c:1613
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2611,6 +2768,10 @@ 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:1620
+msgid "Syncing disks.\n"
+msgstr "Synchronizují se disky.\n"
+
#: fdisk/fdisk.c:1651
#, c-format
msgid "Device: %s\n"
@@ -2918,98 +3079,98 @@ msgstr "Ukládám tabulku rozdělení disku na %s%d.\n"
msgid "Writing disklabel to %s.\n"
msgstr "Ukládám tabulku rozdělení disku na %s.\n"
-#: fdisk/fdiskbsdlabel.c:392
+#: fdisk/fdiskbsdlabel.c:393
#, c-format
msgid "%s%d contains no disklabel.\n"
msgstr "Na %s%d se nenachází ľádná tabulka rozdělení disku.\n"
-#: fdisk/fdiskbsdlabel.c:395
+#: fdisk/fdiskbsdlabel.c:396
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "Na %s se nenachází ľádná tabulka rozdělení disku.\n"
-#: fdisk/fdiskbsdlabel.c:399
+#: fdisk/fdiskbsdlabel.c:400
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Chcete vytvořit tabulku rozdělení disku? (y/n)"
-#: fdisk/fdiskbsdlabel.c:438
+#: fdisk/fdiskbsdlabel.c:439
msgid "bytes/sector"
msgstr "bajtů/sektor"
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:440
msgid "sectors/track"
msgstr "sektorů/stopu"
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:441
msgid "tracks/cylinder"
msgstr "stop/cylindr"
-#: fdisk/fdiskbsdlabel.c:448
+#: fdisk/fdiskbsdlabel.c:449
msgid "sectors/cylinder"
msgstr "sektorů/cylindr"
-#: fdisk/fdiskbsdlabel.c:452
+#: fdisk/fdiskbsdlabel.c:453
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Musí být <= sektorů/stopu * stop/cylindr (implicitní).\n"
-#: fdisk/fdiskbsdlabel.c:454
+#: fdisk/fdiskbsdlabel.c:455
msgid "rpm"
msgstr "otm"
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:456
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:457
msgid "trackskew"
msgstr "zakřivení stopy"
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:458
msgid "cylinderskew"
msgstr "zakřivení cylindru"
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:459
msgid "headswitch"
msgstr "přesun hlavy"
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:460
msgid "track-to-track seek"
msgstr "posun stopa-stopa"
-#: fdisk/fdiskbsdlabel.c:500
+#: fdisk/fdiskbsdlabel.c:501
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Zavaděč: %sstart -> start%s (%s): "
-#: fdisk/fdiskbsdlabel.c:526
+#: fdisk/fdiskbsdlabel.c:527
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Zavaděč přesahuje do tabulky rozdělení disku!\n"
-#: fdisk/fdiskbsdlabel.c:547
+#: fdisk/fdiskbsdlabel.c:548
#, c-format
msgid "Bootstrap installed on %s%d.\n"
msgstr "Zavaděč instalován na %s%d.\n"
-#: fdisk/fdiskbsdlabel.c:549
+#: fdisk/fdiskbsdlabel.c:550
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Zavaděč instalován na %s.\n"
-#: fdisk/fdiskbsdlabel.c:570
+#: fdisk/fdiskbsdlabel.c:571
#, c-format
msgid "Partition (a-%c): "
msgstr "Diskový oddíl (a-%c): "
-#: fdisk/fdiskbsdlabel.c:601
+#: fdisk/fdiskbsdlabel.c:602
msgid "This partition already exists.\n"
msgstr "Tento diskový oddíl jiľ existuje.\n"
-#: fdisk/fdiskbsdlabel.c:723
+#: fdisk/fdiskbsdlabel.c:724
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Varování: přílią mnoho diskových oddílů (%d, maximum %d).\n"
-#: fdisk/fdiskbsdlabel.c:769
+#: fdisk/fdiskbsdlabel.c:770
msgid ""
"\n"
"Syncing disks.\n"
@@ -3106,7 +3267,7 @@ msgstr ""
"cylindrů: %d, fyzických cylindrů: %d\n"
"extra sektorů/cyl: %d, interleave: %d:1\n"
"%s\n"
-"Jednotky = %sy po %d * 512 bajtech\n"
+"Jednotky = %s po %d * 512 bajtech\n"
"\n"
#: fdisk/fdisksgilabel.c:199
@@ -3119,7 +3280,7 @@ msgid ""
msgstr ""
"\n"
"Disk %s (SGI tabulka rozdělení disku): hlav: %d, sektorů: %d, cylindrů: %d\n"
-"Jednotky = %sy po %d * 512 bajtech\n"
+"Jednotky = %s po %d * 512 bajtech\n"
"\n"
#: fdisk/fdisksgilabel.c:205
@@ -3544,7 +3705,7 @@ msgstr ""
"cylindrů: %d, alternativních cylindrů: %d, fyzických cylindrů: %d\n"
"extra sektorů/cyl: %d, interleave: %d:1\n"
"%s\n"
-"Jednotky = %sy po %d * 512 bajtech\n"
+"Jednotky = %s po %d * 512 bajtech\n"
"\n"
#: fdisk/fdisksunlabel.c:625
@@ -3557,7 +3718,7 @@ msgid ""
msgstr ""
"\n"
"Disk %s (Sun tabulka rozdělení disku): hlav: %d, sektorů: %d, cylindrů: %d\n"
-"Jednotky = %sy po %d * 512 bajtech\n"
+"Jednotky = %s po %d * 512 bajtech\n"
"\n"
#: fdisk/fdisksunlabel.c:630
@@ -3879,80 +4040,80 @@ msgstr "LANstep"
msgid "BBT"
msgstr "BBT"
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, 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:153
+#: fdisk/sfdisk.c:152
#, 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:199
+#: fdisk/sfdisk.c:198
msgid "out of memory - giving up\n"
msgstr "nedostatek paměti - končím\n"
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, 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:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr "CHYBA: sektor %lu nemá msdos podpis\n"
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, 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:274
+#: fdisk/sfdisk.c:273
#, 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:292
+#: fdisk/sfdisk.c:291
#, c-format
msgid "write error on %s\n"
msgstr "chyba zápisu na %s\n"
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, 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:315
+#: fdisk/sfdisk.c:314
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:319
+#: fdisk/sfdisk.c:318
msgid "out of memory?\n"
msgstr "nedostatek paměti?\n"
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, 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:331
+#: fdisk/sfdisk.c:330
#, c-format
msgid "error reading %s\n"
msgstr "chyba při čtení %s\n"
-#: fdisk/sfdisk.c:338
+#: fdisk/sfdisk.c:337
#, c-format
msgid "cannot open device %s for writing\n"
msgstr "zařízení %s nelze otevřít pro zápis\n"
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
msgstr "chyba při zápisu sektoru %lu na %s\n"
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3963,27 +4124,27 @@ 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:422
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr "Varování: dle HDIO_GETGEO je počet hlav %d\n"
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr "Varování: dle HDIO_GETGEO je počet sektorů %d\n"
-#: fdisk/sfdisk.c:428
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr "Varování: dle HDIO_GETGEO je počet cylindrů %d\n"
-#: fdisk/sfdisk.c:432
+#: fdisk/sfdisk.c:431
#, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr "Disk %s: geometrii nelze zjistit\n"
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -3992,7 +4153,7 @@ msgstr ""
"Varování: podivný počet sektorů (%d) - 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:438
+#: fdisk/sfdisk.c:437
#, c-format
msgid ""
"\n"
@@ -4001,20 +4162,20 @@ msgstr ""
"\n"
"Disk %s: cylindrů: %lu, hlav: %lu, sektorů/stopu: %lu\n"
-#: fdisk/sfdisk.c:518
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr "%s diskového oddílu %s má chybný počet hlav: %d (mělo by být 0-%d)\n"
-#: fdisk/sfdisk.c:523
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
"%s diskového oddílu %s má chybný počet sektorů: %d (mělo by být 1-%d)\n"
-#: fdisk/sfdisk.c:528
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4022,17 +4183,17 @@ msgid ""
msgstr ""
"%s diskového oddílu %s má chybný počet cylindrů: %d (mělo by být 0-%d)\n"
-#: fdisk/sfdisk.c:567
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
msgstr "Id Jméno\n"
-#: fdisk/sfdisk.c:720
+#: fdisk/sfdisk.c:719
msgid "Re-reading the partition table ...\n"
msgstr "Načítám znovu tabulku rozdělení disku ...\n"
-#: fdisk/sfdisk.c:726
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
@@ -4040,39 +4201,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:731
+#: fdisk/sfdisk.c:730
#, c-format
msgid "Error closing %s\n"
msgstr "Chyba při zavírání %s\n"
-#: fdisk/sfdisk.c:769
+#: fdisk/sfdisk.c:768
#, c-format
msgid "%s: no such partition\n"
msgstr "diskový oddíl %s neexistuje\n"
-#: fdisk/sfdisk.c:792
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr "Neznámý formát - pouľívám sektory\n"
-#: fdisk/sfdisk.c:831
+#: fdisk/sfdisk.c:830
#, c-format
msgid "# partition table of %s\n"
msgstr "# tabulka rozdělení disku pro %s\n"
-#: fdisk/sfdisk.c:832
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-"jednotky: sektory\n"
-"\n"
-
-#: fdisk/sfdisk.c:842
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr "nepouľívaný formát - pouľívám %s\n"
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4081,11 +4234,11 @@ msgstr ""
"Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, počítáno od %d\n"
"\n"
-#: fdisk/sfdisk.c:849
+#: fdisk/sfdisk.c:848
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:854
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
@@ -4094,11 +4247,11 @@ msgstr ""
"Jednotky = sektory po 512 bajtech, počítáno od %d\n"
"\n"
-#: fdisk/sfdisk.c:856
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr " Zaříz Boot Začátek Konec #sektory Id Systém\n"
-#: fdisk/sfdisk.c:859
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
@@ -4107,11 +4260,11 @@ msgstr ""
"Jednotky = bloky po 1024 bajtech, počítáno od %d\n"
"\n"
-#: fdisk/sfdisk.c:861
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr " Zaříz Boot Začátek Konec #bloky Id Systém\n"
-#: fdisk/sfdisk.c:864
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4121,40 +4274,21 @@ msgstr ""
"%d\n"
"\n"
-#: fdisk/sfdisk.c:866
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr " Zaříz Boot Začátek Konec MB #bloky Id Systém\n"
-#: fdisk/sfdisk.c:932
-#, c-format
-msgid " start=%9lu"
-msgstr " začátek=%9lu"
-
-#: fdisk/sfdisk.c:933
-#, c-format
-msgid ", size=%8lu"
-msgstr ", velikost=%lu"
-
-#: fdisk/sfdisk.c:935
-#, c-format
-msgid ", Id=%2x"
-msgstr ", Id=%2x"
-
-#: fdisk/sfdisk.c:937
-msgid ", bootable"
-msgstr ", startovací"
-
-#: fdisk/sfdisk.c:998
+#: fdisk/sfdisk.c:997
#, 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:1005
+#: fdisk/sfdisk.c:1004
#, 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:1008
+#: fdisk/sfdisk.c:1007
#, 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"
@@ -4163,7 +4297,7 @@ msgstr "diskový oddíl končí na cylindru %ld, t.j. za koncem disku\n"
msgid "No partitions found\n"
msgstr "Nebyly nalezeny ľádné diskové oddíly\n"
-#: fdisk/sfdisk.c:1021
+#: fdisk/sfdisk.c:1025
#, c-format
msgid ""
"Warning: The first partition looks like it was made\n"
@@ -4174,94 +4308,94 @@ msgstr ""
"pro C/H/S=*/%ld/%ld (místo %ld/%ld/%ld).\n"
"Zobrazuji za pouľití této geometrie.\n"
-#: fdisk/sfdisk.c:1068
+#: fdisk/sfdisk.c:1075
msgid "no partition table present.\n"
msgstr "Nebyla nalezena ľádná tabulka rozdělení disku.\n"
-#: fdisk/sfdisk.c:1070
+#: fdisk/sfdisk.c:1077
#, 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:1079
+#: fdisk/sfdisk.c:1086
#, 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:1082
+#: fdisk/sfdisk.c:1089
#, 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:1085
+#: fdisk/sfdisk.c:1092
#, 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:1096
+#: fdisk/sfdisk.c:1103
#, c-format
msgid "Warning: partition %s "
msgstr "Varování: diskový oddíl %s "
-#: fdisk/sfdisk.c:1097
+#: fdisk/sfdisk.c:1104
#, c-format
msgid "is not contained in partition %s\n"
msgstr "není obsaľen v diskovém oddílu %s.\n"
-#: fdisk/sfdisk.c:1108
+#: fdisk/sfdisk.c:1115
#, c-format
msgid "Warning: partitions %s "
msgstr "Varování: diskové oddíly %s "
-#: fdisk/sfdisk.c:1109
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr "a %s se navzájem překrývají.\n"
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1127
#, c-format
msgid "Warning: partition %s contains part of "
msgstr "Varování: diskový oddíl %s obsahuje část "
-#: fdisk/sfdisk.c:1121
+#: fdisk/sfdisk.c:1128
#, c-format
msgid "the partition table (sector %lu),\n"
msgstr "tabulky rozdělení disku (sektor %lu)\n"
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr "a zničí ji, pokud bude obsazen\n"
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1138
#, 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:1135
+#: fdisk/sfdisk.c:1142
#, 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:1149
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr "Pouze jeden z diskových oddílů můľe být roząířeným.\n"
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr " (ačkoliv pod Linuxem to nepředstavuje problém)\n"
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1174
#, 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:1173
+#: fdisk/sfdisk.c:1180
#, 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:1191
+#: fdisk/sfdisk.c:1198
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"
@@ -4269,7 +4403,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:1198
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
@@ -4277,7 +4411,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:1204
+#: fdisk/sfdisk.c:1211
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"
@@ -4285,7 +4419,7 @@ 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:1221
+#: fdisk/sfdisk.c:1228
#, c-format
msgid ""
"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4293,144 +4427,144 @@ msgstr ""
"diskový oddíl %s: začátek: (c,h,s) předpoklad (%ld,%ld,%ld), nalezeno\n"
"(%ld,%ld,%ld)\n"
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1237
#, 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:1233
+#: fdisk/sfdisk.c:1240
#, 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:1266 fdisk/sfdisk.c:1343
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, 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:1281
+#: fdisk/sfdisk.c:1288
msgid "tree of partitions?\n"
msgstr "strom diskových oddílů?\n"
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr "nalezen Disk Manager - s tím neumím pracovat\n"
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr "nalezen DM6 podpis - končím\n"
-#: fdisk/sfdisk.c:1412
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr "zvláątní..., roząířený diskový oddíl o velikosti 0?\n"
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr "zvláątní..., BSD diskový oddíl o velikosti 0?\n"
-#: fdisk/sfdisk.c:1451
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr " diskový oddíl %s není znám\n"
-#: fdisk/sfdisk.c:1463
+#: fdisk/sfdisk.c:1470
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:1476
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr "Chyba při ukládání starých sektorů - končím\n"
-#: fdisk/sfdisk.c:1481
+#: fdisk/sfdisk.c:1488
#, 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:1558
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr "přílią dlouhý či neúplný řádek - končím\n"
-#: fdisk/sfdisk.c:1594
+#: fdisk/sfdisk.c:1601
#, 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:1601
+#: fdisk/sfdisk.c:1608
#, 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:1607
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr "nerozpoznaný vstup: %s\n"
-#: fdisk/sfdisk.c:1639
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr "číslo je přílią veliké\n"
-#: fdisk/sfdisk.c:1643
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr "nesmysly za číslem\n"
-#: fdisk/sfdisk.c:1759
+#: fdisk/sfdisk.c:1766
msgid "no room for partition descriptor\n"
msgstr "není místo pro popis diskového oddílu\n"
-#: fdisk/sfdisk.c:1792
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr "okolní roząiřující diskový oddíl nelze vytvořit\n"
-#: fdisk/sfdisk.c:1843
+#: fdisk/sfdisk.c:1850
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:1877
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr "Jiľ nejsou volné bloky\n"
-#: fdisk/sfdisk.c:1896
+#: fdisk/sfdisk.c:1903
msgid "Illegal type\n"
msgstr "Chybný typ\n"
-#: fdisk/sfdisk.c:1928
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr "Varování: překročení maximální povolené velikosti (%lu)\n"
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1940
msgid "Warning: empty partition\n"
msgstr "Varování: prázdný diskový oddíl\n"
-#: fdisk/sfdisk.c:1947
+#: fdisk/sfdisk.c:1954
#, 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:1960
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr "nerozpoznaný příznak 'startovací' - zvolte - či *\n"
-#: fdisk/sfdisk.c:1977 fdisk/sfdisk.c:1990
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr "neúplná c,h,s specifikace?\n"
-#: fdisk/sfdisk.c:2001
+#: fdisk/sfdisk.c:2008
msgid "Extended partition not where expected\n"
msgstr "Roząířený diskový oddíl na neočekávaném místě\n"
-#: fdisk/sfdisk.c:2033
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr "chybný vstup\n"
-#: fdisk/sfdisk.c:2055
+#: fdisk/sfdisk.c:2062
msgid "too many partitions\n"
msgstr "přílią mnoho diskových oddílů\n"
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2095
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"
@@ -4442,100 +4576,100 @@ 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:2108
+#: fdisk/sfdisk.c:2115
msgid "version"
msgstr "verze"
-#: fdisk/sfdisk.c:2114
+#: fdisk/sfdisk.c:2121
#, c-format
msgid "Usage: %s [options] device ...\n"
msgstr "Pouľití: %s [přepínače] zařízení ...\n"
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr "zařízení: něco jako /dev/hda či /dev/sda"
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr "uľitečné přepínače:"
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2124
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:2118
+#: fdisk/sfdisk.c:2125
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:2119
+#: fdisk/sfdisk.c:2126
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:2120
+#: fdisk/sfdisk.c:2127
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:2121
+#: fdisk/sfdisk.c:2128
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:2122
+#: fdisk/sfdisk.c:2129
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:2123
+#: fdisk/sfdisk.c:2130
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:2124
+#: fdisk/sfdisk.c:2131
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:2125
+#: fdisk/sfdisk.c:2132
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:2126
+#: fdisk/sfdisk.c:2133
msgid " -N# : change only the partition with number #"
msgstr " -N# : změní pouze diskový oddíl s číslem #"
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2134
msgid " -n : do not actually write to disk"
msgstr " -n : ľádné změny nebudou uloľeny na disk"
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2135
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:2129
+#: fdisk/sfdisk.c:2136
msgid " -I file : restore these sectors again"
msgstr " -I SOUBOR : obnoví tyto sektory ze SOUBORU"
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr " -v [či --version]: vypíąe informace o verzi"
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2138
msgid " -? [or --help]: print this message"
msgstr " -? [či --help]: vypíąe tuto nápovědu"
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr "nebezpečné přepínače:"
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2140
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:2134
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
@@ -4543,124 +4677,124 @@ 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:2136
+#: fdisk/sfdisk.c:2143
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:2137
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr " -q [či --quiet]: nebude vypisovat varovné hláąky"
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr " Nalezenou geometrii můľete přepsat pomocí:"
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2146
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr " -C# [či --cylinders #]:nastaví počet cylindrů"
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr " -H# [či --heads #]: nastaví počet hlav"
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr " -S# [či --sectors #]: nastaví počet cylindrů"
-#: fdisk/sfdisk.c:2142
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr "Ověřování konzistence můľete vypnout pomocí:"
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2150
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:2149
+#: fdisk/sfdisk.c:2156
msgid "Usage:"
msgstr "Pouľití:"
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2157
#, 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:2151
+#: fdisk/sfdisk.c:2158
#, 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:2152
+#: fdisk/sfdisk.c:2159
#, 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:2271
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr "ľádný příkaz?\n"
-#: fdisk/sfdisk.c:2394
+#: fdisk/sfdisk.c:2401
#, c-format
msgid "total: %d blocks\n"
msgstr "celkový počet bloků: %d\n"
-#: fdisk/sfdisk.c:2431
+#: fdisk/sfdisk.c:2438
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:2433
+#: fdisk/sfdisk.c:2440
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:2435
+#: fdisk/sfdisk.c:2442
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:2442
+#: fdisk/sfdisk.c:2449
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:2467
+#: fdisk/sfdisk.c:2474
#, c-format
msgid "cannot open %s %s\n"
msgstr "%s %s nelze otevřít\n"
-#: fdisk/sfdisk.c:2467
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr "pro čtení/zápis"
-#: fdisk/sfdisk.c:2467
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr "pro čtení"
-#: fdisk/sfdisk.c:2492
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr "%s: OK\n"
-#: fdisk/sfdisk.c:2509
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr "%s: %d cylindrů, %d hlav, %d sektorů/stopu\n"
-#: fdisk/sfdisk.c:2512
+#: fdisk/sfdisk.c:2519
#, c-format
msgid "%s: unknown geometry\n"
msgstr "%s: neznámá geometrie\n"
-#: fdisk/sfdisk.c:2528
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
-#: fdisk/sfdisk.c:2605
+#: fdisk/sfdisk.c:2612
#, 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:2622 fdisk/sfdisk.c:2675 fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
msgid ""
"Done\n"
"\n"
@@ -4668,7 +4802,7 @@ msgstr ""
"Hotovo\n"
"\n"
-#: fdisk/sfdisk.c:2631
+#: fdisk/sfdisk.c:2638
#, c-format
msgid ""
"You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4678,35 +4812,35 @@ msgstr ""
"MBR\n"
"nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
-#: fdisk/sfdisk.c:2645
+#: fdisk/sfdisk.c:2652
#, 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:2701
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr "Id %x je chybné\n"
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2723
msgid "This disk is currently in use.\n"
msgstr "Tento disk je právě pouľíván.\n"
-#: fdisk/sfdisk.c:2733
+#: fdisk/sfdisk.c:2740
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr "Fatální chyba: %s nelze nalézt\n"
-#: fdisk/sfdisk.c:2736
+#: fdisk/sfdisk.c:2743
#, 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:2742
+#: fdisk/sfdisk.c:2749
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:2744
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -4719,28 +4853,28 @@ msgstr ""
"vąechny odkládací prostory na tomto disku. K potlačení této kontroly můľete "
"pouľít přepínač --no-reread.\n"
-#: fdisk/sfdisk.c:2748
+#: fdisk/sfdisk.c:2755
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:2752
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr "OK"
-#: fdisk/sfdisk.c:2761
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr "Stará situace:\n"
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2772
#, 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:2773
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr "Nová situace:\n"
-#: fdisk/sfdisk.c:2778
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
@@ -4748,19 +4882,19 @@ 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:2781
+#: fdisk/sfdisk.c:2788
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:2786
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr "Vyhovuje Vám to? [ynq] "
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr "Uloľit na disk? [ynq] "
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
@@ -4768,15 +4902,15 @@ msgstr ""
"\n"
"sfdisk: předčasný konec vstupu\n"
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2802
msgid "Quitting - nothing changed\n"
msgstr "Končím - nebyly učiněny ľádné změny\n"
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2808
msgid "Please answer one of y,n,q\n"
msgstr "Odpovězte prosím y,n či q\n"
-#: fdisk/sfdisk.c:2809
+#: fdisk/sfdisk.c:2816
msgid ""
"Successfully wrote the new partition table\n"
"\n"
@@ -4784,7 +4918,7 @@ msgstr ""
"Nová tabulka rozdělení disku byla úspěąně uloľena.\n"
"\n"
-#: fdisk/sfdisk.c:2815
+#: fdisk/sfdisk.c:2822
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"
@@ -4899,157 +5033,155 @@ msgstr "getopt (roząířené) 1.0.3\n"
msgid "internal error, contact the author."
msgstr "Vnitřní chyba, oznamte ji autorovi."
-#: login-utils/agetty.c:303
+#: login-utils/agetty.c:306
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:316
+#: login-utils/agetty.c:319
msgid "calling termio_init\n"
msgstr "volám termio_init\n"
-#: login-utils/agetty.c:321
+#: login-utils/agetty.c:324
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:331
+#: login-utils/agetty.c:334
msgid "before autobaud\n"
msgstr "před autobaud\n"
-#: login-utils/agetty.c:343
+#: login-utils/agetty.c:346
msgid "waiting for cr-lf\n"
msgstr "čekám na cr-lf\n"
-#: login-utils/agetty.c:347
+#: login-utils/agetty.c:350
#, c-format
msgid "read %c\n"
msgstr "přečteno %c\n"
#. Read the login name.
-#: login-utils/agetty.c:356
+#: login-utils/agetty.c:359
msgid "reading login name\n"
msgstr "čtu přihlaąovací jméno\n"
-#: login-utils/agetty.c:377
+#: login-utils/agetty.c:380
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s: %s nelze spustit: %m"
-#: login-utils/agetty.c:397
+#: login-utils/agetty.c:400
msgid "can't malloc initstring"
msgstr "pamě» pro inicializační řetězec nelze alokovat"
-#: login-utils/agetty.c:459
+#: login-utils/agetty.c:465
#, c-format
msgid "bad timeout value: %s"
msgstr "chybný časový limit: %s"
-#: login-utils/agetty.c:468
+#: login-utils/agetty.c:474
msgid "after getopt loop\n"
msgstr "po zpracování argumentů příkazové řádky\n"
-#: login-utils/agetty.c:486
+#: login-utils/agetty.c:492
msgid "exiting parseargs\n"
msgstr "opouątím funkci parseargs\n"
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:505
msgid "entered parse_speeds\n"
msgstr "vstupuji do funkce parse_speeds\n"
-#: login-utils/agetty.c:502
+#: login-utils/agetty.c:508
#, c-format
msgid "bad speed: %s"
msgstr "chybná rychlost %s"
-#: login-utils/agetty.c:504
+#: login-utils/agetty.c:510
msgid "too many alternate speeds"
msgstr "přílią mnoho alternativních rychlostí"
-#: login-utils/agetty.c:506
+#: login-utils/agetty.c:512
msgid "exiting parsespeeds\n"
msgstr "opouątím funkci parsespeeds\n"
-#: login-utils/agetty.c:579
+#: login-utils/agetty.c:587
#, c-format
msgid "%s: open for update: %m"
msgstr "%s: otevření za účelem aktualizace: %m"
-#: login-utils/agetty.c:595
+#: login-utils/agetty.c:605
#, c-format
msgid "%s: no utmp entry"
msgstr "ľádná utmp poloľka pro %s"
-#: login-utils/agetty.c:624
+#: login-utils/agetty.c:634
#, c-format
msgid "/dev: chdir() failed: %m"
msgstr "/dev: volání chdir() selhalo: %m"
-#: login-utils/agetty.c:628
+#: login-utils/agetty.c:638
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s není znakovým zařízením"
#. ignore close(2) errors
-#: login-utils/agetty.c:635
+#: login-utils/agetty.c:645
msgid "open(2)\n"
msgstr "open(2)\n"
-#: login-utils/agetty.c:637
+#: login-utils/agetty.c:647
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s nelze otevřít jako standardní vstup: %m"
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:657
#, c-format
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:651
+#: login-utils/agetty.c:661
msgid "duping\n"
msgstr "volám dup\n"
#. set up stdout and stderr
-#: login-utils/agetty.c:653
+#: login-utils/agetty.c:663
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s: volání dup selhalo: %m"
-#: login-utils/agetty.c:723
+#: login-utils/agetty.c:733
msgid "term_io 2\n"
msgstr "term_io 2\n"
-#: login-utils/agetty.c:905
+#: login-utils/agetty.c:915
msgid "user"
msgstr "uľivatel"
-#: login-utils/agetty.c:905
+#: login-utils/agetty.c:915
msgid "users"
msgstr "uľivatelé"
-#: login-utils/agetty.c:993
+#: login-utils/agetty.c:1003
#, c-format
msgid "%s: read: %m"
msgstr "%s: přečteno: %m"
-#: login-utils/agetty.c:1039
+#: login-utils/agetty.c:1049
#, c-format
msgid "%s: input overrun"
msgstr "%s: přetečení vstupu"
-#: login-utils/agetty.c:1163
+#: login-utils/agetty.c:1173
#, c-format
msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
-"baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] 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 ""
-"Pouľití: %s [-hiLmw] [-l login_program] [-t časový limit] [-I inicializační "
-"řetězec] baud_rate,... linka [typ terminálu]\n"
-"či\t[-hiLmw] [-l login_program] [-t časový limit] [-I inicializační řetězec] "
-"linka baud_rate,... [typ terminálu]\n"
+"Pouľití: %s [-hiLmw] [-l login_program] [-t časový limit] [-I inicializační řetězec] [-H počítač] baud_rate,... linka [typ terminálu]\n"
+"č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:46
#, c-format
@@ -5089,52 +5221,52 @@ msgstr "Přihláąení z %2$s na tty %1$s implicitně odmítnuto.\n"
msgid "Login on %s from %s denied.\n"
msgstr "Přihláąení z $2%s na $1%s odmítnuto.\n"
-#: login-utils/chfn.c:139 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
msgstr "%s: vy (uľivatel %d) neexistujete.\n"
-#: login-utils/chfn.c:146 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
msgstr "%s: uľivatel \"%s\" neexistuje.\n"
-#: login-utils/chfn.c:151 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr "%s: můľe měnit pouze místní poloľky; pouľijte yp%s.\n"
-#: login-utils/chfn.c:163
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "Měním finger informace o %s.\n"
-#: login-utils/chfn.c:169 login-utils/chfn.c:173 login-utils/chfn.c:180
-#: login-utils/chfn.c:184 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
msgstr "Chybné heslo."
-#: login-utils/chfn.c:193 login-utils/chsh.c:178 login-utils/login.c:689
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:684
#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
+#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
msgid "Password: "
msgstr "Heslo: "
-#: login-utils/chfn.c:196 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
msgstr "Chybné heslo."
-#: login-utils/chfn.c:207
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
msgstr "Finger informace nebyly změněny.\n"
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
msgstr "Pouľití: %s [ -f plné-jméno ] [ -o kancelář ] "
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
@@ -5142,11 +5274,11 @@ msgstr ""
"[ -p telefon-do-kanceláře ]\n"
"\t[ -h telefon-domů ] "
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
msgstr "[ --help ] [ -- version ]\n"
-#: login-utils/chfn.c:381 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
@@ -5154,28 +5286,28 @@ msgstr ""
"\n"
"Ukončen.\n"
-#: login-utils/chfn.c:414
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
msgstr "Poloľka je přílią dlouhá.\n"
-#: login-utils/chfn.c:428
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
msgstr "'%c' není povoleno.\n"
-#: login-utils/chfn.c:433
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
msgstr "Kontrolní znaky nejsou povoleny.\n"
-#: login-utils/chfn.c:498
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "Finger informace *NEBYLY* změněny. Zkuste to opět později.\n"
-#: login-utils/chfn.c:501
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
msgstr "Finger informace byly změněny.\n"
-#: login-utils/chfn.c:515 login-utils/chsh.c:412 sys-utils/cytune.c:324
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
msgid "malloc failed"
msgstr "volání malloc selhalo"
@@ -5341,30 +5473,37 @@ msgstr ""
"\n"
"přeruąen %10.10s %5.5s \n"
-#: login-utils/login.c:384
+#: login-utils/login.c:377
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:409
+#: login-utils/login.c:402
msgid "usage: login [-fp] [username]\n"
msgstr "Pouľití: login [fp] [uľivatelské jméno]\n"
-#: login-utils/login.c:511
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr "login: chyba PAM, končím: %s\n"
-#: login-utils/login.c:513
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "PAM nelze inicializovat: %s"
-#: login-utils/login.c:553
+#. 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:519
+msgid "login: "
+msgstr "Přihlaąovací jméno:"
+
+#: login-utils/login.c:552
#, 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:556
+#: login-utils/login.c:554
msgid ""
"Login incorrect\n"
"\n"
@@ -5372,17 +5511,17 @@ msgstr ""
"Chybné přihláąení\n"
"\n"
-#: login-utils/login.c:565
+#: login-utils/login.c:563
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "PŘÍLI|S MNOHO (%1$d) POKUSŮ U®IVATELE %3$s O PŘIHLÁ©ENÍ Z %2$s, %4$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:570
+#: login-utils/login.c:567
#, 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:575
+#: login-utils/login.c:570
msgid ""
"\n"
"Login incorrect\n"
@@ -5390,30 +5529,30 @@ msgstr ""
"\n"
"Chybné přihláąení\n"
-#: login-utils/login.c:624
+#: login-utils/login.c:619
msgid "Illegal username"
msgstr "Chybné uľivatelské jméno"
-#: login-utils/login.c:667
+#: login-utils/login.c:662
#, 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:672
+#: login-utils/login.c:667
#, 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:676
+#: login-utils/login.c:671
#, 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:728
+#: login-utils/login.c:723
msgid "Login incorrect\n"
msgstr "Chybné přihláąení\n"
-#: login-utils/login.c:750
+#: login-utils/login.c:745
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
@@ -5421,100 +5560,100 @@ msgstr ""
"Jiľ je přihláąeno přílią mnoho uľivatelů.\n"
"Zkuste to opět později.\n"
-#: login-utils/login.c:754
+#: login-utils/login.c:749
msgid "You have too many processes running.\n"
msgstr "Máte spuątěno přílią mnoho procesů.\n"
-#: login-utils/login.c:800
+#: login-utils/login.c:795
msgid "Warning: no Kerberos tickets issued\n"
msgstr "Varování: ľádné Kerberos lístky\n"
-#: login-utils/login.c:812
+#: login-utils/login.c:807
msgid "Sorry -- your password has expired.\n"
msgstr "Lituji -- platnost Vaąeho hesla vyprąela.\n"
-#: login-utils/login.c:818
+#: login-utils/login.c:813
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr "Varování: platnost Vaąeho hesla vyprąí %s %d, %d\n"
-#: login-utils/login.c:826
+#: login-utils/login.c:821
msgid "Sorry -- your account has expired.\n"
msgstr "Lituji -- platnost Vaąeho účtu vyprąela.\n"
-#: login-utils/login.c:832
+#: login-utils/login.c:827
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr "Varování: platnost Vaąeho účtu vyprąí %s %d, %d\n"
-#: login-utils/login.c:1066
+#: login-utils/login.c:1061
#, 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:1073
+#: login-utils/login.c:1068
#, 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:1076
+#: login-utils/login.c:1071
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "PŘIHLÁ©ENÍ U®IVATELE ROOT NA TTY %s"
-#: login-utils/login.c:1079
+#: login-utils/login.c:1074
#, 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:1082
+#: login-utils/login.c:1077
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "PŘIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
-#: login-utils/login.c:1093
+#: login-utils/login.c:1089
#, c-format
msgid "You have %smail.\n"
msgstr "Máte %spoątu.\n"
-#: login-utils/login.c:1094
+#: login-utils/login.c:1090
msgid "new "
msgstr "novou "
#. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1108
#, c-format
msgid "login: failure forking: %s"
msgstr "login: volání fork selhalo: %s"
-#: login-utils/login.c:1127
+#: login-utils/login.c:1123
msgid "setuid() failed"
msgstr "volání setuid() selhalo"
-#: login-utils/login.c:1133
+#: login-utils/login.c:1129
#, c-format
msgid "No directory %s!\n"
msgstr "Adresář %s neexistuje!\n"
-#: login-utils/login.c:1137
+#: login-utils/login.c:1133
msgid "Logging in with home = \"/\".\n"
msgstr "Přihlaąuji s domácím adresářem nastaveným na \"/\".\n"
-#: login-utils/login.c:1145
+#: login-utils/login.c:1141
msgid "login: no memory for shell script.\n"
msgstr "login: nedostatek paměti pro skript shellu.\n"
-#: login-utils/login.c:1173
+#: login-utils/login.c:1169
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr "login: skript shellu %s nelze spustit.\n"
-#: login-utils/login.c:1176
+#: login-utils/login.c:1172
#, c-format
msgid "login: no shell: %s.\n"
msgstr "login: ľádný shell: %s.\n"
-#: login-utils/login.c:1192
+#: login-utils/login.c:1188
#, c-format
msgid ""
"\n"
@@ -5523,62 +5662,62 @@ msgstr ""
"\n"
"Přihlaąovací jméno na %s: "
-#: login-utils/login.c:1203
+#: login-utils/login.c:1199
msgid "login name much too long.\n"
msgstr "přihlaąovací jméno je přílią dlouhé.\n"
-#: login-utils/login.c:1204
+#: login-utils/login.c:1200
msgid "NAME too long"
msgstr "JMÉNO je přílią dlouhé"
-#: login-utils/login.c:1211
+#: login-utils/login.c:1207
msgid "login names may not start with '-'.\n"
msgstr "přihlaąovací jméno nesmí začínat '-'.\n"
-#: login-utils/login.c:1221
+#: login-utils/login.c:1217
msgid "too many bare linefeeds.\n"
msgstr "přílią mnoho znaků LF\n"
-#: login-utils/login.c:1222
+#: login-utils/login.c:1218
msgid "EXCESSIVE linefeeds"
msgstr "PŘÍLI© mnoho znaků LF"
-#: login-utils/login.c:1233
+#: login-utils/login.c:1229
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr "Vyprąel časový limit (%d vteřin) pro přihláąení.\n"
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
#, c-format
msgid "Last login: %.*s "
msgstr "Poslední přihláąení: %.*s "
-#: login-utils/login.c:1337
+#: login-utils/login.c:1333
#, c-format
msgid "from %.*s\n"
msgstr "z %.*s\n"
-#: login-utils/login.c:1340
+#: login-utils/login.c:1336
#, c-format
msgid "on %.*s\n"
msgstr "%.*s\n"
-#: login-utils/login.c:1363
+#: login-utils/login.c:1359
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr "CHYBNÉ PŘIHLÁ©ENÍ U®IVATELE %2$s Z %1$s"
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
#, 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:1370
+#: login-utils/login.c:1366
#, 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:1373
+#: login-utils/login.c:1369
#, 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"
@@ -5925,7 +6064,7 @@ msgstr "spuątění rc se nezdařilo - volání fork selhalo\n"
msgid "fork failed\n"
msgstr "volání fork selhalo\n"
-#: login-utils/simpleinit.c:302 text-utils/more.c:1548
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
msgid "exec failed\n"
msgstr "volání exec selhalo\n"
@@ -5994,32 +6133,32 @@ msgstr "%s: %s nezměněno\n"
msgid "%s: no changes made\n"
msgstr "%s: ľádné změny\n"
-#: login-utils/wall.c:106
+#: login-utils/wall.c:103
#, c-format
msgid "usage: %s [file]\n"
msgstr "Pouľití: %s [soubor]\n"
-#: login-utils/wall.c:154
+#: login-utils/wall.c:151
#, c-format
msgid "%s: can't open temporary file.\n"
msgstr "%s: dočasný soubor nelze otevřít.\n"
-#: login-utils/wall.c:181
+#: login-utils/wall.c:178
#, c-format
msgid "Broadcast Message from %s@%s"
msgstr "Vąeobecná zpráva od %s@%s"
-#: login-utils/wall.c:191
+#: login-utils/wall.c:188
#, c-format
msgid "%s: can't read %s.\n"
msgstr "%s: %s nelze číst.\n"
-#: login-utils/wall.c:216
+#: login-utils/wall.c:213
#, c-format
msgid "%s: can't stat temporary file.\n"
msgstr "%s: volání stat pro dočasný soubor selhalo.\n"
-#: login-utils/wall.c:225
+#: login-utils/wall.c:222
#, c-format
msgid "%s: can't read temporary file.\n"
msgstr "%s: dočasný soubor nelze číst.\n"
@@ -6095,11 +6234,6 @@ msgstr ""
"Pouľití: logger [-is] [-f soubor] [-p pri] [-t značka] [-u soket] [ zpráva "
"... ]\n"
-#: misc-utils/look.c:170 misc-utils/setterm.c:1153 text-utils/more.c:1862
-#: text-utils/more.c:1873
-msgid "Out of memory"
-msgstr "Nedostatek paměti"
-
#: misc-utils/look.c:340
msgid "usage: look [-dfa] [-t char] string [file]\n"
msgstr "Pouľití: look [-dfa] [-t znak] řetězec [soubor]\n"
@@ -6155,21 +6289,21 @@ msgstr " *** PŘEKROČEN UNIXOVÝ LIMIT PRO SYMBOLICKÉ ODKAZY ***"
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr "namei: typ 0%06o souboru %s je neznámý\n"
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
msgid "usage: script [-a] [file]\n"
msgstr "Pouľití: script [-a] [soubor]\n"
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, c-format
msgid "Script started, file is %s\n"
msgstr "Script spuątěn. Soubor je %s.\n"
-#: misc-utils/script.c:197
+#: misc-utils/script.c:198
#, c-format
msgid "Script started on %s"
msgstr "Script spuątěn %s"
-#: misc-utils/script.c:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
@@ -6178,246 +6312,226 @@ msgstr ""
"\n"
"Script ukončen %s"
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr "Script utils. Soubor je %s\n"
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr "volání openpty selhalo\n"
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
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:745
+#: misc-utils/setterm.c:713
#, c-format
msgid "%s: Argument error, usage\n"
msgstr "%s: Chybný přepínač, pouľití\n"
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:716
msgid " [ -term terminal_name ]\n"
msgstr " [ -term jméno terminálu]\n"
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:717
msgid " [ -reset ]\n"
msgstr " [ -reset ]\n"
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:718
msgid " [ -initialize ]\n"
msgstr " [ -initialize ]\n"
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:719
msgid " [ -cursor [on|off] ]\n"
msgstr " [ -cursor [on|off] ]\n"
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:721
msgid " [ -snow [on|off] ]\n"
msgstr " [ -snow [on|off] ]\n"
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:722
msgid " [ -softscroll [on|off] ]\n"
msgstr " [ -softscroll [on|off] ]\n"
-#: misc-utils/setterm.c:755
-msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
-msgstr " [ -keyboard pc|olivetti|dutch|extended ]\n"
-
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:724
msgid " [ -repeat [on|off] ]\n"
msgstr " [ -repeat [on|off] ]\n"
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:725
msgid " [ -appcursorkeys [on|off] ]\n"
msgstr " [ -appcursorkeys [on|off] ]\n"
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:726
msgid " [ -linewrap [on|off] ]\n"
msgstr " [ -linewrap [on|off] ]\n"
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:727
msgid " [ -default ]\n"
msgstr " [ -default ]\n"
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:728
msgid " [ -foreground black|blue|green|cyan"
msgstr " [ -foreground black|blue|green|cyan"
-#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
msgid "|red|magenta|yellow|white|default ]\n"
msgstr "|red|magenta|yellow|white|default ]\n"
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:730
msgid " [ -background black|blue|green|cyan"
msgstr " [ -background black|blue|green|cyan"
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:732
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
+#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
+#: misc-utils/setterm.c:739
msgid "|red|magenta|yellow|white ]\n"
msgstr "|red|magenta|yellow|white ]\n"
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:734
msgid " [ -ulcolor bright blue|green|cyan"
msgstr " [ -ulcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:736
msgid " [ -hbcolor black|grey|blue|green|cyan"
msgstr " [ -hbcolor black|grey|blue|green|cyan"
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:738
msgid " [ -hbcolor bright blue|green|cyan"
msgstr " [ -hbcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:741
msgid " [ -standout [ attr ] ]\n"
msgstr " [ -standout [ atribut ] ]\n"
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:743
msgid " [ -inversescreen [on|off] ]\n"
msgstr " [ -inversescreen [on|off] ]\n"
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:744
msgid " [ -bold [on|off] ]\n"
msgstr " [ -bold [on|off] ]\n"
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:745
msgid " [ -half-bright [on|off] ]\n"
msgstr " [ -half-bright [on|off] ]\n"
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:746
msgid " [ -blink [on|off] ]\n"
msgstr " [ -blink [on|off] ]\n"
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:747
msgid " [ -reverse [on|off] ]\n"
msgstr " [ -reverse [on|off] ]\n"
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:748
msgid " [ -underline [on|off] ]\n"
msgstr " [ -underline [on|off] ]\n"
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:749
msgid " [ -store ]\n"
msgstr " [ -store ]\n"
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:750
msgid " [ -clear [all|rest] ]\n"
msgstr " [ -clear [all|rest] ]\n"
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:751
msgid " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:752
msgid " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:753
msgid " [ -regtabs [1-160] ]\n"
msgstr " [ -regtabs [1-160] ]\n"
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:754
msgid " [ -blank [0-60] ]\n"
msgstr " [ -blank [0-60] ]\n"
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:755
msgid " [ -dump [1-NR_CONSOLES] ]\n"
msgstr " [ -dump [1-NR_CONSOLES] ]\n"
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:756
msgid " [ -append [1-NR_CONSOLES] ]\n"
msgstr " [ -append [1-NR_CONSOLES] ]\n"
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:757
msgid " [ -file dumpfilename ]\n"
msgstr " [ -file soubor pro uloľení ]\n"
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:758
msgid " [ -msg [on|off] ]\n"
msgstr " [ -msg [on|off] ]\n"
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:759
msgid " [ -msglevel [0-8] ]\n"
msgstr " [ -msglevel [0-8] ]\n"
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:760
msgid " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
msgstr " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:761
msgid " [ -powerdown [0-60] ]\n"
msgstr " [ -powerdown [0-60] ]\n"
-#: misc-utils/setterm.c:795
+#: misc-utils/setterm.c:762
msgid " [ -blength [0-2000] ]\n"
msgstr " [ -blength [0-2000] ]\n"
-#: misc-utils/setterm.c:796
+#: misc-utils/setterm.c:763
msgid " [ -bfreq freqnumber ]\n"
msgstr " [ -bfreq frekvence ]\n"
-#: misc-utils/setterm.c:841
-msgid "keyboard.pc"
-msgstr "keyboard.pc"
-
-#: misc-utils/setterm.c:844
-msgid "keyboard.olivetti"
-msgstr "keyboard.olivetti"
-
-#: misc-utils/setterm.c:847
-msgid "keyboard.dutch"
-msgstr "keyboard.dutch"
-
-#: misc-utils/setterm.c:850
-msgid "keyboard.extended"
-msgstr "keyboard.extended"
-
-#: misc-utils/setterm.c:884
+#: misc-utils/setterm.c:831
msgid "snow.on"
msgstr "sněľení zapnuto"
-#: misc-utils/setterm.c:886
+#: misc-utils/setterm.c:833
msgid "snow.off"
msgstr "sněľení vypnuto"
-#: misc-utils/setterm.c:892
+#: misc-utils/setterm.c:839
msgid "softscroll.on"
msgstr "softwarové rolování zapnuto"
-#: misc-utils/setterm.c:894
+#: misc-utils/setterm.c:841
msgid "softscroll.off"
msgstr "softwarové rolování vypnuto"
-#: misc-utils/setterm.c:1069
+#: misc-utils/setterm.c:1016
msgid "cannot (un)set powersave mode\n"
msgstr "ąetřící reľim nelze vypnout/zapnout\n"
-#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
+#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
#, c-format
msgid "klogctl error: %s\n"
msgstr "chyba klogctl: %s\n"
-#: misc-utils/setterm.c:1157
+#: misc-utils/setterm.c:1104
#, c-format
msgid "Error reading %s\n"
msgstr "Chyba při čtení %s\n"
-#: misc-utils/setterm.c:1172
+#: misc-utils/setterm.c:1119
msgid "Error writing screendump\n"
msgstr "Chyba při ukládání obrazu obrazovky\n"
-#: misc-utils/setterm.c:1186
+#: misc-utils/setterm.c:1133
#, 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:1251
+#: misc-utils/setterm.c:1198
#, c-format
msgid "%s: $TERM is not defined.\n"
msgstr "%s: proměnná TERM není nastavena.\n"
@@ -6502,65 +6616,65 @@ 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:358
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr ""
"zamykací soubor %s nelze vytvořit: %s\n"
"(pouľijte přepínač -n pro vynechání zápisu do mtab)"
-#: mount/fstab.c:370
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr ""
"volání link pro zamykací soubor %s selhalo: %s\n"
"(pouľijte přepínač -n pro vynechání zápisu do mtab)"
-#: mount/fstab.c:382
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr ""
"zamykací soubor %s nelze otevřít: %s\n"
"(pouľijte přepínač -n pro vynechání zápisu do mtab)"
-#: mount/fstab.c:397
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr "Zamykací soubor %s nelze zamknout: %s\n"
-#: mount/fstab.c:408
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr "Zamykací soubor %s nelze zamknout: %s"
-#: mount/fstab.c:410
+#: mount/fstab.c:427
msgid "timed out"
msgstr "vyprąel čas"
-#: mount/fstab.c:455 mount/fstab.c:463
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr "nelze otevřít %s (%s) - mtab nebyl aktualizován"
-#: mount/fstab.c:488
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr "mount: varování: pomocí nelze remount změnit připojené zařízení\n"
-#: mount/fstab.c:493
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr "mount: varování: pomocí nelze remount změnit typ systému souborů\n"
-#: mount/fstab.c:501 mount/fstab.c:507
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr "chyba při zápisu %s: %s"
-#: mount/fstab.c:514
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr "chyba při změně módu %s: %s\n"
-#: mount/fstab.c:521
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr "%s nelze přejmenovat na %s: %s\n"
@@ -6624,16 +6738,16 @@ msgstr "mount: ľádné volné loop zařízení nelze najít"
msgid "Unsupported encryption type %s\n"
msgstr "Nepodporovaný ąifrovací typ %s\n"
-#: mount/lomount.c:210 mount/losetup.c:125
+#: mount/lomount.c:210 mount/losetup.c:126
msgid "Init (up to 16 hex digits): "
msgstr "Init (aľ 16 ąestnáctkových číslic): "
-#: mount/lomount.c:217 mount/losetup.c:132
+#: mount/lomount.c:217 mount/losetup.c:133
#, c-format
msgid "Non-hex digit '%c'.\n"
msgstr "Neąestnáctková číslice '%c'.\n"
-#: mount/lomount.c:223 mount/losetup.c:138
+#: mount/lomount.c:223 mount/losetup.c:140
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr "Nevím jak získat klíč pro ąifrovací systém %d\n"
@@ -6661,7 +6775,7 @@ msgstr "Tento program byl přeloľen bez podpory pro loop. Přeloľte jej znovu.\n"
msgid "Cannot get loop info"
msgstr "Informace o loop nelze získat"
-#: mount/losetup.c:174
+#: mount/losetup.c:176
#, c-format
msgid ""
"usage:\n"
@@ -6674,7 +6788,7 @@ msgstr ""
" %s -d loop zařízení # smaľe\n"
" %s [ -e ąifra ] [ -o posun ] loop zařízení soubor # nastaví\n"
-#: mount/losetup.c:231
+#: mount/losetup.c:234
msgid "No loop support was available at compile time. Please recompile.\n"
msgstr "Podpora pro loop nebyla při překladu zadána. Přeloľte program znovu.\n"
@@ -6692,130 +6806,136 @@ msgstr "[mntent]: řádek %d v %s je chybný%s\n"
msgid "; rest of file ignored"
msgstr "; ignoruji zbytek souboru"
-#: mount/mount.c:323
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: podle mtab je %s jiľ připojeno na %s"
-#: mount/mount.c:326
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: podle mtab je %s připojeno na %s"
-#: mount/mount.c:347
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: %s nelze otevřít pro zápis: %s"
-#: mount/mount.c:362 mount/mount.c:611
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: chyba při zápisu %s: %s"
-#: mount/mount.c:369
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: chyba při změně módu %s: %s"
-#: mount/mount.c:443
+#: mount/mount.c:473
msgid "mount failed"
msgstr "připojení se nezdařilo"
-#: mount/mount.c:445
+#: mount/mount.c:475
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: pouze superuľivatel můľe připojit %s na %s"
-#: mount/mount.c:470
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
msgstr "mount: zařízení loop bylo zadáno dvakrát"
-#: mount/mount.c:476
+#: mount/mount.c:509
msgid "mount: type specified twice"
msgstr "mount: typ byl zadán dvakrát"
-#: mount/mount.c:488
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: přeskakuji nastavení loop zařízení\n"
-#: mount/mount.c:497
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: chystám se pouľít zařízení loop %s\n"
-#: mount/mount.c:501
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr "mount: nepodařilo se nastavit zařízení loop\n"
-#: mount/mount.c:505
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr "mount: zařízení loop bylo korektně nastaveno\n"
-#: mount/mount.c:518
+#: mount/mount.c:551
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:568 mount/mount.c:993
+#: mount/mount.c:601 mount/mount.c:1030
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: volání fork selhalo: %s"
-#: mount/mount.c:606
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: %s nelze otevřít: %s"
-#: mount/mount.c:634
+#: mount/mount.c:668
+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:671
msgid "mount: you must specify the filesystem type"
msgstr "mount: musíte zadat typ systému souborů"
-#: mount/mount.c:641 mount/mount.c:676
+#: mount/mount.c:678 mount/mount.c:713
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: přípojný bod %s není adresářem"
-#: mount/mount.c:643
+#: mount/mount.c:680
msgid "mount: permission denied"
msgstr "mount: přístup odmítnut"
-#: mount/mount.c:645
+#: mount/mount.c:682
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:649 mount/mount.c:653
+#: mount/mount.c:686 mount/mount.c:690
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s je jiľ připojeno"
#. no
#. yes, don't mention it
-#: mount/mount.c:655
+#: mount/mount.c:692
msgid "mount: proc already mounted"
msgstr "mount: proc je jiľ připojeno"
-#: mount/mount.c:657
+#: mount/mount.c:694
#, 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:663
+#: mount/mount.c:700
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: přípojný bod %s neexistuje"
-#: mount/mount.c:665
+#: mount/mount.c:702
#, 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:668
+#: mount/mount.c:705
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: speciální zařízení %s neexistuje"
-#: mount/mount.c:678
+#: mount/mount.c:715
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -6824,12 +6944,12 @@ msgstr ""
"mount: speciální zařízení %s neexistuje\n"
" (název cesty nezačíná adresářem)\n"
-#: mount/mount.c:690
+#: mount/mount.c:727
#, 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:692
+#: mount/mount.c:729
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -6838,46 +6958,46 @@ 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:707
+#: mount/mount.c:744
msgid "mount table full"
msgstr "tabulka připojení je plná"
-#: mount/mount.c:709
+#: mount/mount.c:746
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: superblok nelze přečíst"
-#: mount/mount.c:712
+#: mount/mount.c:749
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr "mount: %s má chybné větąí či menąí číslo zařízení"
-#: mount/mount.c:717
+#: mount/mount.c:754
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: typ ss %s není podporován jádrem"
-#: mount/mount.c:729
+#: mount/mount.c:766
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: pravděpodobně jste myslel %s"
-#: mount/mount.c:731
+#: mount/mount.c:768
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: moľná jste myslel iso9660 ?"
-#: mount/mount.c:734
+#: mount/mount.c:771
#, 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:739
+#: mount/mount.c:776
#, 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:741
+#: mount/mount.c:778
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -6885,75 +7005,75 @@ msgid ""
msgstr ""
"mount: jádro nerozpoznalo %s jako blokové zařízení (moľná `insmod ovladač'?)"
-#: mount/mount.c:744
+#: mount/mount.c:781
#, 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:747
+#: mount/mount.c:784
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s není blokovým zařízením"
-#: mount/mount.c:750
+#: mount/mount.c:787
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s není platným blokovým zařízením"
-#: mount/mount.c:754
+#: mount/mount.c:791
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr "mount: blokové zařízení %s není na tomto systému souborů povoleno"
-#: mount/mount.c:770
+#: mount/mount.c:807
#, 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:771
+#: mount/mount.c:808
msgid "block device "
msgstr "blokové zařízení"
-#: mount/mount.c:857
+#: mount/mount.c:894
#, c-format
msgid "mount: consider mounting %s by %s\n"
msgstr "mount: zvaľte připojení %s dle %s\n"
-#: mount/mount.c:858
+#: mount/mount.c:895
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:858
+#: mount/mount.c:895
msgid "label"
msgstr "jméno"
-#: mount/mount.c:860 mount/mount.c:1176
+#: mount/mount.c:897 mount/mount.c:1213
msgid "mount: no such partition found"
msgstr "mount: ľádný odpovídající diskový oddíl nebyl nalezen"
-#: mount/mount.c:868
+#: mount/mount.c:905
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"
#.
#. * Retry in the background.
#.
-#: mount/mount.c:884
+#: mount/mount.c:921
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: pracuji na pozadí \"%s\"\n"
-#: mount/mount.c:895
+#: mount/mount.c:932
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: končím \"%s\"\n"
-#: mount/mount.c:944
+#: mount/mount.c:981
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s je jiľ připojeno na %s\n"
-#: mount/mount.c:1055
+#: mount/mount.c:1092
msgid ""
"Usage: mount [-hV]\n"
" mount -a [-nfFrsvw] [-t vfstypes]\n"
@@ -6967,30 +7087,30 @@ msgstr ""
" mount [-nfrsvw] [-t vfstyp] [-o volby] speciální soubor uzel\n"
" Speciální zařízení můľe být označeno pomocí -L popiska či -U uuid.\n"
-#: mount/mount.c:1161
+#: mount/mount.c:1198
msgid "mount: only root can do that"
msgstr "mount: toto můľe provést pouze superuľivatel"
-#: mount/mount.c:1166
+#: mount/mount.c:1203
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s nebylo nalezeno - vytvářím jej..\n"
-#: mount/mount.c:1178
+#: mount/mount.c:1215
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: připojuji %s\n"
-#: mount/mount.c:1187
+#: mount/mount.c:1224
msgid "not mounted anything"
msgstr "nic nebylo připojeno"
-#: mount/mount.c:1200
+#: mount/mount.c:1237
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: %s nelze v %s nalézt"
-#: mount/mount.c:1214
+#: mount/mount.c:1251
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: %s nelze nalézt v %s ani %s"
@@ -6999,17 +7119,17 @@ msgstr "mount: %s nelze nalézt v %s ani %s"
msgid "mount: bad UUID"
msgstr "mount: chybné UUID"
-#: mount/mount_guess_fstype.c:187
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: nezadal jste typ systému souborů pro %s\n"
-#: mount/mount_guess_fstype.c:190
+#: mount/mount_guess_fstype.c:201
#, c-format
msgid " I will try type %s\n"
msgstr " Vyzkouąím typ %s\n"
-#: mount/mount_guess_fstype.c:192
+#: mount/mount_guess_fstype.c:203
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Vyzkouąím vąechny typy v %s či %s\n"
@@ -7148,96 +7268,96 @@ msgstr "swapon: soubor %s vynechávám - zdá se, ľe v něm jsou díry.\n"
msgid "%s: cannot open %s: %s\n"
msgstr "%s: %s nelze otevřít: %s\n"
-#: mount/umount.c:65
+#: mount/umount.c:69
msgid "umount: compiled without support for -f\n"
msgstr "umount byl přeloľen bez podpory pro -f\n"
-#: mount/umount.c:115
+#: mount/umount.c:121
#, c-format
msgid "host: %s, directory: %s\n"
msgstr "počítač: %s, adresář: %s\n"
-#: mount/umount.c:132
+#: mount/umount.c:138
#, c-format
msgid "umount: can't get address for %s\n"
msgstr "umount: adresu %s nelze zjistit\n"
-#: mount/umount.c:137
+#: mount/umount.c:143
msgid "umount: got bad hostp->h_length\n"
msgstr "umount: chybná hodnota hostp->h_length\n"
-#: mount/umount.c:175
+#: mount/umount.c:181
#, c-format
msgid "umount: %s: invalid block device"
msgstr "umount: blokové zařízení %s je chybné"
-#: mount/umount.c:177
+#: mount/umount.c:183
#, c-format
msgid "umount: %s: not mounted"
msgstr "umount: %s není připojeno"
-#: mount/umount.c:179
+#: mount/umount.c:185
#, 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:183
+#: mount/umount.c:189
#, c-format
msgid "umount: %s: device is busy"
msgstr "umount: zařízení %s je jiľ pouľíváno"
-#: mount/umount.c:185
+#: mount/umount.c:191
#, c-format
msgid "umount: %s: not found"
msgstr "umount: %s nelze najít"
-#: mount/umount.c:187
+#: mount/umount.c:193
#, 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:189
+#: mount/umount.c:195
#, 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:191
+#: mount/umount.c:197
#, c-format
msgid "umount: %s: %s"
msgstr "umount: %s: %s"
-#: mount/umount.c:235
+#: mount/umount.c:241
msgid "no umount2, trying umount...\n"
msgstr "nenalezl jsem umount2, zkouąím umount...\n"
-#: mount/umount.c:248
+#: mount/umount.c:254
#, c-format
msgid "could not umount %s - trying %s instead\n"
msgstr "%s nelze odpojit - zkouąím %s\n"
-#: mount/umount.c:264
+#: mount/umount.c:270
#, 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:272
+#: mount/umount.c:278
#, 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:280
+#: mount/umount.c:286
#, c-format
msgid "%s umounted\n"
msgstr "%s odpojeno\n"
-#: mount/umount.c:363
+#: mount/umount.c:369
msgid "umount: cannot find list of filesystems to unmount"
msgstr "umount: seznam systémů souborů na odpojení nelze nalézt"
-#: mount/umount.c:392
+#: mount/umount.c:398
msgid ""
"Usage: umount [-hV]\n"
" umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7247,46 +7367,46 @@ msgstr ""
" umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
" umount [-f] [-r] [-n] [-v] speciální soubor | uzel...\n"
-#: mount/umount.c:453
+#: mount/umount.c:459
msgid "umount: only root can do that"
msgstr "umount: toto můľe provést pouze uľivatel root"
-#: mount/umount.c:468
+#: mount/umount.c:474
#, c-format
msgid "Trying to umount %s\n"
msgstr "Zkouąím odpojit %s\n"
-#: mount/umount.c:472
+#: mount/umount.c:478
#, c-format
msgid "Could not find %s in mtab\n"
msgstr "%s nelze v mtab najít\n"
-#: mount/umount.c:476
+#: mount/umount.c:482
#, c-format
msgid "umount: %s is not mounted (according to mtab)"
msgstr "umount: podle mtab není %s připojeno"
-#: mount/umount.c:478
+#: mount/umount.c:484
#, 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:480
+#: mount/umount.c:496
#, 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:486
+#: mount/umount.c:499
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr "umount: připojení %s neodpovídá fstab"
-#: mount/umount.c:505
+#: mount/umount.c:520
#, c-format
msgid "umount: only root can unmount %s from %s"
msgstr "unmount: pouze uľivatel root můľe odpojit %s ze %s"
-#: mount/umount.c:515
+#: mount/umount.c:531
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr "unmount: pouze uľivatel %s můľe odpojit %s ze %s"
@@ -8071,7 +8191,7 @@ msgstr ""
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr " Pomocí -R 1 připojíte pouze pro čtení, -R 0 umoľní zápis."
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -8092,31 +8212,31 @@ msgstr ""
"\t -r vynuluje veąkeré čítače (pouze root)\n"
"\t -V vypíąe informace o verzi a skončí\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
msgstr "%s Verze %s\n"
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
msgstr "cokoliv\n"
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr "Profilovací_krok: %i\n"
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr "%s: %s(%i): chybný map řádek\n"
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
msgstr "%s: \"_stext\" nelze v %s nalézt\n"
-#: sys-utils/readprofile.c:221
+#: sys-utils/readprofile.c:226
msgid "total"
msgstr "celkem"
@@ -8154,7 +8274,7 @@ msgstr "%d: původní priorita %d, nová priorita %d\n"
msgid "usage: %s program [arg ...]\n"
msgstr "Pouľití: %s program [arg ...]\n"
-#: sys-utils/tunelp.c:76
+#: sys-utils/tunelp.c:74
#, c-format
msgid ""
"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8165,94 +8285,94 @@ msgstr ""
" -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s |\n"
" -T [on|off] ]\n"
-#: sys-utils/tunelp.c:92
+#: sys-utils/tunelp.c:90
msgid "malloc error"
msgstr "chyba malloc"
-#: sys-utils/tunelp.c:103
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
msgstr "chyba sscanf"
-#: sys-utils/tunelp.c:236
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
msgstr "%s: %s není lp zařízením\n"
-#: sys-utils/tunelp.c:257
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
msgstr "status %s je %d"
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:261
msgid ", busy"
msgstr ", zaneprázdněna"
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:262
msgid ", ready"
msgstr ", připravena"
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
msgstr ", doąel papír"
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:264
msgid ", on-line"
msgstr ", zapnuta"
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:265
msgid ", error"
msgstr ", chyba"
-#: sys-utils/tunelp.c:279
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
msgstr "chyba LPGETIRQ"
-#: sys-utils/tunelp.c:285
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
msgstr "%s pouľívá IRQ %d\n"
-#: sys-utils/tunelp.c:287
+#: sys-utils/tunelp.c:290
#, c-format
msgid "%s using polling\n"
msgstr "%s pouľívá poll\n"
-#: text-utils/col.c:150
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
msgstr "col: chybný argument %s pro přepínač -l\n"
-#: text-utils/col.c:511
+#: text-utils/col.c:516
msgid "usage: col [-bfx] [-l nline]\n"
msgstr "Pouľití: col [-bfx] [-l poč. řádků]\n"
-#: text-utils/col.c:517
+#: text-utils/col.c:522
msgid "col: write error.\n"
msgstr "col: chyba při ukládání\n"
-#: text-utils/col.c:524
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
msgstr "col: varování: %s nelze zazálohovat.\n"
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "past first line"
msgstr "jsem za prvním řádkem"
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "-- line already flushed"
msgstr "-- řádek jiľ není v bufru"
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Pouľití: %s [ - ] [-2 ] [ soubor ... ]\n"
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
msgstr "řádek je přílią dlouhý"
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Pouľití: column [-tx] [c sloupce] [soubor ...]\n"
@@ -8271,12 +8391,12 @@ msgstr ""
"hexdump: [-bcdovx] [-e fmt] [-f fmt_soubor] [-n délka] [-s vzdálenost] "
"[soubor ...]\n"
-#: text-utils/more.c:328
+#: text-utils/more.c:329
#, c-format
msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
msgstr "Pouľití: %s [-dfln] [+číslo řádku | +/vzorek] jméno1 jméno2 ...\n"
-#: text-utils/more.c:503
+#: text-utils/more.c:504
#, c-format
msgid ""
"\n"
@@ -8288,7 +8408,7 @@ msgstr ""
"\n"
#. simple ELF detection
-#: text-utils/more.c:542
+#: text-utils/more.c:543
#, c-format
msgid ""
"\n"
@@ -8299,34 +8419,34 @@ msgstr ""
"***** %s není textovým souborem *****\n"
"\n"
-#: text-utils/more.c:646
+#: text-utils/more.c:647
msgid "[Use q or Q to quit]"
msgstr "[Stiskněte q či Q pro ukončení]"
-#: text-utils/more.c:832
+#: text-utils/more.c:833
msgid "--More--"
msgstr "--Více--"
-#: text-utils/more.c:834
+#: text-utils/more.c:835
#, c-format
msgid "(Next file: %s)"
msgstr "(Daląí soubor: %s)"
-#: text-utils/more.c:840
+#: text-utils/more.c:841
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:1138
+#: text-utils/more.c:1139
#, c-format
msgid "...back %d page"
msgstr "...přeskakuji zpět o počet stran: %d"
-#: text-utils/more.c:1184
+#: text-utils/more.c:1185
#, c-format
msgid "...skipping %d line"
msgstr "...přeskakuji o počet řádků: %d"
-#: text-utils/more.c:1225
+#: text-utils/more.c:1226
msgid ""
"\n"
"***Back***\n"
@@ -8335,37 +8455,37 @@ msgstr ""
"\n"
"***Zpět***\n"
-#: text-utils/more.c:1263
+#: text-utils/more.c:1264
msgid "Can't open help file"
msgstr "Soubor s nápovědou nelze otevřít."
-#: text-utils/more.c:1284 text-utils/more.c:1288
+#: text-utils/more.c:1285 text-utils/more.c:1289
msgid "[Press 'h' for instructions.]"
msgstr "[Stiskněte 'h' pro nápovědu.]"
-#: text-utils/more.c:1323
+#: text-utils/more.c:1324
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" řádek %d"
-#: text-utils/more.c:1325
+#: text-utils/more.c:1326
#, c-format
msgid "[Not a file] line %d"
msgstr "[Nejedná se o soubor] řádek %d"
-#: text-utils/more.c:1409
+#: text-utils/more.c:1410
msgid " Overflow\n"
msgstr " Přetečení\n"
-#: text-utils/more.c:1456
+#: text-utils/more.c:1457
msgid "...skipping\n"
msgstr "...vynechávám\n"
-#: text-utils/more.c:1486
+#: text-utils/more.c:1487
msgid "Regular expression botch"
msgstr "Chyba v regulárním výrazu"
-#: text-utils/more.c:1498
+#: text-utils/more.c:1499
msgid ""
"\n"
"Pattern not found\n"
@@ -8373,15 +8493,15 @@ msgstr ""
"\n"
"Vzorek nebyl nalezen\n"
-#: text-utils/more.c:1501
+#: text-utils/more.c:1502
msgid "Pattern not found"
msgstr "Vzorek nebyl nalezen"
-#: text-utils/more.c:1562
+#: text-utils/more.c:1563
msgid "can't fork\n"
msgstr "volání fork selhalo\n"
-#: text-utils/more.c:1601
+#: text-utils/more.c:1602
msgid ""
"\n"
"...Skipping "
@@ -8389,23 +8509,23 @@ msgstr ""
"\n"
"...Vynechávám "
-#: text-utils/more.c:1605
+#: text-utils/more.c:1606
msgid "...Skipping "
msgstr "...Přecházím "
-#: text-utils/more.c:1606
+#: text-utils/more.c:1607
msgid "to file "
msgstr "na soubor "
-#: text-utils/more.c:1606
+#: text-utils/more.c:1607
msgid "back to file "
msgstr "zpět na soubor "
-#: text-utils/more.c:1845
+#: text-utils/more.c:1846
msgid "Line too long"
msgstr "Řádek je přílią dlouhý"
-#: text-utils/more.c:1889
+#: text-utils/more.c:1890
msgid "No previous command to substitute for"
msgstr "Neexistuje ľádný příkaz, jenľ by bylo moľno nahradit"
@@ -8453,37 +8573,37 @@ msgstr "hexdump: chybný formát {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: chybný znak v konverzi %%%s.\n"
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
msgstr "Místo pro buffer nelze naalokovat.\n"
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
msgstr "Pouľití: rev [soubor ...]\n"
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
msgstr "Pouľití: %s [ -i ] [-tTerm ] soubor...\n"
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
msgstr "chyba při čtení terminfo databáze"
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
msgstr "Neznámá posloupnost řídících znaků na vstupu: %o, %o\n"
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
msgstr "Buffer nelze naalokovat.\n"
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
msgstr "Vstupní řádka je přílią dlouhá.\n"
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
msgstr "Nedostatek paměti pro rostoucí buffer.\n"
@@ -8496,6 +8616,62 @@ msgstr "Rychlost opakování kláves nastavena na %.1f cps (prodleva = %d ms)\n"
msgid "Cannot open /dev/port"
msgstr "/dev/port nelze otevřít"
+#~ msgid "%s: %s, errno=%d: %s.\n"
+#~ msgstr "%s: %s, errno=%d: %s.\n"
+
+#~ msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
+#~ msgstr " [ -keyboard pc|olivetti|dutch|extended ]\n"
+
+#~ msgid "keyboard.pc"
+#~ msgstr "keyboard.pc"
+
+#~ msgid "keyboard.olivetti"
+#~ msgstr "keyboard.olivetti"
+
+#~ msgid "keyboard.dutch"
+#~ msgstr "keyboard.dutch"
+
+#~ msgid "keyboard.extended"
+#~ msgstr "keyboard.extended"
+
+#~ msgid "A disk block device is needed.\n"
+#~ msgstr "Je třeba blokové zařízení disku.\n"
+
+#~ msgid ""
+#~ "Given name does not refer to a partition,\n"
+#~ "or maybe not even to a block device.\n"
+#~ msgstr ""
+#~ "Zadané jméno neodpovídá diskovému oddílu,\n"
+#~ " a moľná ani blokovému zařízení.\n"
+
+#~ msgid ""
+#~ "unit: sectors\n"
+#~ "\n"
+#~ msgstr ""
+#~ "jednotky: sektory\n"
+#~ "\n"
+
+#~ msgid " start=%9lu"
+#~ msgstr " začátek=%9lu"
+
+#~ msgid ", size=%8lu"
+#~ msgstr ", velikost=%lu"
+
+#~ msgid ", Id=%2x"
+#~ msgstr ", Id=%2x"
+
+#~ msgid ", bootable"
+#~ msgstr ", startovací"
+
+#~ msgid "Cannot read disk drive geometry"
+#~ msgstr "Geometrii disku nelze zjistit"
+
+#~ msgid "Cannot derive a geometry from an empty partition table"
+#~ msgstr "Z prázdné tabulky rozdělení disku nelze odvodit geometrii."
+
+#~ msgid "Cannot derive a geometry from the partition table"
+#~ msgstr "Z tabulky rozdělení disku nelze odvodit geometrii."
+
#~ msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
#~ msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
@@ -8543,3 +8719,4 @@ msgstr "/dev/port nelze otevřít"
#~ msgid "util-linux kbdrate %s \n"
#~ msgstr "util-linux kbdrate %s \n"
+#~ msgstr "util-linux kbdrate %s \n"
diff --git a/po/de.po b/po/de.po
index 2de30163a..1aab875d2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,6 +2,7 @@
# German translation
# Copyright (C) 1999
# Elrond <Elrond@Wunder-Nett.org>, 1999.
+# $Revision: 1.26 $
#
# Permission is granted to freely copy and distribute
# this file and modified versions, provided, that this
@@ -14,15 +15,553 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.9s\n"
-"POT-Creation-Date: 1999-06-27 19:14+0200\n"
-"PO-Revision-Date: 1999-06-29 21:56+0200\n"
+"Project-Id-Version: util-linux 2.10\n"
+"POT-Creation-Date: 1999-11-03 23:13+0100\n"
+"PO-Revision-Date: 1999-11-05 11:08+0100\n"
"Last-Translator: Elrond <Elrond@Wunder-Nett.org>\n"
"Language-Team: Elrond <Elrond@Wunder-Nett.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: clock/cmos.c:146
+msgid "booted from MILO\n"
+msgstr ""
+
+#: clock/cmos.c:154
+msgid "Ruffian BCD clock\n"
+msgstr ""
+
+#: clock/cmos.c:170
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr ""
+
+#: clock/cmos.c:180
+msgid "funky TOY!\n"
+msgstr ""
+
+#: clock/cmos.c:234
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr ""
+
+#: clock/cmos.c:558
+#, fuzzy, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Konnte /dev/port nicht öffnen: %s"
+
+# typo in the english version: didn't
+#: clock/cmos.c:565
+msgid "I failed to get permission because I didnt try.\n"
+msgstr ""
+
+#: clock/cmos.c:568
+#, c-format
+msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
+msgstr ""
+
+# Oh well.
+#: clock/cmos.c:571
+#, fuzzy
+msgid "Probably you need root privileges.\n"
+msgstr "Möglicherweise benötigen Sie root-Rechte.\n"
+
+#: clock/hwclock.c:213
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr ""
+
+#: clock/hwclock.c:214 clock/hwclock.c:303
+msgid "UTC"
+msgstr ""
+
+#: clock/hwclock.c:214 clock/hwclock.c:302
+msgid "local"
+msgstr ""
+
+#: clock/hwclock.c:286
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr ""
+
+#: clock/hwclock.c:288
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr ""
+
+#: clock/hwclock.c:297
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:299
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:301
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr ""
+
+#: clock/hwclock.c:303
+msgid "unknown"
+msgstr ""
+
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop. The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:325
+msgid "Waiting for clock tick...\n"
+msgstr ""
+
+#: clock/hwclock.c:329
+msgid "...got clock tick\n"
+msgstr ""
+
+#: clock/hwclock.c:381
+#, c-format
+msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+
+#: clock/hwclock.c:390
+#, c-format
+msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr "Zeit der Hardwareuhr: %.2d:%.2d:%.2d = %d Sekunden seit 1969\n"
+
+#: clock/hwclock.c:416
+#, c-format
+msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgstr ""
+
+#: clock/hwclock.c:442
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:448
+msgid "Clock not changed - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:496
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+
+#: clock/hwclock.c:520
+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 ""
+
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end. We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:532
+#, c-format
+msgid "%s %.6f seconds\n"
+msgstr "%s %.6f Sekunden\n"
+
+#: clock/hwclock.c:566
+msgid "No --date option specified.\n"
+msgstr "Es wurde keine --date-Option verwendet.\n"
+
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:571
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+
+#: clock/hwclock.c:577
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr ""
+
+#: clock/hwclock.c:581
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
+
+#: clock/hwclock.c:587
+#, c-format
+msgid "response from date command = %s\n"
+msgstr ""
+
+#: clock/hwclock.c:589
+#, 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 ""
+
+#: clock/hwclock.c:598
+#, c-format
+msgid ""
+"The date command issued by %s returnedsomething other than an integer where "
+"the convertedtime value was expected.\n"
+"The command was:\n"
+" %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+
+#: clock/hwclock.c:608
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr ""
+
+#: clock/hwclock.c:643
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+
+# debug
+#: clock/hwclock.c:659
+msgid "Calling settimeofday:\n"
+msgstr "settimeofday() wird aufgerufen:\n"
+
+# not much to translate
+# debug
+#: clock/hwclock.c:660
+#, 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
+#: clock/hwclock.c:662
+#, c-format
+msgid "\ttz.tz_minuteswest = %ld\n"
+msgstr "\ttz.tz_minuteswest = %ld\n"
+
+#: clock/hwclock.c:665
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+
+#: clock/hwclock.c:677
+msgid "Must be superuser to set system clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:679
+#, fuzzy
+msgid "settimeofday() failed"
+msgstr "settimeofday() schlug fehl"
+
+#: clock/hwclock.c:712
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+
+#: clock/hwclock.c:716
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+
+#: clock/hwclock.c:725
+#, c-format
+msgid ""
+"Clock drifted %d 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 ""
+
+#: clock/hwclock.c:776
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr ""
+
+#: clock/hwclock.c:778
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
+
+#: clock/hwclock.c:807
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr ""
+
+# passiv, Konjunktiv in der Umschreibungsform
+#: clock/hwclock.c:808
+#, fuzzy, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Das folgende wäre in die Datei %s geschrieben worden:\n"
+"%s"
+
+#: clock/hwclock.c:832
+msgid "Drift adjustment parameters not updated.\n"
+msgstr ""
+
+#: clock/hwclock.c:873
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+
+#: clock/hwclock.c:897
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:923
+#, fuzzy, c-format
+msgid "Using %s.\n"
+msgstr "Benutze %s.\n"
+
+#: clock/hwclock.c:925
+msgid "No usable clock interface found.\n"
+msgstr ""
+
+# "stellen"
+#: clock/hwclock.c:1020
+#, fuzzy
+msgid "Unable to set system clock.\n"
+msgstr "Konnte die Systemuhr nicht setzen.\n"
+
+#: clock/hwclock.c:1049
+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 ""
+
+#: clock/hwclock.c:1058
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1060
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr ""
+
+#: clock/hwclock.c:1063
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+
+#: clock/hwclock.c:1066
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:1069
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1151
+#, c-format
+msgid "%s takes no non-option arguments. You supplied %d.\n"
+msgstr ""
+
+#: clock/hwclock.c:1159
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+
+#: clock/hwclock.c:1165
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive. You specified "
+"both.\n"
+msgstr ""
+
+#: clock/hwclock.c:1178
+msgid "No usable set-to time. Cannot set clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1193
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1197
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1213
+msgid ""
+"Cannot access the Hardware Clock via any known method. Use --debug option "
+"to see the details of our search for an access method.\n"
+msgstr ""
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr ""
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr ""
+
+#: clock/kd.c:65 clock/rtc.c:144
+msgid "Timed out waiting for time change.\n"
+msgstr ""
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr ""
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from /dev/tty1"
+msgstr ""
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr ""
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr ""
+
+#: clock/kd.c:161
+#, fuzzy
+msgid "Can't open /dev/tty1"
+msgstr "Konnte /dev/tty1 nicht öffnen"
+
+#: clock/rtc.c:98
+msgid "ioctl() to /dev/rtc to read the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:129
+msgid "Waiting in loop for time from /dev/rtc to change\n"
+msgstr ""
+
+#: clock/rtc.c:165 clock/rtc.c:222
+msgid "open() of /dev/rtc failed"
+msgstr "Konnte /dev/rtc nicht öffnen"
+
+#. This rtc device doesn't have interrupt functions. This is typical
+#. on an Alpha, where the Hardware Clock interrupts are used by the
+#. kernel for the system clock, so aren't at the user's disposal.
+#.
+#: clock/rtc.c:182
+msgid "/dev/rtc does not have interrupt functions. "
+msgstr ""
+
+#: clock/rtc.c:191
+msgid "read() to /dev/rtc to wait for clock tick failed"
+msgstr ""
+
+#: clock/rtc.c:199
+msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+msgstr ""
+
+#: clock/rtc.c:202
+msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+msgstr ""
+
+#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
+#, fuzzy
+msgid "Unable to open /dev/rtc"
+msgstr "Konnte /dev/rtc nicht öffnen"
+
+#: clock/rtc.c:268
+msgid "ioctl() to /dev/rtc to set the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:272
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr ""
+
+#: clock/rtc.c:302
+msgid "Open of /dev/rtc failed"
+msgstr "Konnte /dev/rtc nicht öffnen"
+
+#: clock/rtc.c:320 clock/rtc.c:365
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file /dev/rtc. This file does not "
+"exist on this system.\n"
+msgstr ""
+
+#: clock/rtc.c:331
+msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:337
+#, c-format
+msgid "we have read epoch %ld from /dev/rtc 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.
+#: clock/rtc.c:357
+#, c-format
+msgid "The epoch value may not be less than 1900. You requested %ld\n"
+msgstr ""
+
+#: clock/rtc.c:374
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgstr ""
+
+#: clock/rtc.c:379
+msgid ""
+"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
+"ioctl.\n"
+msgstr ""
+
+#: clock/rtc.c:382
+msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+msgstr ""
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr "Ungültige Nummer: »%s«\n"
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr ""
+
+#: clock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr "unbekannte Option »%s«\n"
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr "Option »%s« erwartet ein Argument\n"
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr "Option »%s« erwartet kein Argument\n"
+
+#: clock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr "unbekannte Option »-%c«\n"
+
#: disk-utils/fdformat.c:33
msgid "Formatting ... "
msgstr "Formatieren ... "
@@ -83,227 +622,339 @@ msgstr "Doppel"
msgid "Single"
msgstr "Einfach"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:198
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr ""
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr ""
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
msgstr ""
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
msgid "Read error: unable to seek to block in file '"
msgstr ""
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
msgid "Read error: bad block in file '"
msgstr ""
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
msgstr ""
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
msgstr ""
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:560
+#, fuzzy
+msgid "unable to read super block"
+msgstr "Konnte den Superblock nicht lesen"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr ""
+
#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr ""
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
#, c-format
msgid "%ld inodes\n"
msgstr ""
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
#, c-format
msgid "%ld blocks\n"
msgstr ""
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
#, c-format
msgid "Zonesize=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr ""
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
"\n"
msgstr ""
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
msgstr ""
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
msgstr ""
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr ""
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
msgstr ""
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
msgstr ""
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
msgstr ""
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
msgstr ""
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+msgid "internal error"
+msgstr "interner Fehler"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
msgstr ""
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
msgstr ""
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
msgstr ""
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
#, c-format
msgid "Inode %d not used, marked used in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
msgstr ""
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
msgstr ""
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
#, c-format
msgid "Zone %d: marked in use, no file uses it."
msgstr ""
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
msgstr ""
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
msgstr ""
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
msgid "Set"
msgstr ""
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1257
+msgid "bad v2 inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1287
+#, c-format
+msgid "unable to open '%s'"
+msgstr "Konnte %s nicht öffnen"
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -317,7 +968,7 @@ msgid ""
"%6d files\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
@@ -328,15 +979,16 @@ msgstr ""
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:80 fdisk/cfdisk.c:328 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:217 mount/sundries.c:192
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
msgstr "%s: Speicher ist alle!\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
-msgstr "mkfs Version "
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs Version %s (%s)\n"
#: disk-utils/mkfs.minix.c:186
#, c-format
@@ -360,10 +1012,6 @@ msgstr ""
msgid "seek failed in write_tables"
msgstr ""
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
msgstr ""
@@ -376,10 +1024,6 @@ msgstr ""
msgid "unable to write inodes"
msgstr ""
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:292
msgid "write failed in write_block"
msgstr ""
@@ -417,7 +1061,7 @@ msgstr ""
msgid "Weird values in do_check: probably bugs\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:585
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
msgid "seek failed in check_blocks"
msgstr ""
@@ -438,10 +1082,6 @@ msgstr ""
msgid "can't open file of bad blocks"
msgstr ""
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
-msgid "bad inode size"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:669
#, c-format
msgid "%s: not compiled with minix v2 support\n"
@@ -471,43 +1111,66 @@ msgstr "Auf »%s« wird kein Dateisystem erzeugt"
msgid "Assuming pages of size %d\n"
msgstr "Es wird eine Seitengröße von %d angenommen.\n"
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:185
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr "Aufruf: %s [-c] [-v0|-v1] /dev/Name [Größe in kB]\n"
+
+#: disk-utils/mkswap.c:208
+msgid "too many bad pages"
+msgstr "Zu viele beschädigte »Seiten«"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1100
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
+msgstr "Speicher ist alle"
+
+#: disk-utils/mkswap.c:239
msgid "one bad page\n"
msgstr "Eine beschädigte »Seite«\n"
-#: disk-utils/mkswap.c:236
+#: disk-utils/mkswap.c:241
#, c-format
msgid "%d bad pages\n"
msgstr "%d beschädigte »Seiten«\n"
-#: disk-utils/mkswap.c:340
+#: disk-utils/mkswap.c:345
#, 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:349
+#: disk-utils/mkswap.c:354
#, c-format
msgid "%s: error: size %ld is larger than device size %d\n"
msgstr ""
"%s: Fehler: Die angegebene Größe %ld ist größer als die des Gerätes: %d\n"
-#: disk-utils/mkswap.c:367
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr "%s: Fehler: unbekannte Version %d\n"
-#: disk-utils/mkswap.c:373
+#: disk-utils/mkswap.c:378
#, c-format
msgid "%s: error: swap area needs to be at least %ldkB\n"
msgstr "%s: Fehler: Der Swapbereich muß mindestens %ldkB groß sein\n"
-#: disk-utils/mkswap.c:392
+#: disk-utils/mkswap.c:397
#, 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:419
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -521,11 +1184,27 @@ msgstr ""
"Es wird kein Swapbereich angelegt. Wenn Sie wirklich einen Swapbereich\n"
"anlegen wollen, so benutzen Sie die -f Option.\n"
-#: disk-utils/mkswap.c:444
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr "Swapbereich Version %d mit der Größe %ld Bytes wird angelegt\n"
+#: disk-utils/mkswap.c:455
+msgid "unable to rewind swap-device"
+msgstr ""
+
+#: disk-utils/mkswap.c:458
+msgid "unable to write signature page"
+msgstr ""
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr ""
+
#: disk-utils/setfdprm.c:30
#, fuzzy, c-format
msgid "Invalid number: %s\n"
@@ -563,46 +1242,46 @@ msgid " %s [ -c | -y | -n ] dev\n"
msgstr ""
# "Unbrauchbar"
-#: fdisk/cfdisk.c:353 fdisk/cfdisk.c:1840
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr "Unbenutzbar"
-#: fdisk/cfdisk.c:355 fdisk/cfdisk.c:1842
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
msgid "Free Space"
msgstr "Freier Bereich"
-#: fdisk/cfdisk.c:358
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr "Linux ext2"
#. also Solaris
-#: fdisk/cfdisk.c:360 fdisk/i386_sys_types.c:53
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr "Linux"
-#: fdisk/cfdisk.c:363
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:369
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:380
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr "Festplatte wurde verändert.\n"
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:423
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
"Rebooten Sie das System, um sicherzustellen, daß die Partitionstabelle neu "
"gelesen wird.\n"
-#: fdisk/cfdisk.c:384
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -614,217 +1293,218 @@ msgstr ""
"oder verändert haben, dann schauen Sie bitte in die\n"
"cfdisk-manual-Seite nach weiteren Informationen\n"
-#: fdisk/cfdisk.c:479
+#: fdisk/cfdisk.c:521
msgid "FATAL ERROR"
msgstr "FATALER FEHLER"
-#: fdisk/cfdisk.c:488
+#: fdisk/cfdisk.c:530
msgid "Press any key to exit cfdisk"
msgstr "Eine Taste drücken, um cfdisk zu beenden"
-#: fdisk/cfdisk.c:524 fdisk/cfdisk.c:532
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
msgid "Cannot seek on disk drive"
msgstr "Konnte »seek()« nicht auf der Festplatte benutzen"
-#: fdisk/cfdisk.c:526
+#: fdisk/cfdisk.c:568
msgid "Cannot read disk drive"
msgstr "Konnte nicht von der Festplatte lesen"
-#: fdisk/cfdisk.c:534
+#: fdisk/cfdisk.c:576
msgid "Cannot write disk drive"
msgstr "Konnte nicht auf die Festplatte schreiben"
-#: fdisk/cfdisk.c:771
+#: fdisk/cfdisk.c:815
msgid "Too many partitions"
msgstr "Zu viele Partitionen"
-#: fdisk/cfdisk.c:776
+#: fdisk/cfdisk.c:820
msgid "Partition begins before sector 0"
msgstr "Partition fängt vor Sektor 0 an"
-#: fdisk/cfdisk.c:781
+#: fdisk/cfdisk.c:825
msgid "Partition ends before sector 0"
msgstr "Partition endet vor Sektor 0"
-#: fdisk/cfdisk.c:786
+#: fdisk/cfdisk.c:830
msgid "Partition begins after end-of-disk"
msgstr "Partition fängt hinter dem Ende der Festplatte an"
-#: fdisk/cfdisk.c:791
+#: fdisk/cfdisk.c:835
msgid "Partition ends after end-of-disk"
msgstr "Partition endet hinter dem Ende der Festplatte"
-#: fdisk/cfdisk.c:839
+#: fdisk/cfdisk.c:859
+msgid "logical partitions not in disk order"
+msgstr ""
+
+#: fdisk/cfdisk.c:862
+msgid "logical partitions overlap"
+msgstr "Logische Partitionen überlappen"
+
+#: fdisk/cfdisk.c:864
+msgid "enlarged logical partitions overlap"
+msgstr ""
+
+#: fdisk/cfdisk.c:894
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:850 fdisk/cfdisk.c:862
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
"Kann hier keine log. Part. anlegen -- eine zweite erw. müßte erzeugt werden."
-#: fdisk/cfdisk.c:1012
+#: fdisk/cfdisk.c:1067
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:1068
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr "Menü ohne Richtung, verwende horizontal."
-#: fdisk/cfdisk.c:1185
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr "Diese Taste ist hier nicht verwendbar"
-#: fdisk/cfdisk.c:1208
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Eine Taste drücken, um fortzufahren"
-#: fdisk/cfdisk.c:1255 fdisk/cfdisk.c:1811 fdisk/cfdisk.c:2334
-#: fdisk/cfdisk.c:2336
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "Primäre"
-#: fdisk/cfdisk.c:1255
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "Erzeuge eine neue primäre Partition"
-#: fdisk/cfdisk.c:1256 fdisk/cfdisk.c:1811 fdisk/cfdisk.c:2333
-#: fdisk/cfdisk.c:2336
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "Logische"
-#: fdisk/cfdisk.c:1256
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "Erzeuge eine neue logische Partition"
-#: fdisk/cfdisk.c:1257 fdisk/cfdisk.c:1310 fdisk/cfdisk.c:2023
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Abbruch"
-#: fdisk/cfdisk.c:1257 fdisk/cfdisk.c:1310
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "Erzeuge keine neue Partition"
-#: fdisk/cfdisk.c:1273
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "!!! Interner Fehler !!!"
-#: fdisk/cfdisk.c:1276
+#: fdisk/cfdisk.c:1344
msgid "Size (in MB): "
msgstr "Größe (in MB): "
-#: fdisk/cfdisk.c:1308
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "Anfang"
-#: fdisk/cfdisk.c:1308
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "Erzeuge Partition am Anfang des freien Bereiches"
-#: fdisk/cfdisk.c:1309
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "Ende"
-#: fdisk/cfdisk.c:1309
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr "Erzeuge Partition am Ende des freien Bereiches"
-#: fdisk/cfdisk.c:1327
+#: fdisk/cfdisk.c:1397
msgid "No room to create the extended partition"
msgstr "Kein Platz, um die erweiterte Partition anzulegen"
-#. probably a file or cdrom
-#: fdisk/cfdisk.c:1359
-msgid "Cannot read disk drive geometry"
-msgstr "Konnte die Festplattengeometrie nicht lesen"
-
-#: fdisk/cfdisk.c:1374
+#: fdisk/cfdisk.c:1436
msgid "Bad signature on partition table"
msgstr "Beschädigte Signatur in der Partitionstabelle"
-#: fdisk/cfdisk.c:1377
-msgid "Cannot get disk size"
-msgstr "Konnte die Größe der Festplatte nicht feststellen"
-
-#: fdisk/cfdisk.c:1395
-msgid "Cannot derive a geometry from an empty partition table"
-msgstr "Konnte die Geometrie nicht aus einer leeren Partitionstabelle ableiten"
-
-#: fdisk/cfdisk.c:1403
-msgid "Cannot derive a geometry from the partition table"
-msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
+#: fdisk/cfdisk.c:1474
+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:1436
+#: fdisk/cfdisk.c:1504
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:1438 fdisk/cfdisk.c:1622
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
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:1527
+msgid "Cannot get disk size"
+msgstr "Konnte die Größe der Festplatte nicht feststellen"
+
# "Ungültige primäre Partition"
#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1553
msgid "Bad primary partition"
msgstr "Beschädigte primäre Partition"
#. avoid snprintf
-#: fdisk/cfdisk.c:1512
+#: fdisk/cfdisk.c:1584
msgid "Bad logical partition"
msgstr "Beschädigte logische Partition"
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1699
msgid "Warning!! This may destroy data on your disk!"
msgstr "Warnung!! Dies kann Daten auf der Festplatte zerstören!"
-#: fdisk/cfdisk.c:1638
+#: fdisk/cfdisk.c:1703
msgid "Are you sure you want write the partition table to disk? (yes or no): "
msgstr ""
-"Sind Sie sicher, daß Sie die Partitionstabelle schreiben wollen? (yes/no): "
+"Sind Sie sicher, daß Sie die Partitionstabelle schreiben wollen? (ja/nein): "
-#: fdisk/cfdisk.c:1644
-#, fuzzy
+#: fdisk/cfdisk.c:1709
msgid "no"
msgstr "nein"
-#: fdisk/cfdisk.c:1645
+#: fdisk/cfdisk.c:1710
msgid "Did not write partition table to disk"
msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
-#: fdisk/cfdisk.c:1647
-#, fuzzy
+#: fdisk/cfdisk.c:1712
msgid "yes"
msgstr "ja"
-#: fdisk/cfdisk.c:1650
+#: fdisk/cfdisk.c:1715
msgid "Please enter `yes' or `no'"
-msgstr "Bitte »yes« oder »no« eingeben"
+msgstr "Bitte »ja« oder »nein« eingeben"
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1719
msgid "Writing partition table to disk..."
msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
-#: fdisk/cfdisk.c:1684 fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
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:1686
+#: fdisk/cfdisk.c:1746
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 realy correct.
-#: fdisk/cfdisk.c:1696
+#: fdisk/cfdisk.c:1756
msgid ""
"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
msgstr ""
@@ -832,84 +1512,84 @@ msgstr ""
# "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
# is too long
-#: fdisk/cfdisk.c:1754 fdisk/cfdisk.c:1872 fdisk/cfdisk.c:1964
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
-#: fdisk/cfdisk.c:1762 fdisk/cfdisk.c:1880 fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
#, c-format
msgid "Cannot open file '%s'"
msgstr "Konnte %s nicht öffnen"
-#: fdisk/cfdisk.c:1773
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Festplatte: %s\n"
-#: fdisk/cfdisk.c:1775
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr "Sektor 0:\n"
-#: fdisk/cfdisk.c:1782
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr "Sektor %d:\n"
-#: fdisk/cfdisk.c:1802
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr " Keine "
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr " Pri/Log"
-#: fdisk/cfdisk.c:1806
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr " Primäre"
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr " Logische"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1846 fdisk/fdisk.c:1059 fdisk/fdisk.c:1208
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:560
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "Unbekannt"
-#: fdisk/cfdisk.c:1852
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr "Boot (%02X)"
-#: fdisk/cfdisk.c:1854 fdisk/cfdisk.c:2342
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr "Unbekannt (%02X)"
-#: fdisk/cfdisk.c:1856
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr "Keine (%02X)"
-#: fdisk/cfdisk.c:1891 fdisk/cfdisk.c:1983
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr "Partitionstabelle von %s\n"
-#: fdisk/cfdisk.c:1893
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr " Erster Letzter\n"
-#: fdisk/cfdisk.c:1894
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
" # Typ Sektor Sektor Offset Länge Dateisystemtyp (ID) Flags\n"
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
@@ -917,472 +1597,481 @@ msgstr ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
-#: fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr " ---Anfangs---- -----End------ Start Anzahl der\n"
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:2038
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:1987
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-#: fdisk/cfdisk.c:2020
+#: fdisk/cfdisk.c:2072
#, fuzzy
msgid "Raw"
msgstr "\"Roh\""
-#: fdisk/cfdisk.c:2020
+#: fdisk/cfdisk.c:2072
#, fuzzy
msgid "Print the table using raw data format"
msgstr "Die \"rohen\" Daten der Tabelle ausgeben"
-#: fdisk/cfdisk.c:2021 fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr "Sektoren"
-#: fdisk/cfdisk.c:2021
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
-#: fdisk/cfdisk.c:2022
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr "Tabelle"
# "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2022
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr "Einfach die Tabelle ausgeben"
-#: fdisk/cfdisk.c:2023
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr "Zeige die Tabelle nicht an"
-#: fdisk/cfdisk.c:2051
-msgid "Help Screen for cfdisk "
-msgstr "Hilfe für cfdisk "
+#: fdisk/cfdisk.c:2103
+msgid "Help Screen for cfdisk"
+msgstr "Hilfe für cfdisk"
-#: fdisk/cfdisk.c:2053
+#: fdisk/cfdisk.c:2105
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:2054
+#: fdisk/cfdisk.c:2106
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:2055
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr "und zu verändern."
-#: fdisk/cfdisk.c:2057
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
+#: fdisk/cfdisk.c:2109
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
# "Befehl"
-#: fdisk/cfdisk.c:2059
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr "Kommando Bedeutung"
-#: fdisk/cfdisk.c:2060
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
msgstr "-------- ---------"
# " b Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2061
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
-msgstr " b (De)Aktiviere das bootbar-flag der aktuellen Partition"
+msgstr " b (De)Aktivieren des bootbar-flags der aktuellen Partition"
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
-msgstr " d Lösche die aktuelle Partition"
+msgstr " d Die aktuelle Partition löschen"
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr ""
-" g Ändere die Anzahl der Zylinder, Köpfe und Sektoren pro Spur"
+" g Die Anzahl der Zylinder, Köpfe und Sektoren pro Spur ändern"
-#: fdisk/cfdisk.c:2064
+#: fdisk/cfdisk.c:2116
msgid " WARNING: This option should only be used by people who"
msgstr " WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
-#: fdisk/cfdisk.c:2065
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr " werden, die wissen, was sie tun."
-#: fdisk/cfdisk.c:2066
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
-msgstr " h Zeigt diese Hilfe"
+msgstr " h Diese Hilfe anzeigen"
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
msgstr " m Maximieren der Nutzung der aktuellen Partition"
-#: fdisk/cfdisk.c:2068
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr ""
" Beachten Sie, daß dies die Partition nicht mehr kompatibel"
-#: fdisk/cfdisk.c:2069
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr " zu DOS, OS/2, ... machen kann"
-#: fdisk/cfdisk.c:2070
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
-msgstr " n Erzeuge aus dem freien Bereich eine neue Partition"
+msgstr " n Aus dem freien Bereich eine neue Partition erzeugen"
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2123
msgid " p Print partition table to the screen or to a file"
msgstr ""
-" p Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei "
-"aus"
+" p Die Partitionstab. auf dem Bildschirm oder in eine Datei "
+"ausgeben"
# "verschiedene"
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2124
msgid " There are several different formats for the partition"
msgstr " Es gibt mehrere Formate für die Partitionstabelle, aus"
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr " denen man wählen kann"
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2126
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:2075
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr " s - Tabelle nach Sektoren sortiert"
-#: fdisk/cfdisk.c:2076
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr " t - Tabelle mit den reinen Daten"
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr ""
-" q Beende das Programm ohne die Partitionstabelle zu schreiben"
+" q Das Programm beenden ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2078
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
-msgstr " t Ändere den Dateisystemtyp"
+msgstr " t Den Dateisystemtyp ändern"
-# " u Einheit der Größenanzeige ändern"
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
-msgstr " u Wechsle zwischen den Einheiten für die Größenanzeige"
+msgstr " u Einheit für die Größenanzeige ändern"
-#: fdisk/cfdisk.c:2080
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2132
+msgid " Rotates through MB, sectors and cylinders"
msgstr " Wechselt zwischen MB, Sektoren und Zylindern"
-#: fdisk/cfdisk.c:2081
+#: fdisk/cfdisk.c:2133
msgid " W Write partition table to disk (must enter upper case W)"
msgstr ""
-" W Schreibe die Partitionstabelle auf die Festplatte (großes W)"
+" W Die Partitionstabelle auf die Festplatte schreiben (großes W)"
# or "Da dieses ..." ?
-#: fdisk/cfdisk.c:2082
+#: fdisk/cfdisk.c:2134
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:2083
+#: fdisk/cfdisk.c:2135
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:2084
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr " ablehnen"
-#: fdisk/cfdisk.c:2085
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
-msgstr "Pfeil-hoch Bewege den Cursor zur vorherigen Partition"
+msgstr "Pfeil-hoch Den Cursor zur vorherigen Partition bewegen"
-#: fdisk/cfdisk.c:2086
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
-msgstr "Pfeil-runter Bewege den Cursor zur nächsten Partition"
+msgstr "Pfeil-runter Den Cursor zur nächsten Partition bewegen"
# "Strg" ?
# "Baut den Bildschirm neu auf"
-#: fdisk/cfdisk.c:2087
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr "Ctrl-L Zeichnet den Bildschirm erneut"
-#: fdisk/cfdisk.c:2088
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
-msgstr " ? Zeigt diese Hilfe"
+msgstr " ? Diese Hilfe anzeigen"
# "Hinweis"
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2142
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "Alle Kommandos können sowohl als Klein- oder Großbuchstaben"
-#: fdisk/cfdisk.c:2091
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr "eingegeben werden (außer W zum Schreiben)."
-#: fdisk/cfdisk.c:2121 fdisk/cfdisk.c:2423 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr " Zylinder"
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
-msgstr "Ändern der Anzahl der Zylinder"
+msgstr "Die Anzahl der Zylinder ändern"
-#: fdisk/cfdisk.c:2122 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "Köpfe"
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
-msgstr "Ändern der Anzahl der Köpfe"
+msgstr "Die Anzahl der Köpfe ändern"
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
-msgstr "Ändern der Anzahl der Sektoren pro Spur"
+msgstr "Die Anzahl der Sektoren pro Spur ändern"
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr "Fertig"
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr "Ändern der Geometrie beenden"
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr "Geben Sie die Anzahl der Zylinder ein: "
-#: fdisk/cfdisk.c:2144 fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
msgid "Illegal cylinders value"
msgstr "Ungültiger Wert für die Anzahl der Zylinder"
-#: fdisk/cfdisk.c:2150
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr "Geben Sie die Anzahl der Köpfe ein: "
-#: fdisk/cfdisk.c:2157 fdisk/cfdisk.c:2697
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
msgid "Illegal heads value"
msgstr "Ungültiger Wert für die Anzahl der Köpfe"
-#: fdisk/cfdisk.c:2163
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
-#: fdisk/cfdisk.c:2170 fdisk/cfdisk.c:2704
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
msgid "Illegal sectors value"
msgstr "Ungültiger Wert für die Anzahl der Sektoren"
-#: fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr "Geben Sie den Dateisystemtyp ein: "
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2348
msgid "Cannot change FS Type to empty"
msgstr "Der Dateisystemtyp kann nicht auf »leer« gesetzt werden"
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2350
msgid "Cannot change FS Type to extended"
msgstr "Der Dateisystemtyp kann nicht auf »erweitert« gesetzt werden"
-#: fdisk/cfdisk.c:2311 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "Boot"
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
msgstr "Unb(%02X)"
-#: fdisk/cfdisk.c:2316 fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
msgstr ", NC"
-#: fdisk/cfdisk.c:2324 fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
msgstr "NC"
-#: fdisk/cfdisk.c:2335
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr "Pri/Log"
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "Festplatte: %s"
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr "Größe: %lld Bytes"
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "Köpfe: %d Sektoren pro Spur: %d Zylinder: %d"
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "Name"
# I currently don't know a better translation
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "Flags"
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "Part. Typ"
-#: fdisk/cfdisk.c:2418
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "Dateisystemtyp"
-#: fdisk/cfdisk.c:2419
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr "[Bezeichner]"
-#: fdisk/cfdisk.c:2421
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr " Sektoren"
-#: fdisk/cfdisk.c:2425
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "Größe (MB)"
-#: fdisk/cfdisk.c:2480
+#: fdisk/cfdisk.c:2494
+msgid "Size (GB)"
+msgstr "Größe (GB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "Bootbar"
# "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2480
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
-msgstr "(De)Aktiviere das bootbar-flag der aktuellen Partition"
+msgstr "(De)Aktivieren des bootbar-flags der aktuellen Partition"
# "Löschen"
-#: fdisk/cfdisk.c:2481
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr "Löschen"
-#: fdisk/cfdisk.c:2481
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
-msgstr "Löscht die aktuelle Partition"
+msgstr "Die aktuelle Partition löschen"
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr "Geometrie"
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
-msgstr "Ändern der Festplattengeometrieparameter (nur für Experten)"
+msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
-#: fdisk/cfdisk.c:2483
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr "Hilfe"
-#: fdisk/cfdisk.c:2483
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
-msgstr "Zeigt die Hilfe"
+msgstr "Die Hilfe anzeigen"
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr "Maxim."
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2553
msgid "Maximize disk usage of the current partition (experts only)"
msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
-#: fdisk/cfdisk.c:2485
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr "Neue"
# "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2485
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr "Neue Partition im freiem Bereich anlegen"
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr "Ausgabe"
# "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2555
msgid "Print partition table to the screen or to a file"
msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
-#: fdisk/cfdisk.c:2487
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr "Ende"
# "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2487
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr "Typ"
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2557
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Ändere den Dateisystemtyp (DOS, Linux, OS/2, etc.)"
+msgstr "Den Dateisystemtyp (DOS, Linux, OS/2, etc.)"
# Maybe without the dot.
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr "Einheit."
# "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2558
msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Wechsle zwischen den Einheiten für die Größenanzeige (MB, Sekt., Zyl.)"
+msgstr ""
+"Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sekt., Zyl.)"
-#: fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr "Schreib."
-#: fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2559
msgid "Write partition table to disk (this might destroy data)"
msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
-#: fdisk/cfdisk.c:2536
+#: fdisk/cfdisk.c:2605
msgid "Cannot make this partition bootable"
msgstr "Diese Partition kann nicht als bootbar markiert werden"
-#: fdisk/cfdisk.c:2546
+#: fdisk/cfdisk.c:2615
msgid "Cannot delete an empty partition"
msgstr "Eine leere Partition kann nicht gelöscht werden"
-#: fdisk/cfdisk.c:2566 fdisk/cfdisk.c:2568
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
msgid "Cannot maximize this partition"
msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
-#: fdisk/cfdisk.c:2576
+#: fdisk/cfdisk.c:2645
msgid "This partition is unusable"
msgstr "Diese Partition ist unbenutzbar"
-#: fdisk/cfdisk.c:2578
+#: fdisk/cfdisk.c:2647
msgid "This partition is already in use"
msgstr "Diese Partition ist bereits in Benutzung"
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2664
msgid "Cannot change the type of an empty partition"
msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
-#: fdisk/cfdisk.c:2620 fdisk/cfdisk.c:2626
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
msgid "No more partitions"
msgstr "Keine weiteren Partitionen"
# "Ungültige Taste"
-#: fdisk/cfdisk.c:2633
+#: fdisk/cfdisk.c:2704
msgid "Illegal command"
msgstr "Unzulässiges Kommando"
-#: fdisk/cfdisk.c:2643
+#: fdisk/cfdisk.c:2714
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
#. Unfortunately, xgettext does not handle multi-line strings
#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2721
#, c-format
msgid ""
"\n"
@@ -1417,22 +2106,21 @@ msgstr ""
" the number of heads and the number of sectors/track.\n"
"\n"
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:247
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"
+"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 drives) use 2048-byte sectors\n"
msgstr ""
-"Aufruf: fdisk [-b SSZ] [-u] [Festplatte] Partitionstabelle bearbeiten\n"
-" fdisk -l [-b SSZ] [-u] [Festplatte] Partitionstabelle ausgeben\n"
-" fdisk -s Partition Größe einer Partition in "
-"Blöcken\n"
-" fdisk -v Version anzeigen\n"
+"Aufruf: fdisk [-b SSZ] [-u] Festplatte Partitionstabelle bearbeiten\n"
+" fdisk -l [-b SSZ] [-u] Festplatte Partitionstabelle ausgeben\n"
+" fdisk -s Partition Größe einer Partition in Blöcken\n"
+" fdisk -v Version anzeigen\n"
"\n"
"Festplatte ist zum Beispiel /dev/hda oder /dev/sda\n"
"Partition ist zum Beispiel /dev/hda7\n"
@@ -1440,220 +2128,234 @@ msgstr ""
"-u: Anfang und Ende werden in Sektoren statt in Zylindern angegeben\n"
"-b 2048: (bestimmte MO-Geräte) benutze 2048 Byte Sektoren\n"
-#: fdisk/fdisk.c:251
-msgid "A disk block device is needed.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:254
+#: fdisk/fdisk.c:259
msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
+"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 ""
+"Aufruf: fdisk [-l] [-b SSZ] [-u] Gerät\n"
+"Zum Beispiel: fdisk /dev/hda (die erste IDE-Festplatte)\n"
+" oder: fdisk /dev/sdc (die dritte SCSI-Festplatte)\n"
+" oder: fdisk /dev/eda (die erste PS/2 ESDI-Festplatte)\n"
+" oder: fdisk /dev/rd/c0d0\n"
+" oder: fdisk /dev/ida/c0d0 (RAID-Festplatten)\n"
+" ...\n"
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:267
#, c-format
msgid "Unable to open %s\n"
msgstr "Konnte %s nicht öffnen\n"
-#: fdisk/fdisk.c:261
+#: fdisk/fdisk.c:270
#, c-format
msgid "Unable to read %s\n"
msgstr "Konnte %s nicht lesen\n"
# "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:264
+#: fdisk/fdisk.c:273
#, c-format
msgid "Unable to seek on %s\n"
msgstr ""
-#: fdisk/fdisk.c:267
+#: fdisk/fdisk.c:276
#, c-format
msgid "Unable to write %s\n"
msgstr "Konnte %s nicht schreiben\n"
-#: fdisk/fdisk.c:270
+#: fdisk/fdisk.c:279
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:283
msgid "Unable to allocate any more memory\n"
msgstr "Konnte keinen weiteren Speicher reservieren\n"
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:285
msgid "Fatal error\n"
msgstr "Fataler Fehler\n"
-#: fdisk/fdisk.c:283 fdisk/fdisk.c:302 fdisk/fdisk.c:320 fdisk/fdisk.c:327
-#: fdisk/fdisk.c:350 fdisk/fdisk.c:368 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
msgid "Command action"
msgstr "Kommando Bedeutung"
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:297
msgid " a toggle a read only flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:285 fdisk/fdisk.c:329
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
msgid " b edit bsd disklabel"
msgstr " b »bsd disklabel« bearbeiten"
-#: fdisk/fdisk.c:286
+#: fdisk/fdisk.c:299
msgid " c toggle the mountable flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:287 fdisk/fdisk.c:306 fdisk/fdisk.c:331
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " d delete a partition"
msgstr " d Eine Partition löschen"
-#: fdisk/fdisk.c:288 fdisk/fdisk.c:307 fdisk/fdisk.c:332
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
msgid " l list known partition types"
msgstr " l Die bekannten Dateisystemtypen anzeigen"
#. sun
-#: fdisk/fdisk.c:289 fdisk/fdisk.c:308 fdisk/fdisk.c:321 fdisk/fdisk.c:333
-#: fdisk/fdisk.c:358 fdisk/fdisk.c:375 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
msgid " m print this menu"
msgstr " m Dieses Menü anzeigen"
-#: fdisk/fdisk.c:290 fdisk/fdisk.c:309 fdisk/fdisk.c:334
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
msgid " n add a new partition"
msgstr " n Eine neue Partition anlegen"
-#: fdisk/fdisk.c:291 fdisk/fdisk.c:310 fdisk/fdisk.c:322 fdisk/fdisk.c:335
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
msgid " o create a new empty DOS partition table"
msgstr " o Eine neue leere DOS Partitionstabelle anlegen"
-#: fdisk/fdisk.c:292 fdisk/fdisk.c:311 fdisk/fdisk.c:336 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:376
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
msgid " p print the partition table"
msgstr " p Die Partitionstabelle anzeigen"
-#: fdisk/fdisk.c:293 fdisk/fdisk.c:312 fdisk/fdisk.c:323 fdisk/fdisk.c:337
-#: fdisk/fdisk.c:360 fdisk/fdisk.c:377 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
msgid " q quit without saving changes"
msgstr " q Ende ohne Speichern der Änderungen"
-#: fdisk/fdisk.c:294 fdisk/fdisk.c:313 fdisk/fdisk.c:324 fdisk/fdisk.c:338
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
msgid " s create a new empty Sun disklabel"
msgstr " s Einen neuen leeren »Sun disklabel« anlegen"
#. sun
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:339
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
msgid " t change a partition's system id"
msgstr " t Den Dateisystemtyp einer Partition ändern"
-#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
msgid " u change display/entry units"
msgstr " u Die Einheit für die Anzeige/Eingabe ändern"
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:316 fdisk/fdisk.c:341 fdisk/fdisk.c:363
-#: fdisk/fdisk.c:380
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
msgid " v verify the partition table"
msgstr " v Die Partitionstabelle überprüfen"
-#: fdisk/fdisk.c:298 fdisk/fdisk.c:317 fdisk/fdisk.c:342 fdisk/fdisk.c:364
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
msgid " w write table to disk and exit"
msgstr ""
" w Die Tabelle auf die Festplatte schreiben und das Programm beenden"
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
msgid " x extra functionality (experts only)"
msgstr " x Zusätzliche Funktionen (nur für Experten)"
-#: fdisk/fdisk.c:303
+#: fdisk/fdisk.c:316
msgid " a select bootable partition"
msgstr " a Wählen der bootbaren Partition"
#. sgi flavour
-#: fdisk/fdisk.c:304
+#: fdisk/fdisk.c:317
msgid " b edit bootfile entry"
msgstr " b Bearbeiten des »bootfile«-Eintrags"
#. sgi
-#: fdisk/fdisk.c:305
+#: fdisk/fdisk.c:318
msgid " c select sgi swap partition"
msgstr " c Die sgi swap Partition auswählen"
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:341
msgid " a toggle a bootable flag"
msgstr " a (De)Aktivieren des bootbar-Flags"
-#: fdisk/fdisk.c:330
+#: fdisk/fdisk.c:343
msgid " c toggle the dos compatibility flag"
msgstr " c (De)Aktivieren des DOS Kompatibilitätsflags"
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:364
msgid " a change number of alternate cylinders"
msgstr ""
#. sun
-#: fdisk/fdisk.c:352 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
msgid " c change number of cylinders"
msgstr " c Die Anzahl der Zylinder ändern"
-#: fdisk/fdisk.c:353 fdisk/fdisk.c:371
+# XXX
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
msgid " d print the raw data in the partition table"
-msgstr ""
+msgstr " d Zeige die »raw« Daten der Partitionstabelle an"
-#: fdisk/fdisk.c:354
+#: fdisk/fdisk.c:367
msgid " e change number of extra sectors per cylinder"
msgstr ""
#. sun
-#: fdisk/fdisk.c:355 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
msgid " h change number of heads"
msgstr " h Die Anzahl der Köpfe ändern"
-#: fdisk/fdisk.c:356
+#: fdisk/fdisk.c:369
msgid " i change interleave factor"
msgstr ""
#. sun
-#: fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370
msgid " o change rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisk.c:361 fdisk/fdisk.c:378 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
msgid " r return to main menu"
msgstr " r Zurück zum Hauptmenü"
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:379
-msgid " s change number of sectors"
-msgstr " s Die Anzahl der Sektoren ändern"
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+msgid " s change number of sectors/track"
+msgstr " s Die Anzahl der Sektoren/Spur ändern"
-#: fdisk/fdisk.c:365
+#: fdisk/fdisk.c:378
msgid " y change number of physical cylinders"
msgstr ""
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:382
msgid " b move beginning of data in a partition"
-msgstr ""
+msgstr " b Den Datenanfang einer Partition verschieben"
-#: fdisk/fdisk.c:372
+# XXX - Or should this be "logical" instead of "extended" ?
+#: fdisk/fdisk.c:385
msgid " e list extended partitions"
-msgstr ""
+msgstr " e Erweiterte Partitionen anzeigen"
#. !sun
-#: fdisk/fdisk.c:373
+#: fdisk/fdisk.c:386
msgid " g create an IRIX partition table"
-msgstr ""
+msgstr " g Eine IRIX-Partitionstabelle anlegen"
-#: fdisk/fdisk.c:469
+#: fdisk/fdisk.c:482
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:483
+#: fdisk/fdisk.c:496
msgid "heads"
msgstr "Köpfe"
-#: fdisk/fdisk.c:485 fdisk/fdisk.c:893 fdisk/sfdisk.c:835
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
msgid "sectors"
msgstr "Sektoren"
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:893 fdisk/fdiskbsdlabel.c:441
-#: fdisk/sfdisk.c:835
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:442
+#: fdisk/sfdisk.c:842
msgid "cylinders"
msgstr "Zylinder"
-#: fdisk/fdisk.c:491
+#: fdisk/fdisk.c:504
#, c-format
msgid ""
"%s%s.\n"
@@ -1662,30 +2364,30 @@ msgstr ""
"%s%s.\n"
"Sie können dies im Zusatzfunktionsmenü tun.\n"
-#: fdisk/fdisk.c:492
+#: fdisk/fdisk.c:505
msgid " and "
msgstr " und "
-#: fdisk/fdisk.c:526
+#: fdisk/fdisk.c:539
msgid "Bad offset in primary extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:533
+#: fdisk/fdisk.c:546
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr ""
-#: fdisk/fdisk.c:554
+#: fdisk/fdisk.c:567
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:562
+#: fdisk/fdisk.c:575
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:588
+#: fdisk/fdisk.c:601
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"
@@ -1693,16 +2395,17 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:624
+# XXX
+#: fdisk/fdisk.c:637
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:633
+#: fdisk/fdisk.c:646
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
-#: fdisk/fdisk.c:681
+#: fdisk/fdisk.c:694
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
@@ -1710,87 +2413,87 @@ msgstr ""
"Das Gerät enthält weder eine gültige DOS-Partitionstabelle,\n"
"noch einen Sun oder »SGI disklabel«\n"
-#: fdisk/fdisk.c:697
+#: fdisk/fdisk.c:710
msgid "Internal error\n"
msgstr "Interner Fehler\n"
-#: fdisk/fdisk.c:707
+#: fdisk/fdisk.c:720
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Ignoriere die zusätzliche erweiterte Partition %d\n"
-#: fdisk/fdisk.c:714
+#: fdisk/fdisk.c:727
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
"w(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:735
+#: fdisk/fdisk.c:748
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:772
+#: fdisk/fdisk.c:785
msgid "Hex code (type L to list codes): "
msgstr "Hex code (L um eine Liste anzuzeigen): "
-#: fdisk/fdisk.c:811
+#: fdisk/fdisk.c:824
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d) [Standardwert: %d]: "
-#: fdisk/fdisk.c:865
+#: fdisk/fdisk.c:878
#, c-format
msgid "Using default value %d\n"
msgstr "Benutze den Standardwert %d\n"
-#: fdisk/fdisk.c:869
+#: fdisk/fdisk.c:882
msgid "Value out of range.\n"
msgstr "Wert außerhalb des Bereichs.\n"
-#: fdisk/fdisk.c:876
+#: fdisk/fdisk.c:889
msgid "Partition number"
msgstr "Partitionsnummer"
-#: fdisk/fdisk.c:884
+#: fdisk/fdisk.c:897
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr ""
-#: fdisk/fdisk.c:891
+#: fdisk/fdisk.c:904
msgid "cylinder"
msgstr "Zylinder"
-#: fdisk/fdisk.c:891
+#: fdisk/fdisk.c:904
msgid "sector"
msgstr "Sektor"
-#: fdisk/fdisk.c:900
+#: fdisk/fdisk.c:913
#, 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:910
+#: fdisk/fdisk.c:923
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:936
msgid "DOS Compatibility flag is set\n"
msgstr ""
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:940
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:1013
+#: fdisk/fdisk.c:1026
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Partition %d existiert noch nicht!\n"
-#: fdisk/fdisk.c:1018
+#: fdisk/fdisk.c:1031
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -1798,72 +2501,72 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1027
+#: fdisk/fdisk.c:1040
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1036
+#: fdisk/fdisk.c:1049
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1042
+#: fdisk/fdisk.c:1055
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1056
+#: fdisk/fdisk.c:1069
#, 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:1109
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1111 fdisk/fdisk.c:1119 fdisk/fdisk.c:1128 fdisk/fdisk.c:1137
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1112 fdisk/fdisk.c:1120
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1117
+#: fdisk/fdisk.c:1130
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1126
+#: fdisk/fdisk.c:1139
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1142
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1135
+#: fdisk/fdisk.c:1148
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1151
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1145
+#: fdisk/fdisk.c:1158
#, c-format
msgid ""
"\n"
@@ -1878,16 +2581,16 @@ msgstr ""
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1182
+#: fdisk/fdisk.c:1195
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s boot. Anfang Ende Blöcke Id Dateisystemtyp\n"
-#: fdisk/fdisk.c:1183 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr "Gerät"
-#: fdisk/fdisk.c:1223
+#: fdisk/fdisk.c:1236
#, c-format
msgid ""
"\n"
@@ -1898,105 +2601,107 @@ msgstr ""
"Festplatte %s: %d Köpfe, %d Sektoren, %d Zylinder\n"
"\n"
-#: fdisk/fdisk.c:1225
+# Ist "Kp" eine gute Abkürzung für "Kopf" ?
+#: fdisk/fdisk.c:1238
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
-msgstr ""
+msgstr "Nr AF Kp Sek Zyl Kp Sek Zyl Anfang Größe ID\n"
-#: fdisk/fdisk.c:1264
+#: fdisk/fdisk.c:1277
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Warnung: Partition %d enthält Sektor 0\n"
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1280
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1283
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1273
+#: fdisk/fdisk.c:1286
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1277
+#: fdisk/fdisk.c:1290
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1307
+#: fdisk/fdisk.c:1320
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1315
+#: fdisk/fdisk.c:1328
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
-#: fdisk/fdisk.c:1333
+#: fdisk/fdisk.c:1346
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Warnung: Partition %d ist leer\n"
-#: fdisk/fdisk.c:1338
+#: fdisk/fdisk.c:1351
#, 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:1344
+#: fdisk/fdisk.c:1357
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1360
#, c-format
msgid "%d unallocated sectors\n"
-msgstr ""
+msgstr "%d unbenutzte Sektoren\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
# %s can be "Sektor" or "Zylinder".
-#: fdisk/fdisk.c:1380 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr "Erster %s"
-#: fdisk/fdisk.c:1395 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
-msgstr ""
+msgstr "Sektor %d wird bereits benutzt\n"
-#: fdisk/fdisk.c:1421
+#: fdisk/fdisk.c:1440
msgid "No free sectors available\n"
-msgstr ""
+msgstr "Es sind keine freien Sektoren verfügbar\n"
-#: fdisk/fdisk.c:1431 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Letzter %s oder +Größe, +GrößeK oder +GrößeM"
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1480
#, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
msgstr "Warnung: Partition %d hat eine ungerade Anzahl an Sektoren.\n"
-#: fdisk/fdisk.c:1498 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:591
msgid "The maximum number of partitions has been created\n"
msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
-#: fdisk/fdisk.c:1508
+#: fdisk/fdisk.c:1527
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1512
+#: fdisk/fdisk.c:1531
#, c-format
msgid ""
"Command action\n"
@@ -2007,20 +2712,20 @@ msgstr ""
" %s\n"
" p Primäre Partition (1-4)\n"
-#: fdisk/fdisk.c:1514
+#: fdisk/fdisk.c:1533
msgid "l logical (5 or over)"
msgstr "l Logische Partition (5 oder größer)"
-#: fdisk/fdisk.c:1514
+#: fdisk/fdisk.c:1533
msgid "e extended"
msgstr "e Erweiterte"
-#: fdisk/fdisk.c:1531
+#: fdisk/fdisk.c:1550
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Ungültige Partitionsnummer für den Typ »%c«\n"
-#: fdisk/fdisk.c:1563
+#: fdisk/fdisk.c:1582
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2028,15 +2733,11 @@ msgstr ""
"Die Partitionstabelle wurde verändert!\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1591
msgid "Calling ioctl() to re-read partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:1582
-msgid "Syncing disks.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1587
+#: fdisk/fdisk.c:1607
#, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
@@ -2047,7 +2748,7 @@ msgstr ""
"Rebooten Sie das System, um sicherzustellen, daß die Partitionstabelle neu "
"gelesen wird.\n"
-#: fdisk/fdisk.c:1593
+#: fdisk/fdisk.c:1613
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2059,86 +2760,85 @@ msgstr ""
"oder verändert haben, dann schauen Sie bitte in die\n"
"fdisk-manual-Seite nach weiteren Informationen\n"
-#: fdisk/fdisk.c:1624
+#: fdisk/fdisk.c:1620
+msgid "Syncing disks.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1651
#, c-format
msgid "Device: %s\n"
msgstr "Gerät: %s\n"
-#: fdisk/fdisk.c:1639
+#: fdisk/fdisk.c:1666
#, c-format
msgid "Partition %d has no data area\n"
-msgstr ""
+msgstr "Partition %d hat keinen Datenbereich\n"
-#: fdisk/fdisk.c:1645
+#: fdisk/fdisk.c:1672
msgid "New beginning of data"
msgstr ""
# That sounds pretty ummm...
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1686
msgid "Expert command (m for help): "
msgstr "Expertenkommando (m für Hilfe): "
-#: fdisk/fdisk.c:1670
+#: fdisk/fdisk.c:1697
msgid "Number of cylinders"
msgstr "Anzahl der Zylinder"
-#: fdisk/fdisk.c:1691
+#: fdisk/fdisk.c:1718
msgid "Number of heads"
msgstr "Anzahl der Köpfe"
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1743
msgid "Number of sectors"
msgstr "Anzahl der Sektoren"
-#: fdisk/fdisk.c:1719
+#: fdisk/fdisk.c:1746
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
#, 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:1795
+#: fdisk/fdisk.c:1822
#, c-format
msgid "Cannot open %s\n"
msgstr "Konnte %s nicht öffnen\n"
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1887
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:1864
+#: fdisk/fdisk.c:1890
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:1985
-#, c-format
-msgid "Using %s as default device!\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:1948
msgid "Command (m for help): "
msgstr "Kommando (m für Hilfe): "
-#: fdisk/fdisk.c:2005
+#: fdisk/fdisk.c:1962
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:2007
+#: fdisk/fdisk.c:1964
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:1966
msgid "Boot file unchanged\n"
msgstr ""
-#: fdisk/fdisk.c:2069
+#: fdisk/fdisk.c:2026
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2188,11 +2888,11 @@ msgstr " l Die bekannten Dateisystemtypen anzeigen"
#: fdisk/fdiskbsdlabel.c:111
msgid " n add a new BSD partition"
-msgstr ""
+msgstr " n Eine neue BSD-Partition anlegen"
#: fdisk/fdiskbsdlabel.c:112
msgid " p print BSD partition table"
-msgstr ""
+msgstr " p Die BSD-Partitionstabelle anzeigen"
#: fdisk/fdiskbsdlabel.c:117
msgid " s show complete disklabel"
@@ -2350,98 +3050,98 @@ msgstr "Schreibe »disklabel« auf %s%d.\n"
msgid "Writing disklabel to %s.\n"
msgstr "Schreibe »disklabel« auf %s.\n"
-#: fdisk/fdiskbsdlabel.c:392
+#: fdisk/fdiskbsdlabel.c:393
#, c-format
msgid "%s%d contains no disklabel.\n"
msgstr "%s%d enthält keinen »disklabel«.\n"
-#: fdisk/fdiskbsdlabel.c:395
+#: fdisk/fdiskbsdlabel.c:396
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s enthält keinen »disklabel«.\n"
-#: fdisk/fdiskbsdlabel.c:399
+#: fdisk/fdiskbsdlabel.c:400
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Wollen Sie einen »disklabel« anlegen (y/n)? "
-#: fdisk/fdiskbsdlabel.c:438
+#: fdisk/fdiskbsdlabel.c:439
msgid "bytes/sector"
msgstr "Bytes/Sektor"
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:440
msgid "sectors/track"
msgstr "Sektoren/Spur"
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:441
msgid "tracks/cylinder"
msgstr "Spuren/Zylinder"
-#: fdisk/fdiskbsdlabel.c:448
+#: fdisk/fdiskbsdlabel.c:449
msgid "sectors/cylinder"
msgstr "Sektoren/Zylinder"
-#: fdisk/fdiskbsdlabel.c:452
+#: fdisk/fdiskbsdlabel.c:453
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:454
+#: fdisk/fdiskbsdlabel.c:455
msgid "rpm"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:456
msgid "interleave"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:457
msgid "trackskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:458
msgid "cylinderskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:459
msgid "headswitch"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:460
msgid "track-to-track seek"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:500
+#: fdisk/fdiskbsdlabel.c:501
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:526
+#: fdisk/fdiskbsdlabel.c:527
msgid "Bootstrap overlaps with disk label!\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:547
+#: fdisk/fdiskbsdlabel.c:548
#, c-format
msgid "Bootstrap installed on %s%d.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:549
+#: fdisk/fdiskbsdlabel.c:550
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:570
+#: fdisk/fdiskbsdlabel.c:571
#, c-format
msgid "Partition (a-%c): "
-msgstr ""
+msgstr "Partition (a-%c): "
-#: fdisk/fdiskbsdlabel.c:601
+#: fdisk/fdiskbsdlabel.c:602
msgid "This partition already exists.\n"
-msgstr ""
+msgstr "Diese Partition existiert bereits.\n"
-#: fdisk/fdiskbsdlabel.c:723
+#: fdisk/fdiskbsdlabel.c:724
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:769
+#: fdisk/fdiskbsdlabel.c:770
msgid ""
"\n"
"Syncing disks.\n"
@@ -2500,7 +3200,7 @@ msgid "SGI rxlvol"
msgstr "SGI rxlvol"
#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:52
+#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
msgid "Linux swap"
msgstr "Linux Swap"
@@ -2734,7 +3434,7 @@ msgstr ""
#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
msgid "Empty"
-msgstr ""
+msgstr "Leer"
#: fdisk/fdisksunlabel.c:45
msgid "SunOS root"
@@ -3017,276 +3717,294 @@ msgid "AST Windows swapfile"
msgstr "AST Windows swapfile"
#: fdisk/i386_sys_types.c:28
+msgid "Hidden Win95 FAT32"
+msgstr "Verst. Win95 FAT32"
+
+#: fdisk/i386_sys_types.c:29
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr "Verst. Win95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr "Verst. Win95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:31
msgid "NEC DOS"
msgstr "NEC DOS"
-#: fdisk/i386_sys_types.c:29
+#: fdisk/i386_sys_types.c:32
msgid "PartitionMagic recovery"
msgstr "PartitionMagic recovery"
-#: fdisk/i386_sys_types.c:30
+#: fdisk/i386_sys_types.c:33
msgid "Venix 80286"
msgstr "Venix 80286"
-#: fdisk/i386_sys_types.c:31
+#: fdisk/i386_sys_types.c:34
msgid "PPC PReP Boot"
msgstr "PPC PReP Boot"
-#: fdisk/i386_sys_types.c:32
+#: fdisk/i386_sys_types.c:35
msgid "SFS"
msgstr "SFS"
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:36
msgid "QNX4.x"
msgstr "QNX4.x"
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:37
msgid "QNX4.x 2nd part"
msgstr "QNX4.x 2nd part"
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:38
msgid "QNX4.x 3rd part"
msgstr "QNX4.x 3rd part"
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:39
msgid "OnTrack DM"
msgstr "OnTrack DM"
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:40
msgid "OnTrack DM6 Aux1"
msgstr "OnTrack DM6 Aux1"
#. (or Novell)
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:41
msgid "CP/M"
msgstr "CP/M"
#. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:42
msgid "OnTrack DM6 Aux3"
msgstr "OnTrack DM6 Aux3"
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:43
msgid "OnTrackDM6"
msgstr "OnTrackDM6"
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:44
msgid "EZ-Drive"
msgstr "EZ-Drive"
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:45
msgid "Golden Bow"
msgstr "Golden Bow"
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:46
msgid "Priam Edisk"
msgstr "Priam Edisk"
#. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:44 fdisk/i386_sys_types.c:73
-#: fdisk/i386_sys_types.c:75 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
msgid "SpeedStor"
msgstr "SpeedStor"
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:48
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:46
+#: fdisk/i386_sys_types.c:49
msgid "Novell Netware 286"
msgstr "Novell Netware 286"
-#: fdisk/i386_sys_types.c:47
+#: fdisk/i386_sys_types.c:50
msgid "Novell Netware 386"
msgstr "Novell Netware 386"
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:51
msgid "DiskSecure Multi-Boot"
msgstr "DiskSecure Multi-Boot"
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:52
msgid "PC/IX"
msgstr "PC/IX"
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:53
msgid "Old Minix"
msgstr "Old Minix"
#. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:54
msgid "Minix / old Linux"
msgstr "Minix / old Linux"
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:57
msgid "OS/2 hidden C: drive"
msgstr "OS/2 verst. C:-Lw."
-#: fdisk/i386_sys_types.c:55
+#: fdisk/i386_sys_types.c:58
msgid "Linux extended"
msgstr "Linux erweitert"
-#: fdisk/i386_sys_types.c:56 fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
msgid "NTFS volume set"
msgstr "NTFS volume set"
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:61
msgid "Amoeba"
msgstr "Amoeba"
-#: fdisk/i386_sys_types.c:59
+#: fdisk/i386_sys_types.c:62
msgid "Amoeba BBT"
msgstr "Amoeba BBT"
#. (bad block table)
-#: fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:63
msgid "IBM Thinkpad hibernation"
msgstr "IBM Thinkpad hibernation"
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:64
msgid "BSD/386"
msgstr "BSD/386"
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:65
msgid "OpenBSD"
msgstr "OpenBSD"
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:66
msgid "NeXTSTEP"
msgstr "NeXTSTEP"
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
msgid "BSDI fs"
msgstr "BSDI fs"
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
msgid "BSDI swap"
msgstr "BSDI swap"
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
msgid "DRDOS/sec (FAT-12)"
msgstr "DRDOS/sec (FAT-12)"
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
msgid "DRDOS/sec (FAT-16 < 32M)"
msgstr "DRDOS/sec (FAT-16 < 32M)"
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
msgid "DRDOS/sec (FAT-16)"
msgstr "DRDOS/sec (FAT-16)"
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
msgid "Syrinx"
msgstr "Syrinx"
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
msgid "CP/M / CTOS / ..."
msgstr "CP/M / CTOS / ..."
#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
msgid "DOS access"
msgstr "DOS access"
#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
msgid "DOS R/O"
msgstr "DOS R/O"
#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
msgid "BeOS fs"
msgstr "BeOS fs"
#. SpeedStor large partition
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
msgid "DOS secondary"
msgstr "DOS secondary"
#. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:78
+#: fdisk/i386_sys_types.c:81
+msgid "Linux raid autodetect"
+msgstr "Linux raid autodetect"
+
+#. New (2.2.x) raid partition with autodetect
+#. using persistent superblock
+#: fdisk/i386_sys_types.c:83
msgid "LANstep"
msgstr "LANstep"
#. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:84
msgid "BBT"
msgstr "BBT"
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:153
+#: fdisk/sfdisk.c:152
#, c-format
msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
msgstr ""
-#: fdisk/sfdisk.c:199
+#: fdisk/sfdisk.c:198
msgid "out of memory - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr ""
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:274
+#: fdisk/sfdisk.c:273
#, c-format
msgid "cannot open partition sector save file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:292
-#, c-format
+#: fdisk/sfdisk.c:291
+#, fuzzy, c-format
msgid "write error on %s\n"
-msgstr ""
+msgstr "Fehler beim Schreiben auf %s\n"
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, c-format
msgid "cannot stat partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
msgid "partition restore file has wrong size - not restoring\n"
msgstr ""
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:318
#, fuzzy
msgid "out of memory?\n"
msgstr "Speicher ist alle\n"
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, c-format
msgid "cannot open partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:331
+#: fdisk/sfdisk.c:330
#, fuzzy, c-format
msgid "error reading %s\n"
msgstr "Fehler beim Lesen von %s\n"
-#: fdisk/sfdisk.c:338
-#, c-format
+#: fdisk/sfdisk.c:337
+#, fuzzy, c-format
msgid "cannot open device %s for writing\n"
-msgstr ""
+msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3294,34 +4012,34 @@ msgid ""
"[Use the --force option if you really want this]\n"
msgstr ""
-#: fdisk/sfdisk.c:422
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr ""
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:428
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr ""
-#: fdisk/sfdisk.c:432
+#: fdisk/sfdisk.c:431
#, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr ""
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
"This will give problems with all software that uses C/H/S addressing.\n"
msgstr ""
-#: fdisk/sfdisk.c:438
+#: fdisk/sfdisk.c:437
#, fuzzy, c-format
msgid ""
"\n"
@@ -3331,159 +4049,133 @@ msgstr ""
"Festplatte %s: %lu Zylinder, %lu Köpfe, %lu Sektoren/Spur\n"
"\n"
-#: fdisk/sfdisk.c:518
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:523
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:528
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
"0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:567
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
msgstr ""
+"Id Name\n"
+"\n"
-#: fdisk/sfdisk.c:712
+#: fdisk/sfdisk.c:719
+#, fuzzy
msgid "Re-reading the partition table ...\n"
-msgstr ""
+msgstr "Die Partitionstabelle wird erneut gelesen ...\n"
-#: fdisk/sfdisk.c:718
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
msgstr ""
-#: fdisk/sfdisk.c:723
+#: fdisk/sfdisk.c:730
#, fuzzy, c-format
msgid "Error closing %s\n"
msgstr "Fehler beim Schließen von %s\n"
-#: fdisk/sfdisk.c:761
+#: fdisk/sfdisk.c:768
#, c-format
msgid "%s: no such partition\n"
msgstr ""
-#: fdisk/sfdisk.c:784
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:823
+#: fdisk/sfdisk.c:830
#, fuzzy, c-format
msgid "# partition table of %s\n"
msgstr "# Partitionstabelle von %s\n"
-#: fdisk/sfdisk.c:824
-#, fuzzy
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-"Einheit: Sektoren\n"
-"\n"
-
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr ""
-#: fdisk/sfdisk.c:838
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:848
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:851
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:856
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:924
-#, c-format
-msgid " start=%9lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:925
-#, c-format
-msgid ", size=%8lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:927
-#, c-format
-msgid ", Id=%2x"
-msgstr ""
-
-#: fdisk/sfdisk.c:929
-#, fuzzy
-msgid ", bootable"
-msgstr ", bootbar"
-
-#: fdisk/sfdisk.c:990
+#: fdisk/sfdisk.c:997
#, c-format
msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1004
#, c-format
msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1000
+#: fdisk/sfdisk.c:1007
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1010
+#: fdisk/sfdisk.c:1018
#, fuzzy
msgid "No partitions found\n"
msgstr "Keine Partitionen gefunden\n"
-#: fdisk/sfdisk.c:1013
+#: fdisk/sfdisk.c:1025
#, c-format
msgid ""
"Warning: The first partition looks like it was made\n"
@@ -3491,470 +4183,479 @@ msgid ""
"For this listing I'll assume that geometry.\n"
msgstr ""
-#: fdisk/sfdisk.c:1060
+#: fdisk/sfdisk.c:1075
msgid "no partition table present.\n"
msgstr ""
-#: fdisk/sfdisk.c:1062
+#: fdisk/sfdisk.c:1077
#, c-format
msgid "strange, only %d partitions defined.\n"
msgstr ""
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1086
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
msgstr ""
-#: fdisk/sfdisk.c:1074
+#: fdisk/sfdisk.c:1089
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
msgstr ""
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1092
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
msgstr ""
-#: fdisk/sfdisk.c:1088
+#: fdisk/sfdisk.c:1103
#, c-format
msgid "Warning: partition %s "
msgstr ""
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1104
#, c-format
msgid "is not contained in partition %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1100
+#: fdisk/sfdisk.c:1115
#, c-format
msgid "Warning: partitions %s "
msgstr ""
-#: fdisk/sfdisk.c:1101
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr ""
-#: fdisk/sfdisk.c:1112
+#: fdisk/sfdisk.c:1127
#, c-format
msgid "Warning: partition %s contains part of "
msgstr ""
-#: fdisk/sfdisk.c:1113
+#: fdisk/sfdisk.c:1128
#, c-format
msgid "the partition table (sector %lu),\n"
msgstr ""
-#: fdisk/sfdisk.c:1114
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr ""
-#: fdisk/sfdisk.c:1123
-#, c-format
+#: fdisk/sfdisk.c:1138
+#, fuzzy, c-format
msgid "Warning: partition %s starts at sector 0\n"
-msgstr ""
+msgstr "Warnung: Partition %d fängt bei Sektor 0 an\n"
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1142
#, c-format
msgid "Warning: partition %s extends past end of disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1141
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr ""
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr ""
-#: fdisk/sfdisk.c:1159
+#: fdisk/sfdisk.c:1174
#, fuzzy, 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:1165
+#: fdisk/sfdisk.c:1180
#, fuzzy, 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:1183
+#: fdisk/sfdisk.c:1198
+#, fuzzy
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 ""
+"Warnung: Mehr als eine primäre Partition wurde als bootbar (aktiv) "
+"markiert.\n"
+" Dies spielt bei LILO keine Rolle, aber der DOS MBR wird auf\n"
+" dieser Festplatte nicht booten.\n"
-#: fdisk/sfdisk.c:1190
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
msgstr ""
-#: fdisk/sfdisk.c:1196
+#: fdisk/sfdisk.c:1211
+#, fuzzy
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 ""
+"Warnung: Keine primäre Partition wurde als bootbar (aktiv) markiert.\n"
+" Dies spielt bei LILO keine Rolle, aber der DOS MBR wird auf\n"
+" dieser Festplatte nicht booten.\n"
-#: fdisk/sfdisk.c:1213
+#: fdisk/sfdisk.c:1228
#, c-format
msgid ""
"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1222
+#: fdisk/sfdisk.c:1237
#, c-format
msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1225
+#: fdisk/sfdisk.c:1240
#, c-format
msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1258 fdisk/sfdisk.c:1335
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, c-format
msgid "too many partitions - ignoring those past nr (%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:1273
+#: fdisk/sfdisk.c:1288
msgid "tree of partitions?\n"
msgstr ""
-#: fdisk/sfdisk.c:1377
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr ""
-#: fdisk/sfdisk.c:1384
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:1404
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1411
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1443
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1455
+#: fdisk/sfdisk.c:1470
msgid "-n flag was given: Nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:1468
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr ""
-#: fdisk/sfdisk.c:1473
+#: fdisk/sfdisk.c:1488
#, c-format
msgid "Failed writing the partition on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1550
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr ""
-#: fdisk/sfdisk.c:1586
+#: fdisk/sfdisk.c:1601
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1593
+#: fdisk/sfdisk.c:1608
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1599
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1631
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr ""
-#: fdisk/sfdisk.c:1635
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr ""
-#: fdisk/sfdisk.c:1751
+#: fdisk/sfdisk.c:1766
msgid "no room for partition descriptor\n"
msgstr ""
-#: fdisk/sfdisk.c:1784
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1835
+#: fdisk/sfdisk.c:1850
msgid "too many input fields\n"
msgstr ""
#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1869
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr ""
-#: fdisk/sfdisk.c:1888
+#: fdisk/sfdisk.c:1903
msgid "Illegal type\n"
msgstr ""
-#: fdisk/sfdisk.c:1920
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1925
+#: fdisk/sfdisk.c:1940
msgid "Warning: empty partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1939
+#: fdisk/sfdisk.c:1954
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1952
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr ""
-#: fdisk/sfdisk.c:1969 fdisk/sfdisk.c:1982
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr ""
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:2008
msgid "Extended partition not where expected\n"
msgstr ""
-#: fdisk/sfdisk.c:2025
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr ""
-#: fdisk/sfdisk.c:2047
+#: fdisk/sfdisk.c:2062
#, fuzzy
msgid "too many partitions\n"
msgstr "Zu viele Partitionen\n"
-#: fdisk/sfdisk.c:2080
+#: fdisk/sfdisk.c:2095
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:2100
+#: fdisk/sfdisk.c:2115
msgid "version"
msgstr ""
-#: fdisk/sfdisk.c:2106
+#: fdisk/sfdisk.c:2121
#, c-format
msgid "Usage: %s [options] device ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr ""
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr ""
-#: fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2124
msgid " -s [or --show-size]: list size of a partition"
msgstr ""
-#: fdisk/sfdisk.c:2110
+#: fdisk/sfdisk.c:2125
msgid " -c [or --id]: print or change partition Id"
msgstr ""
-#: fdisk/sfdisk.c:2111
+#: fdisk/sfdisk.c:2126
msgid " -l [or --list]: list partitions of each device"
msgstr ""
-#: fdisk/sfdisk.c:2112
+#: fdisk/sfdisk.c:2127
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr ""
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2128
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr ""
-#: fdisk/sfdisk.c:2114
+#: fdisk/sfdisk.c:2129
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of "
"sectors/blocks/cylinders/MB"
msgstr ""
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2130
msgid " -T [or --list-types]:list the known partition types"
msgstr ""
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2131
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr ""
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2132
msgid " -R [or --re-read]: make kernel reread partition table"
msgstr ""
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2133
msgid " -N# : change only the partition with number #"
msgstr ""
-#: fdisk/sfdisk.c:2119
+#: fdisk/sfdisk.c:2134
msgid " -n : do not actually write to disk"
msgstr ""
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2135
msgid ""
" -O file : save the sectors that will be overwritten to file"
msgstr ""
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2136
msgid " -I file : restore these sectors again"
msgstr ""
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr ""
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2138
msgid " -? [or --help]: print this message"
msgstr ""
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr ""
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2140
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr ""
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
msgstr ""
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2143
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr ""
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr ""
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr ""
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2146
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr ""
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr ""
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr ""
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr ""
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2150
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr ""
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2156
#, fuzzy
msgid "Usage:"
msgstr "Aufruf:"
-#: fdisk/sfdisk.c:2142
+#: fdisk/sfdisk.c:2157
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr ""
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2158
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2159
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr ""
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr ""
-#: fdisk/sfdisk.c:2386
+#: fdisk/sfdisk.c:2401
#, c-format
msgid "total: %d blocks\n"
msgstr ""
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2438
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr ""
-#: fdisk/sfdisk.c:2425
+#: fdisk/sfdisk.c:2440
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr ""
-#: fdisk/sfdisk.c:2427
+#: fdisk/sfdisk.c:2442
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr ""
-#: fdisk/sfdisk.c:2434
+#: fdisk/sfdisk.c:2449
msgid "can specify only one device (except with -l or -s)\n"
msgstr ""
-#: fdisk/sfdisk.c:2459
+#: fdisk/sfdisk.c:2474
#, c-format
msgid "cannot open %s %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2459
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr ""
-#: fdisk/sfdisk.c:2459
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr ""
-#: fdisk/sfdisk.c:2484
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr ""
-#: fdisk/sfdisk.c:2501
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:2504
+#: fdisk/sfdisk.c:2519
#, c-format
msgid "%s: unknown geometry\n"
msgstr ""
-#: fdisk/sfdisk.c:2520
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2597
+#: fdisk/sfdisk.c:2612
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr ""
-#: fdisk/sfdisk.c:2614 fdisk/sfdisk.c:2667 fdisk/sfdisk.c:2697
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
#, fuzzy
msgid ""
"Done\n"
@@ -3963,42 +4664,42 @@ msgstr ""
"Fertig\n"
"\n"
-#: fdisk/sfdisk.c:2623
+#: fdisk/sfdisk.c:2638
#, 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:2637
+#: fdisk/sfdisk.c:2652
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr ""
-#: fdisk/sfdisk.c:2693
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr ""
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2723
msgid "This disk is currently in use.\n"
msgstr ""
-#: fdisk/sfdisk.c:2725
+#: fdisk/sfdisk.c:2740
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2728
+#: fdisk/sfdisk.c:2743
#, c-format
msgid "Warning: %s is not a block device\n"
msgstr ""
-#: fdisk/sfdisk.c:2734
+#: fdisk/sfdisk.c:2749
msgid "Checking that no-one is using this disk right now ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2736
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -4006,66 +4707,66 @@ msgid ""
"--no-reread flag to suppress this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2755
msgid "Use the --force flag to overrule all checks.\n"
msgstr ""
-#: fdisk/sfdisk.c:2744
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr ""
-#: fdisk/sfdisk.c:2753
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2757
+#: fdisk/sfdisk.c:2772
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr ""
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2770
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
msgstr ""
-#: fdisk/sfdisk.c:2773
+#: fdisk/sfdisk.c:2788
msgid "I don't like this - probably you should answer No\n"
msgstr ""
-#: fdisk/sfdisk.c:2778
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2780
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
msgstr ""
-#: fdisk/sfdisk.c:2787
+#: fdisk/sfdisk.c:2802
msgid "Quitting - nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2808
msgid "Please answer one of y,n,q\n"
msgstr ""
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2816
msgid ""
"Successfully wrote the new partition table\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:2807
+#: fdisk/sfdisk.c:2822
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"
@@ -4073,24 +4774,23 @@ msgid ""
msgstr ""
#: games/banner.c:1048
-#, fuzzy
msgid "usage: banner [-w width]\n"
msgstr "Aufruf: banner [-w Breite]\n"
+# "Meldung"
#: games/banner.c:1068
-#, fuzzy
msgid "Message: "
msgstr "Meldung: "
#: games/banner.c:1102
-#, fuzzy, c-format
+#, c-format
msgid "The character '%c' is not in my character set"
msgstr "Das Zeichen »%c« ist nicht im Zeichensatz vorhanden"
#: games/banner.c:1110
#, c-format
msgid "Message '%s' is OK\n"
-msgstr ""
+msgstr "Meldung »%s« ist in Ordnung\n"
#: getopt-1.0.3b/getopt.c:229
#, fuzzy
@@ -4107,12 +4807,14 @@ msgid "unknown shell after -s or --shell argument"
msgstr "Unbekannte Shell als Argument von -s oder --shell"
#: getopt-1.0.3b/getopt.c:320
+#, fuzzy
msgid "Usage: getopt optstring parameters\n"
-msgstr ""
+msgstr "Aufruf: getopt Optionszeichenkette Parameter\n"
#: getopt-1.0.3b/getopt.c:321
+#, fuzzy
msgid " getopt [options] [--] optstring parameters\n"
-msgstr ""
+msgstr " getopt [Optionen] [--] Optionszeichenkette Parameter\n"
#: getopt-1.0.3b/getopt.c:322
msgid " getopt [options] -o|--options optstring [options] [--]\n"
@@ -4178,152 +4880,153 @@ msgstr "getopt (enhanced) 1.0.3\n"
msgid "internal error, contact the author."
msgstr "Interner Fehler, kontaktieren Sie den Autor."
-#: login-utils/agetty.c:300
+#: login-utils/agetty.c:306
msgid "calling open_tty\n"
msgstr ""
#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:313
+#: login-utils/agetty.c:319
msgid "calling termio_init\n"
msgstr ""
-#: login-utils/agetty.c:318
+#: login-utils/agetty.c:324
msgid "writing init string\n"
msgstr ""
#. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:328
+#: login-utils/agetty.c:334
msgid "before autobaud\n"
msgstr ""
-#: login-utils/agetty.c:340
+#: login-utils/agetty.c:346
msgid "waiting for cr-lf\n"
msgstr ""
-#: login-utils/agetty.c:344
+#: login-utils/agetty.c:350
#, c-format
msgid "read %c\n"
msgstr ""
#. Read the login name.
-#: login-utils/agetty.c:353
+#: login-utils/agetty.c:359
msgid "reading login name\n"
msgstr ""
-#: login-utils/agetty.c:374
+#: login-utils/agetty.c:380
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s: Fehler beim Ausführen von %s: %m"
-#: login-utils/agetty.c:394
+#: login-utils/agetty.c:400
msgid "can't malloc initstring"
msgstr "Konnte keinen Speicher für den »initstring« reservieren"
-#: login-utils/agetty.c:456
+#: login-utils/agetty.c:465
#, c-format
msgid "bad timeout value: %s"
msgstr ""
-#: login-utils/agetty.c:465
+#: login-utils/agetty.c:474
msgid "after getopt loop\n"
msgstr ""
-#: login-utils/agetty.c:483
+#: login-utils/agetty.c:492
msgid "exiting parseargs\n"
msgstr ""
-#: login-utils/agetty.c:496
+#: login-utils/agetty.c:505
msgid "entered parse_speeds\n"
msgstr ""
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:508
#, c-format
msgid "bad speed: %s"
-msgstr ""
+msgstr "falsche Geschwindigkeit: %s"
-#: login-utils/agetty.c:501
+#: login-utils/agetty.c:510
msgid "too many alternate speeds"
msgstr ""
-#: login-utils/agetty.c:503
+#: login-utils/agetty.c:512
msgid "exiting parsespeeds\n"
msgstr ""
-#: login-utils/agetty.c:576
+#: login-utils/agetty.c:587
#, c-format
msgid "%s: open for update: %m"
-msgstr ""
+msgstr "Konnte %s nicht zum Aktualisieren öffnen: %m"
-#: login-utils/agetty.c:592
+#: login-utils/agetty.c:605
#, c-format
msgid "%s: no utmp entry"
msgstr ""
-#: login-utils/agetty.c:621
+#: login-utils/agetty.c:634
#, c-format
msgid "/dev: chdir() failed: %m"
-msgstr ""
+msgstr "Konnte nicht in das Verzeichnis /dev wechseln: %m"
-#: login-utils/agetty.c:625
+#: login-utils/agetty.c:638
#, c-format
msgid "/dev/%s: not a character device"
-msgstr ""
+msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
+# debug
#. ignore close(2) errors
-#: login-utils/agetty.c:632
+#: login-utils/agetty.c:645
msgid "open(2)\n"
msgstr ""
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:647
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
-msgstr ""
+msgstr "Konnte /dev/%s nicht als Standardeingabe öffnen: %m"
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:657
#, c-format
msgid "%s: not open for read/write"
msgstr ""
#. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:648
+#: login-utils/agetty.c:661
msgid "duping\n"
msgstr ""
#. set up stdout and stderr
-#: login-utils/agetty.c:650
+#: login-utils/agetty.c:663
#, c-format
msgid "%s: dup problem: %m"
msgstr ""
-#: login-utils/agetty.c:712
+#: login-utils/agetty.c:733
msgid "term_io 2\n"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:915
msgid "user"
-msgstr ""
+msgstr "Benutzer"
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:915
msgid "users"
-msgstr ""
+msgstr "Benutzer"
-#: login-utils/agetty.c:982
+#: login-utils/agetty.c:1003
#, c-format
msgid "%s: read: %m"
msgstr ""
-#: login-utils/agetty.c:1028
+#: login-utils/agetty.c:1049
#, c-format
msgid "%s: input overrun"
msgstr ""
-#: login-utils/agetty.c:1152
+#: login-utils/agetty.c:1173
#, c-format
msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
-"baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] 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 ""
#: login-utils/checktty.c:46
@@ -4340,12 +5043,12 @@ msgstr ""
msgid "login: memory low, login may fail\n"
msgstr ""
-# This ends up in syslog.
+# This ends up in the syslog. Translate it?
#: login-utils/checktty.c:109
msgid "can't malloc for ttyclass"
msgstr ""
-# This ends up in syslog.
+# This ends up in the syslog. Translate it?
#: login-utils/checktty.c:131
msgid "can't malloc for grplist"
msgstr ""
@@ -4365,89 +5068,89 @@ msgstr ""
msgid "Login on %s from %s denied.\n"
msgstr ""
-#: login-utils/chfn.c:139 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
msgstr ""
-#: login-utils/chfn.c:146 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
msgstr ""
-#: login-utils/chfn.c:151 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr ""
-#: login-utils/chfn.c:163
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
msgstr ""
-#: login-utils/chfn.c:169 login-utils/chfn.c:173 login-utils/chfn.c:180
-#: login-utils/chfn.c:184 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
msgstr ""
-#: login-utils/chfn.c:193 login-utils/chsh.c:178 login-utils/login.c:650
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:684
#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
+#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
msgid "Password: "
msgstr "Passwort: "
-#: login-utils/chfn.c:196 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
msgstr ""
-#: login-utils/chfn.c:207
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
msgstr ""
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
msgstr ""
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
msgstr ""
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
msgstr ""
-#: login-utils/chfn.c:381 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
msgstr ""
-#: login-utils/chfn.c:414
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
msgstr ""
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:427
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:492
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr ""
-#: login-utils/chfn.c:495
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
msgstr ""
-#: login-utils/chfn.c:509 login-utils/chsh.c:412 sys-utils/cytune.c:324
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
#, fuzzy
msgid "malloc failed"
msgstr "»malloc« schlug fehl"
@@ -4546,17 +5249,18 @@ msgid "No known shells.\n"
msgstr ""
#: login-utils/cryptocard.c:70
+#, fuzzy
msgid "couldn't open /dev/urandom"
-msgstr ""
+msgstr "Konnte /dev/urandom nicht öffnen"
#: login-utils/cryptocard.c:75
msgid "couldn't read random data from /dev/urandom"
msgstr ""
#: login-utils/cryptocard.c:98
-#, c-format
+#, fuzzy, c-format
msgid "can't open %s for reading"
-msgstr ""
+msgstr "Konnte %s nicht zum Lesen öffnen"
#: login-utils/cryptocard.c:102
#, c-format
@@ -4578,271 +5282,279 @@ msgstr ""
msgid "Can't read %s, exiting."
msgstr ""
-#: login-utils/last.c:138
+#: login-utils/last.c:143
msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
msgstr ""
-#: login-utils/last.c:215
-#, c-format
-msgid "last: %s: "
-msgstr ""
-
-#: login-utils/last.c:270
+#: login-utils/last.c:283
msgid " still logged in"
msgstr ""
-#: login-utils/last.c:291
+#: login-utils/last.c:305
#, c-format
msgid ""
"\n"
-"wtmp begins %10.10s %5.5s \n"
+"wtmp begins %s"
msgstr ""
-#: login-utils/last.c:352 login-utils/last.c:372 login-utils/last.c:427
+#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
msgid "last: malloc failure.\n"
msgstr ""
-#: login-utils/last.c:401
+#: login-utils/last.c:416
msgid "last: gethostname"
msgstr ""
-#: login-utils/last.c:454
+#: login-utils/last.c:469
#, c-format
msgid ""
"\n"
"interrupted %10.10s %5.5s \n"
msgstr ""
-#: login-utils/login.c:349
+#: login-utils/login.c:377
msgid "login: -h for super-user only.\n"
msgstr ""
-#: login-utils/login.c:374
+#: login-utils/login.c:402
msgid "usage: login [-fp] [username]\n"
-msgstr ""
+msgstr "Aufruf: login [-fp] [Benutzername]\n"
-#: login-utils/login.c:476
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr ""
-#: login-utils/login.c:478
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr ""
-#: login-utils/login.c:518
+#. 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:519
+msgid "login: "
+msgstr "Anmeldung: "
+
+#: login-utils/login.c:552
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:520
+#: login-utils/login.c:554
msgid ""
"Login incorrect\n"
"\n"
msgstr ""
-#: login-utils/login.c:529
+#: login-utils/login.c:563
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:533
+#: login-utils/login.c:567
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:536
+#: login-utils/login.c:570
msgid ""
"\n"
"Login incorrect\n"
msgstr ""
-#: login-utils/login.c:585
+#: login-utils/login.c:619
msgid "Illegal username"
msgstr ""
-#: login-utils/login.c:628
+#: login-utils/login.c:662
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr ""
-#: login-utils/login.c:633
+#: login-utils/login.c:667
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
msgstr ""
-#: login-utils/login.c:637
+#: login-utils/login.c:671
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
msgstr ""
-#: login-utils/login.c:689
+#: login-utils/login.c:723
msgid "Login incorrect\n"
msgstr ""
-#: login-utils/login.c:711
+#: login-utils/login.c:745
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
msgstr ""
-#: login-utils/login.c:715
+#: login-utils/login.c:749
msgid "You have too many processes running.\n"
msgstr ""
-#: login-utils/login.c:761
+#: login-utils/login.c:795
msgid "Warning: no Kerberos tickets issued\n"
msgstr ""
-#: login-utils/login.c:773
+#: login-utils/login.c:807
msgid "Sorry -- your password has expired.\n"
msgstr ""
-#: login-utils/login.c:779
+#: login-utils/login.c:813
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:787
+#: login-utils/login.c:821
msgid "Sorry -- your account has expired.\n"
msgstr ""
-#: login-utils/login.c:793
+#: login-utils/login.c:827
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:1025
+#: login-utils/login.c:1061
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr ""
-#: login-utils/login.c:1032
+#: login-utils/login.c:1068
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr ""
-#: login-utils/login.c:1035
+#: login-utils/login.c:1071
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr ""
-#: login-utils/login.c:1038
+#: login-utils/login.c:1074
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr ""
-#: login-utils/login.c:1041
+#: login-utils/login.c:1077
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr ""
-#: login-utils/login.c:1052
+#: login-utils/login.c:1089
#, c-format
msgid "You have %smail.\n"
-msgstr ""
+msgstr "Sie haben %sE-Mail.\n"
-#: login-utils/login.c:1053
+#: login-utils/login.c:1090
msgid "new "
-msgstr ""
+msgstr "neue "
#. error in fork()
-#: login-utils/login.c:1071
+#: login-utils/login.c:1108
#, c-format
msgid "login: failure forking: %s"
-msgstr ""
+msgstr "login: Kann keinen neuen Prozeß erzeugen: %s"
-#: login-utils/login.c:1086
+#: login-utils/login.c:1123
msgid "setuid() failed"
msgstr ""
-#: login-utils/login.c:1092
+#: login-utils/login.c:1129
#, c-format
msgid "No directory %s!\n"
-msgstr ""
+msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
-#: login-utils/login.c:1096
+#: login-utils/login.c:1133
msgid "Logging in with home = \"/\".\n"
msgstr ""
-#: login-utils/login.c:1104
+#: login-utils/login.c:1141
msgid "login: no memory for shell script.\n"
msgstr ""
-#: login-utils/login.c:1132
+#: login-utils/login.c:1169
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr ""
-#: login-utils/login.c:1135
+#: login-utils/login.c:1172
#, c-format
msgid "login: no shell: %s.\n"
msgstr ""
-#: login-utils/login.c:1151
+#: login-utils/login.c:1188
#, c-format
msgid ""
"\n"
"%s login: "
msgstr ""
+"\n"
+"%s Anmeldung: "
-#: login-utils/login.c:1162
+#: login-utils/login.c:1199
msgid "login name much too long.\n"
msgstr ""
-#: login-utils/login.c:1163
+#: login-utils/login.c:1200
msgid "NAME too long"
msgstr ""
-#: login-utils/login.c:1170
+#: login-utils/login.c:1207
msgid "login names may not start with '-'.\n"
-msgstr ""
+msgstr "Benutzernamen dürfen nicht mit einem »-« anfangen.\n"
-#: login-utils/login.c:1180
+#: login-utils/login.c:1217
msgid "too many bare linefeeds.\n"
msgstr ""
-#: login-utils/login.c:1181
+#: login-utils/login.c:1218
msgid "EXCESSIVE linefeeds"
msgstr ""
-#: login-utils/login.c:1192
+#: login-utils/login.c:1229
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr ""
-#: login-utils/login.c:1292
+#: login-utils/login.c:1329
#, c-format
msgid "Last login: %.*s "
-msgstr ""
+msgstr "Letzte Anmeldung: %.*s "
-#: login-utils/login.c:1296
+#: login-utils/login.c:1333
#, c-format
msgid "from %.*s\n"
-msgstr ""
+msgstr "von %.*s\n"
-#: login-utils/login.c:1299
+#: login-utils/login.c:1336
#, c-format
msgid "on %.*s\n"
-msgstr ""
+msgstr "auf %.*s\n"
-#: login-utils/login.c:1322
+# This ends up in the syslog. Translate it?
+#: login-utils/login.c:1359
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1325
+# This ends up in the syslog. Translate it?
+#: login-utils/login.c:1362
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
msgstr ""
-#: login-utils/login.c:1329
+# This ends up in the syslog. Translate it?
+#: login-utils/login.c:1366
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1332
+# This ends up in the syslog. Translate it?
+#: login-utils/login.c:1369
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
msgstr ""
@@ -4857,7 +5569,7 @@ msgstr ""
#: login-utils/mesg.c:112
msgid "usage: mesg [y | n]\n"
-msgstr ""
+msgstr "Aufruf: mesg [y | n]\n"
#: login-utils/newgrp.c:67
msgid "newgrp: Who are you?"
@@ -5132,20 +5844,20 @@ msgstr ""
msgid "Cannot fork for umount, trying manually."
msgstr ""
-#: login-utils/shutdown.c:539
+#: login-utils/shutdown.c:542
#, c-format
-msgid "Cannot exec %s, trying umount."
+msgid "Cannot exec %s, trying umount.\n"
msgstr ""
-#: login-utils/shutdown.c:541
+#: login-utils/shutdown.c:546
msgid "Cannot exec umount, giving up on umount."
msgstr ""
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:551
msgid "Unmounting any remaining filesystems..."
msgstr ""
-#: login-utils/shutdown.c:582
+#: login-utils/shutdown.c:587
#, c-format
msgid "shutdown: Couldn't umount %s\n"
msgstr ""
@@ -5186,7 +5898,8 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:302 text-utils/more.c:1550
+#
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
msgid "exec failed\n"
msgstr "»exec()« schlug fehl\n"
@@ -5202,27 +5915,22 @@ msgstr ""
msgid "too many iov's (change code in wall/ttymsg.c)"
msgstr ""
-#. A slash is an attempt to break security...
-#: login-utils/ttymsg.c:85
-#, c-format
-msgid "'/' in \"%s\""
-msgstr "»%s« enthält einen »/«"
-
-#: login-utils/ttymsg.c:90
+#: login-utils/ttymsg.c:91
msgid "excessively long line arg"
msgstr ""
-#: login-utils/ttymsg.c:144
-#, fuzzy
+# This is only used, when strerror(errno) is much too long
+#: login-utils/ttymsg.c:145
msgid "cannot fork"
-msgstr "Konnte »fork()« nicht ausführen"
+msgstr "Kann keinen neuen Prozeß erzeugen"
-#: login-utils/ttymsg.c:148
+# This is used normaly
+#: login-utils/ttymsg.c:149
#, c-format
msgid "fork: %s"
-msgstr "»fork«: %s"
+msgstr "Prozeßerzeugung (fork): %s"
-#: login-utils/ttymsg.c:176
+#: login-utils/ttymsg.c:177
#, c-format
msgid "%s: BAD ERROR"
msgstr ""
@@ -5250,7 +5958,7 @@ msgstr ""
#: login-utils/vipw.c:217
#, c-format
msgid "%s: Cannot fork\n"
-msgstr ""
+msgstr "%s: Kann keinen neuen Prozeß erzeugen\n"
#: login-utils/vipw.c:257
#, c-format
@@ -5262,38 +5970,37 @@ msgstr ""
msgid "%s: no changes made\n"
msgstr ""
-#: login-utils/wall.c:100
-msgid "usage: wall [file]\n"
-msgstr "Aufruf: wall [Datei]\n"
-
-#: login-utils/wall.c:111
+#: login-utils/wall.c:103
#, c-format
-msgid "wall: cannot read %s.\n"
-msgstr "wall: Konnte %s nicht lesen.\n"
+msgid "usage: %s [file]\n"
+msgstr "Aufruf: %s [Datei]\n"
-#: login-utils/wall.c:150
-msgid "wall: can't open temporary file.\n"
-msgstr "wall: Konnte eine temporäre Datei nicht öffnen.\n"
+#: login-utils/wall.c:151
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "%s: Konnte eine temporäre Datei nicht öffnen.\n"
# XXX - Have to look at other OSs translation for Broadcast
# Message
-#: login-utils/wall.c:177
+#: login-utils/wall.c:178
#, c-format
msgid "Broadcast Message from %s@%s"
msgstr "Rundsendenachricht von %s@%s"
-#: login-utils/wall.c:187
+#: login-utils/wall.c:188
#, c-format
-msgid "wall: can't read %s.\n"
-msgstr "wall: Konnte %s nicht lesen.\n"
+msgid "%s: can't read %s.\n"
+msgstr "%s: Konnte %s nicht lesen.\n"
-#: login-utils/wall.c:212
-msgid "wall: can't stat temporary file.\n"
-msgstr "wall: Konnte »stat« nicht auf eine temporäre Datei anwenden.\n"
+#: login-utils/wall.c:213
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr "%s: Konnte »stat« nicht auf eine temporäre Datei anwenden.\n"
-#: login-utils/wall.c:221
-msgid "wall: can't read temporary file.\n"
-msgstr "wall: Konnte eine temporäre Datei nicht lesen.\n"
+#: login-utils/wall.c:222
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
#: misc-utils/cal.c:184
msgid "illegal month value: use 1-12"
@@ -5305,7 +6012,7 @@ msgstr ""
#: misc-utils/cal.c:484
msgid "usage: cal [-mjy] [[month] year]\n"
-msgstr ""
+msgstr "Aufruf: cal [-mjy] [[Monat] Jahr]\n"
#: misc-utils/ddate.c:184
#, c-format
@@ -5358,23 +6065,12 @@ msgid "logger: unknown priority name: %s.\n"
msgstr "logger: Unbekannter Prioritätsname: %s.\n"
#: misc-utils/logger.c:280
-msgid "logger: [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-"Aufruf: logger [-is] [-f Datei] [-p Pri] [-t Tag] [-u Socket] [ Meldung ... "
-"]\n"
-
-#: misc-utils/logger.c:280
msgid ""
"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr ""
"Aufruf: logger [-is] [-f Datei] [-p Pri] [-t Tag] [-u Socket] [ Meldung ... "
"]\n"
-#: misc-utils/look.c:170 misc-utils/setterm.c:1153 text-utils/more.c:1864
-#: text-utils/more.c:1875
-msgid "Out of memory"
-msgstr "Speicher ist alle"
-
#: misc-utils/look.c:340
msgid "usage: look [-dfa] [-t char] string [file]\n"
msgstr "Aufruf: look [-dfa] [-t Endzeichen] Zeichenkette [Datei]\n"
@@ -5397,7 +6093,7 @@ msgstr "namei: Konnte das aktuelle Verzeichnis nicht feststellen: %s\n"
#: misc-utils/namei.c:118
#, c-format
msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: Konnte nicht nach %s wechseln - %s (%d)\n"
+msgstr "namei: Konnte nicht in das Verzeichnis %s wechseln - %s (%d)\n"
#: misc-utils/namei.c:128
msgid "usage: namei [-mx] pathname [pathname ...]\n"
@@ -5415,7 +6111,7 @@ msgstr ""
#: misc-utils/namei.c:219
#, c-format
msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? Konnte nicht nach %s wechseln - %s (%d)\n"
+msgstr " ? Konnte nicht in das Verzeichnis %s wechseln - %s (%d)\n"
#: misc-utils/namei.c:248
#, c-format
@@ -5433,24 +6129,24 @@ msgstr ""
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr "namei: Unbekannter Dateityp 0%06o der Datei %s\n"
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
msgid "usage: script [-a] [file]\n"
msgstr "Aufruf: script [-a] [Datei]\n"
# Not realy nice...
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, 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:197
+#: misc-utils/script.c:198
#, 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:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
@@ -5459,247 +6155,227 @@ msgstr ""
"\n"
"»Script« beendet: %s"
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr "»Script« wurde beendet, die Datei ist %s\n"
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr "»openpty« ist fehlgeschlagen\n"
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
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:745
+#: misc-utils/setterm.c:713
#, c-format
msgid "%s: Argument error, usage\n"
msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:716
msgid " [ -term terminal_name ]\n"
msgstr " [ -term Terminalname ]\n"
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:717
msgid " [ -reset ]\n"
msgstr " [ -reset ]\n"
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:718
msgid " [ -initialize ]\n"
msgstr " [ -initialize ]\n"
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:719
msgid " [ -cursor [on|off] ]\n"
msgstr " [ -cursor [on|off] ]\n"
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:721
msgid " [ -snow [on|off] ]\n"
msgstr " [ -snow [on|off] ]\n"
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:722
msgid " [ -softscroll [on|off] ]\n"
msgstr " [ -softscroll [on|off] ]\n"
-#: misc-utils/setterm.c:755
-msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
-msgstr " [ -keyboard pc|olivetti|dutch|extended ]\n"
-
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:724
msgid " [ -repeat [on|off] ]\n"
msgstr " [ -repeat [on|off] ]\n"
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:725
msgid " [ -appcursorkeys [on|off] ]\n"
msgstr " [ -appcursorkeys [on|off] ]\n"
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:726
msgid " [ -linewrap [on|off] ]\n"
msgstr " [ -linewrap [on|off] ]\n"
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:727
msgid " [ -default ]\n"
msgstr " [ -default ]\n"
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:728
msgid " [ -foreground black|blue|green|cyan"
msgstr " [ -foreground black|blue|green|cyan"
-#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
msgid "|red|magenta|yellow|white|default ]\n"
msgstr "|red|magenta|yellow|white|default ]\n"
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:730
msgid " [ -background black|blue|green|cyan"
msgstr " [ -background black|blue|green|cyan"
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:732
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
+#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
+#: misc-utils/setterm.c:739
msgid "|red|magenta|yellow|white ]\n"
msgstr "|red|magenta|yellow|white ]\n"
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:734
msgid " [ -ulcolor bright blue|green|cyan"
msgstr " [ -ulcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:736
msgid " [ -hbcolor black|grey|blue|green|cyan"
msgstr " [ -hbcolor black|grey|blue|green|cyan"
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:738
msgid " [ -hbcolor bright blue|green|cyan"
msgstr " [ -hbcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:741
msgid " [ -standout [ attr ] ]\n"
msgstr " [ -standout [ Attribut ] ]\n"
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:743
msgid " [ -inversescreen [on|off] ]\n"
msgstr " [ -inversescreen [on|off] ]\n"
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:744
msgid " [ -bold [on|off] ]\n"
msgstr " [ -bold [on|off] ]\n"
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:745
msgid " [ -half-bright [on|off] ]\n"
msgstr " [ -half-bright [on|off] ]\n"
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:746
msgid " [ -blink [on|off] ]\n"
msgstr " [ -blink [on|off] ]\n"
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:747
msgid " [ -reverse [on|off] ]\n"
msgstr " [ -reverse [on|off] ]\n"
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:748
msgid " [ -underline [on|off] ]\n"
msgstr " [ -underline [on|off] ]\n"
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:749
msgid " [ -store ]\n"
msgstr " [ -store ]\n"
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:750
msgid " [ -clear [all|rest] ]\n"
msgstr " [ -clear [all|rest] ]\n"
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:751
msgid " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabN = 1-160)\n"
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:752
msgid " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabN = 1-160)\n"
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:753
msgid " [ -regtabs [1-160] ]\n"
msgstr " [ -regtabs [1-160] ]\n"
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:754
msgid " [ -blank [0-60] ]\n"
msgstr " [ -blank [0-60] ]\n"
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:755
msgid " [ -dump [1-NR_CONSOLES] ]\n"
msgstr " [ -dump [1-Anzahl_Konsolen] ]\n"
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:756
msgid " [ -append [1-NR_CONSOLES] ]\n"
msgstr " [ -append [1-Anzahl_Konsolen] ]\n"
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:757
msgid " [ -file dumpfilename ]\n"
msgstr " [ -file Dumpdateiname ]\n"
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:758
msgid " [ -msg [on|off] ]\n"
msgstr " [ -msg [on|off] ]\n"
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:759
msgid " [ -msglevel [0-8] ]\n"
msgstr " [ -msglevel [0-8] ]\n"
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:760
msgid " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
msgstr " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:761
msgid " [ -powerdown [0-60] ]\n"
msgstr " [ -powerdown [0-60] ]\n"
-#: misc-utils/setterm.c:795
+#: misc-utils/setterm.c:762
msgid " [ -blength [0-2000] ]\n"
msgstr " [ -blength [0-2000] ]\n"
-#: misc-utils/setterm.c:796
+#: misc-utils/setterm.c:763
#, fuzzy
msgid " [ -bfreq freqnumber ]\n"
msgstr " [ -bfreq Freqnummer ]\n"
-#: misc-utils/setterm.c:841
-msgid "keyboard.pc"
-msgstr ""
-
-#: misc-utils/setterm.c:844
-msgid "keyboard.olivetti"
-msgstr ""
-
-#: misc-utils/setterm.c:847
-msgid "keyboard.dutch"
-msgstr ""
-
-#: misc-utils/setterm.c:850
-msgid "keyboard.extended"
-msgstr ""
-
-#: misc-utils/setterm.c:884
+#: misc-utils/setterm.c:831
msgid "snow.on"
msgstr ""
-#: misc-utils/setterm.c:886
+#: misc-utils/setterm.c:833
msgid "snow.off"
msgstr ""
-#: misc-utils/setterm.c:892
+#: misc-utils/setterm.c:839
msgid "softscroll.on"
msgstr ""
-#: misc-utils/setterm.c:894
+#: misc-utils/setterm.c:841
msgid "softscroll.off"
msgstr ""
-#: misc-utils/setterm.c:1069
+#: misc-utils/setterm.c:1016
msgid "cannot (un)set powersave mode\n"
msgstr ""
-#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
+#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
#, c-format
msgid "klogctl error: %s\n"
msgstr "»klogctl« Fehler: %s\n"
-#: misc-utils/setterm.c:1157
+#: misc-utils/setterm.c:1104
#, c-format
msgid "Error reading %s\n"
msgstr "Fehler beim Lesen von %s\n"
-#: misc-utils/setterm.c:1172
+#: misc-utils/setterm.c:1119
msgid "Error writing screendump\n"
msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
-#: misc-utils/setterm.c:1186
+#: misc-utils/setterm.c:1133
#, c-format
msgid "couldn't read %s, and cannot ioctl dump\n"
msgstr ""
-#: misc-utils/setterm.c:1251
+#: misc-utils/setterm.c:1198
#, c-format
msgid "%s: $TERM is not defined.\n"
msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
@@ -5784,57 +6460,60 @@ 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:358
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr ""
"Konnte die Lock-Datei %s nicht anlegen: %s (benutzen Sie die -n Option, um "
"dies zu umgehen)"
-#: mount/fstab.c:370
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr ""
"Konnte keinen Link für die Lock-Datei %s anlegen: %s (benutzen Sie die -n "
"Option, um dies zu umgehen)"
-#: mount/fstab.c:382
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr ""
"Konnte die Lock-Datei %s nicht öffnen: %s (benutzen Sie die -n Option, um "
"dies zu umgehen)"
-#: mount/fstab.c:397
+# This one should be merged with the next one by using
+# error() instead of printf()
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr "Konnte die Lock-Datei %s nicht »locken«: %s\n"
-#: mount/fstab.c:408
+# sperren
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr "Konnte die Lock-Datei %s nicht »locken«: %s"
-#: mount/fstab.c:410
+#: mount/fstab.c:427
msgid "timed out"
msgstr "Zeitüberschreitung"
-#: mount/fstab.c:455 mount/fstab.c:463
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr "Konnte %s nicht öffnen (%s) - mtab nicht aktualisiert"
-#: mount/fstab.c:488
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr ""
"mount: Warnung: Das Gerät kann nicht mit einem »remount« geändert werden\n"
-#: mount/fstab.c:493
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr ""
"mount: Der Dateisystemtyp kann nicht mit einem »remount« geändert werden\n"
-#: mount/fstab.c:501 mount/fstab.c:507
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr "Fehler beim Schreiben von %s: %s"
@@ -5844,12 +6523,12 @@ msgstr "Fehler beim Schreiben von %s: %s"
# Someone suggested "Zugriffsrechte", which I currently like
# better
# XXX - search for "Modus" and you'll find a similiar message
-#: mount/fstab.c:514
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
-#: mount/fstab.c:521
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr "Konnte %s nicht in %s umbenennen: %s\n"
@@ -5862,7 +6541,7 @@ msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
#: mount/lomount.c:84
#, c-format
msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: Konnte keine Informationen über Gerät %s erhalten: %s\n"
+msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
#: mount/lomount.c:89 mount/losetup.c:74
#, c-format
@@ -5890,7 +6569,7 @@ msgid ""
" (If so, then recompile or `insmod loop.o'.)"
msgstr ""
"mount: Konnte kein »loop«-Gerät finden. Laut %s unterstützt\n"
-" dieses Kernel keine »loop«-Geräte. (wenn dies der Fall\n"
+" dieses Kernel keine »loop«-Geräte. (Wenn dies der Fall\n"
" ist, dann sollten Sie das Kernel neu kompilieren oder\n"
" »insmod loop.o« ausführen.)"
@@ -5900,26 +6579,33 @@ msgid ""
" about the loop device (then recompile or `insmod loop.o'), or\n"
" maybe /dev/loop# has the wrong major number?"
msgstr ""
+"mount: Konnte kein »loop«-Gerät finden. Vieleicht unterstützt\n"
+" dieses Kernel keine »loop«-Geräte, (wenn dies der Fall\n"
+" ist, dann sollten Sie das Kernel neu kompilieren oder\n"
+" »insmod loop.o« ausführen), Oder vieleicht hat /dev/loop#\n"
+" eine falsche Major Nummer?"
#: mount/lomount.c:160
msgid "mount: could not find any free loop device"
msgstr "mount: Konnte kein freies »loop«-Gerät finden"
+# Verschlüsselungstyp
#: mount/lomount.c:191 mount/losetup.c:106
#, c-format
msgid "Unsupported encryption type %s\n"
-msgstr "Der Verschlüsselungstyp %s wird nicht unterstützt\n"
+msgstr "Die Verschlüsselungsmethode %s wird nicht unterstützt\n"
-#: mount/lomount.c:210 mount/losetup.c:125
+#: mount/lomount.c:210 mount/losetup.c:126
msgid "Init (up to 16 hex digits): "
msgstr ""
-#: mount/lomount.c:217 mount/losetup.c:132
+# "Ziffer" ?
+#: mount/lomount.c:217 mount/losetup.c:133
#, c-format
msgid "Non-hex digit '%c'.\n"
-msgstr ""
+msgstr "Das Zeichen »%c« ist keine hexadezimale Ziffer.\n"
-#: mount/lomount.c:223 mount/losetup.c:138
+#: mount/lomount.c:223 mount/losetup.c:140
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr ""
@@ -5927,17 +6613,18 @@ msgstr ""
#: mount/lomount.c:239
#, c-format
msgid "set_loop(%s,%s,%d): success\n"
-msgstr ""
+msgstr "set_loop(%s, %s, %d): Erfolg\n"
+# this is actually an open()...
#: mount/lomount.c:250
#, c-format
msgid "loop: can't delete device %s: %s\n"
-msgstr ""
+msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
#: mount/lomount.c:260
#, c-format
msgid "del_loop(%s): success\n"
-msgstr ""
+msgstr "del_loop(%s): Erfolg\n"
#: mount/lomount.c:268
msgid "This mount was compiled without loop support. Please recompile.\n"
@@ -5945,9 +6632,10 @@ msgstr ""
#: mount/losetup.c:70
msgid "Cannot get loop info"
-msgstr ""
+msgstr "Konnte keine Informationen über das »loop«-Gerät erhalten"
-#: mount/losetup.c:174
+# Setup
+#: mount/losetup.c:176
#, c-format
msgid ""
"usage:\n"
@@ -5955,8 +6643,15 @@ msgid ""
" %s -d loop_device # delete\n"
" %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
msgstr ""
-
-#: mount/losetup.c:231
+"Aufruf:\n"
+" Informationen anzeigen:\n"
+" %s loop-Gerät\n"
+" Löschen:\n"
+" %s -d loop-Gerät\n"
+" Setup:\n"
+" %s [ -e Verschlüsselungsmethode ] [ -o Offset ] loop-Gerät Datei\n"
+
+#: mount/losetup.c:234
msgid "No loop support was available at compile time. Please recompile.\n"
msgstr ""
@@ -5964,6 +6659,7 @@ msgstr ""
#, c-format
msgid "[mntent]: warning: no final newline at the end of %s\n"
msgstr ""
+"[mntent]: Warnung: Am Ende der Datei %s fehlt ein abschließender newline.\n"
#: mount/mntent.c:216
#, c-format
@@ -5974,147 +6670,157 @@ msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
msgid "; rest of file ignored"
msgstr "; der Rest der Datei wurde ignoriert"
-#: mount/mount.c:320
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: Laut mtab ist %s schon auf %s gemountet"
-#: mount/mount.c:323
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: Laut mtab ist %s auf %s gemountet"
-#: mount/mount.c:344
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
-#: mount/mount.c:359 mount/mount.c:608
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: Fehler beim Schreiben von %s: %s"
# "Modus"
-#: mount/mount.c:366
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
-#: mount/mount.c:440
+#: mount/mount.c:473
msgid "mount failed"
msgstr "mount ist fehlgeschlagen"
-#: mount/mount.c:442
+#: mount/mount.c:475
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: Nur »root« kann %s auf %s mounten"
-#: mount/mount.c:467
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
-msgstr ""
+msgstr "mount: Das loop-Gerät wurde zweimal angegeben"
-#: mount/mount.c:473
+#: mount/mount.c:509
msgid "mount: type specified twice"
-msgstr ""
+msgstr "mount: Der Typ wurde doppelt angegeben"
-#: mount/mount.c:485
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:494
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:498
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:502
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:515
+#: mount/mount.c:551
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:565 mount/mount.c:990
+#: mount/mount.c:601 mount/mount.c:1030
#, c-format
msgid "mount: cannot fork: %s"
-msgstr "mount: Konnte »fork()« nicht ausführen: %s"
+msgstr "mount: Kann keinen neuen Prozeß erzeugen: %s"
-#: mount/mount.c:603
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: Konnte %s nicht öffnen: %s"
-#: mount/mount.c:631
+#: mount/mount.c:668
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: Der Dateisystemtyp konnte nicht festgestellt werden\n"
+" und es wurde keiner angegeben"
+
+#: mount/mount.c:671
msgid "mount: you must specify the filesystem type"
msgstr "mount: Sie müssen den Dateisystemtyp angeben"
-#: mount/mount.c:638 mount/mount.c:673
+#: mount/mount.c:678 mount/mount.c:713
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: Mountpunkt %s ist kein Verzeichnis"
-#: mount/mount.c:640
+# Look in libc.po
+# I guess "Zugriff verweigert"
+#: mount/mount.c:680
msgid "mount: permission denied"
-msgstr ""
+msgstr "mount: Zugriff verweigert"
-#: mount/mount.c:642
+#: mount/mount.c:682
msgid "mount: must be superuser to use mount"
msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:646 mount/mount.c:650
+#: mount/mount.c:686 mount/mount.c:690
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s wird gerade benutzt"
#. no
#. yes, don't mention it
-#: mount/mount.c:652
+#: mount/mount.c:692
msgid "mount: proc already mounted"
msgstr "mount: proc ist bereits gemountet"
-#: mount/mount.c:654
+#: mount/mount.c:694
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s ist bereits gemountet oder %s wird gerade benutzt"
-#: mount/mount.c:660
+#: mount/mount.c:700
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: Mountpunkt %s existiert nicht"
-#: mount/mount.c:662
+#: mount/mount.c:702
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
"mount: Mountpunkt %s ist eine symbolische Verknüpfung,\n"
" deren Ziel nicht existiert"
-#: mount/mount.c:665
+#: mount/mount.c:705
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: Gerätedatei %s existiert nicht"
-#: mount/mount.c:675
+#: mount/mount.c:715
#, c-format
msgid ""
"mount: special device %s does not exist\n"
" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:687
+#: mount/mount.c:727
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
"mount: %s ist noch nicht gemountet oder es wurden\n"
" ungültige Optionen angegeben"
-#: mount/mount.c:689
+#: mount/mount.c:729
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -6124,35 +6830,35 @@ msgstr ""
" »Superblock« von %s ist beschädigt oder es sind\n"
" zu viele Dateisysteme gemountet"
-#: mount/mount.c:704
+#: mount/mount.c:744
msgid "mount table full"
msgstr "Mounttabelle ist voll"
-#: mount/mount.c:706
+#: mount/mount.c:746
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: Konnte den Superblock nicht lesen"
-#: mount/mount.c:709
+#: mount/mount.c:749
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr "mount: %s hat eine falsche Major oder Minor Geräte-Nummer"
-#: mount/mount.c:714
+#: mount/mount.c:754
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: Der Dateisystemtyp %s wird nicht vom Kernel unterstützt"
-#: mount/mount.c:726
+#: mount/mount.c:766
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: Vielleicht meinten sie »%s«"
-#: mount/mount.c:728
+#: mount/mount.c:768
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: Vielleicht meinten Sie »iso9660«?"
-#: mount/mount.c:731
+#: mount/mount.c:771
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -6160,14 +6866,14 @@ msgstr ""
" Dateisystemtyp %s wird nicht unterstützt"
#. strange ...
-#: mount/mount.c:736
+#: mount/mount.c:776
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
"mount: %s ist kein blockorientiertes Gerät und »stat«\n"
" schlug fehl?"
-#: mount/mount.c:738
+#: mount/mount.c:778
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -6176,58 +6882,61 @@ msgstr ""
"mount: Das Kernel erkennt %s nicht als blockorientiertes\n"
" Gerät (Vielleicht hilft »insmod Treiber«?)"
-#: mount/mount.c:741
+# "versuchen"
+#: mount/mount.c:781
#, 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:744
+#: mount/mount.c:784
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s ist kein blockorientiertes Gerät"
-#: mount/mount.c:747
+#: mount/mount.c:787
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
-#: mount/mount.c:751
+#: mount/mount.c:791
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr ""
-#: mount/mount.c:767
+# That sounds somehow dumb.
+#: mount/mount.c:807
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
"mount: %s%s ist schreibgeschützt, es wird im\n"
" Nur-Lese-Modus gemountet"
-#: mount/mount.c:768
+#: mount/mount.c:808
msgid "block device "
msgstr "blockorientiertes Gerät "
-#: mount/mount.c:854
+#: mount/mount.c:894
#, c-format
msgid "mount: consider mounting %s by %s\n"
-msgstr "mount: Ziehen Sie in Betracht %s mit Hilfe von %s zu mounten\n"
+msgstr "mount: Ziehen Sie in Betracht %s mit Hilfe von »%s« zu mounten\n"
-#: mount/mount.c:855
+# I think, this should not be translated
+#: mount/mount.c:895
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:855
-#, fuzzy
+# dito
+#: mount/mount.c:895
msgid "label"
-msgstr "Bezeichner"
+msgstr "label"
-#: mount/mount.c:857 mount/mount.c:1173
+#: mount/mount.c:897 mount/mount.c:1213
msgid "mount: no such partition found"
msgstr "mount: Keine passende Partition gefunden"
-#: mount/mount.c:865
+#: mount/mount.c:905
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: Es wurde kein Typ angegeben - Auf Grund des\n"
@@ -6236,23 +6945,23 @@ msgstr ""
#.
#. * Retry in the background.
#.
-#: mount/mount.c:881
+#: mount/mount.c:921
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: »%s« wird im Hintergrund fortgesetzt\n"
# Not realy nice
-#: mount/mount.c:892
+#: mount/mount.c:932
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: »%s« schlug fehl\n"
-#: mount/mount.c:941
+#: mount/mount.c:981
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s ist bereits auf %s gemountet\n"
-#: mount/mount.c:1052
+#: mount/mount.c:1092
msgid ""
"Usage: mount [-hV]\n"
" mount -a [-nfFrsvw] [-t vfstypes]\n"
@@ -6266,30 +6975,35 @@ msgstr ""
" mount [-nfrsvw] [-t VFS-Typ] [-o Optionen] Gerät Verzeichnis\n"
" Das Gerät kann auch durch -L Label oder -U UUID angegeben werden.\n"
-#: mount/mount.c:1158
+#: mount/mount.c:1198
msgid "mount: only root can do that"
msgstr "mount: Nur »root« kann dies tun"
-#: mount/mount.c:1163
+#: mount/mount.c:1203
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s nicht gefunden - Erzeuge sie...\n"
-#: mount/mount.c:1175
+#: mount/mount.c:1215
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: Mounte %s\n"
-#: mount/mount.c:1184
+#: mount/mount.c:1224
msgid "not mounted anything"
msgstr "Es wurde nichts gemountet"
-#: mount/mount.c:1197
+# This one is for Debian
+#: mount/mount.c:1224
+msgid "not mounting anything"
+msgstr "Es wird nichts gemountet"
+
+#: mount/mount.c:1237
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: Konnte %s nicht in %s finden"
-#: mount/mount.c:1211
+#: mount/mount.c:1251
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: Konnte %s nicht in %s oder %s finden"
@@ -6298,17 +7012,22 @@ msgstr "mount: Konnte %s nicht in %s oder %s finden"
msgid "mount: bad UUID"
msgstr "mount: ungültige UUID"
-#: mount/mount_guess_fstype.c:187
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
-#: mount/mount_guess_fstype.c:190
+# Maybe: " Es wird der Typ %s ausprobiert\n"
+# or : ... "versuchen"
+#: mount/mount_guess_fstype.c:201
#, c-format
msgid " I will try type %s\n"
msgstr " Werde den Typ %s probieren\n"
-#: mount/mount_guess_fstype.c:192
+# Maybe:
+# " Es werden alle Dateisystemtypen ausprpbiert, die\n"
+# " in %s oder %s aufgelistet sind\n"
+#: mount/mount_guess_fstype.c:203
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
@@ -6409,7 +7128,7 @@ msgstr "Nicht genügend Speicher"
#: mount/sundries.c:65
msgid "bug in xstrndup call"
-msgstr ""
+msgstr "Fehler im Aufruf von xstrndup (s==NULL)"
#: mount/swapon.c:51
#, c-format
@@ -6430,19 +7149,21 @@ msgstr ""
msgid "%s on %s\n"
msgstr "%s für %s\n"
+# stat
#: mount/swapon.c:93
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: Konnte »stat« nicht auf %s anwenden: %s\n"
# "Modus"
-#: mount/swapon.c:99
+#: mount/swapon.c:100
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
msgstr ""
"swapon: Warnung: Die Zugriffsrechte (%2$04o) von %1$s sind unsicher,\n"
" 0600 wird empfohlen\n"
+# holes
#: mount/swapon.c:108
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
@@ -6453,35 +7174,36 @@ msgstr "swapon: Überspringe die Datei %s - Sie scheint »holes« zu enthalten.\n"
msgid "%s: cannot open %s: %s\n"
msgstr "%s: Konnte %s nicht öffnen: %s\n"
-#: mount/umount.c:65
+# XXX - "einkompiliert"
+#: mount/umount.c:69
msgid "umount: compiled without support for -f\n"
msgstr "umount: Die Unterstützung für -f wurde nicht einkompiliert\n"
-#: mount/umount.c:115
+#: mount/umount.c:121
#, c-format
msgid "host: %s, directory: %s\n"
msgstr "Rechner: %s, Verzeichnis: %s\n"
-#: mount/umount.c:132
+#: mount/umount.c:138
#, c-format
msgid "umount: can't get address for %s\n"
msgstr "umount: Konnte die Adresse von %s nicht herausfinden\n"
-#: mount/umount.c:137
+#: mount/umount.c:143
msgid "umount: got bad hostp->h_length\n"
msgstr ""
-#: mount/umount.c:175
+#: mount/umount.c:181
#, c-format
msgid "umount: %s: invalid block device"
-msgstr ""
+msgstr "umount: %s ist kein gültiges blockorientiertes Gerät"
-#: mount/umount.c:177
+#: mount/umount.c:183
#, c-format
msgid "umount: %s: not mounted"
msgstr "umount: %s ist nicht gemountet"
-#: mount/umount.c:179
+#: mount/umount.c:185
#, c-format
msgid "umount: %s: can't write superblock"
msgstr "umount: %s: Konnte den »Superblock« nicht schreiben"
@@ -6489,60 +7211,60 @@ msgstr "umount: %s: Konnte den »Superblock« nicht schreiben"
# XXX - I did have a better one for busy
#. Let us hope fstab has a line "proc /proc ..."
#. and not "none /proc ..."
-#: mount/umount.c:183
+#: mount/umount.c:189
#, c-format
msgid "umount: %s: device is busy"
msgstr "umount: %s: Das Gerät wird momenten noch benutzt"
-#: mount/umount.c:185
+#: mount/umount.c:191
#, c-format
msgid "umount: %s: not found"
msgstr "umount: %s: Nicht gefunden"
-#: mount/umount.c:187
+#: mount/umount.c:193
#, c-format
msgid "umount: %s: must be superuser to umount"
msgstr ""
-#: mount/umount.c:189
+#: mount/umount.c:195
#, c-format
msgid "umount: %s: block devices not permitted on fs"
msgstr ""
-#: mount/umount.c:191
+#: mount/umount.c:197
#, c-format
msgid "umount: %s: %s"
msgstr "umount: %s: %s"
-#: mount/umount.c:235
+#: mount/umount.c:241
msgid "no umount2, trying umount...\n"
msgstr ""
-#: mount/umount.c:248
+#: mount/umount.c:254
#, c-format
msgid "could not umount %s - trying %s instead\n"
msgstr ""
-#: mount/umount.c:264
+#: mount/umount.c:270
#, c-format
msgid "umount: %s busy - remounted read-only\n"
msgstr ""
-#: mount/umount.c:272
+#: mount/umount.c:278
#, c-format
msgid "umount: could not remount %s read-only\n"
msgstr ""
-#: mount/umount.c:280
+#: mount/umount.c:286
#, c-format
msgid "%s umounted\n"
msgstr ""
-#: mount/umount.c:363
+#: mount/umount.c:369
msgid "umount: cannot find list of filesystems to unmount"
msgstr ""
-#: mount/umount.c:392
+#: mount/umount.c:398
msgid ""
"Usage: umount [-hV]\n"
" umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -6552,59 +7274,57 @@ msgstr ""
" umoumt -a [-f] [-r] [-n] [-v] [-t VFS-Typen]\n"
" umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
-#: mount/umount.c:453
+#: mount/umount.c:459
msgid "umount: only root can do that"
msgstr "umount: Nur »root« kann dies tun"
-#: mount/umount.c:468
+#: mount/umount.c:474
#, c-format
msgid "Trying to umount %s\n"
msgstr "Versuche %s zu umounten\n"
-#: mount/umount.c:472
+#: mount/umount.c:478
#, c-format
msgid "Could not find %s in mtab\n"
msgstr "Konnte %s nicht in mtab finden\n"
-#: mount/umount.c:476
+#: mount/umount.c:482
#, c-format
msgid "umount: %s is not mounted (according to mtab)"
msgstr "umount: %s ist laut »mtab« nicht gemountet"
-#: mount/umount.c:478
+#: mount/umount.c:484
#, c-format
msgid "umount: it seems %s is mounted multiple times"
msgstr "umount: %s scheint mehrfach gemountet zu sein"
-#: mount/umount.c:480
+#: mount/umount.c:496
#, 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 unmounten)"
-#: mount/umount.c:486
+#: mount/umount.c:499
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr ""
-#: mount/umount.c:505
+#: mount/umount.c:520
#, c-format
msgid "umount: only root can unmount %s from %s"
msgstr "umount: Nur »root« kann %s von %s unmounten"
-#: mount/umount.c:515
+#: mount/umount.c:531
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr "umount: Nur %s kann %s von %s unmounten"
#: sys-utils/ctrlaltdel.c:26
-#, fuzzy
msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
msgstr "Nur root kann das Verhalten bei Strg-Alt-Entf ändern.\n"
#: sys-utils/ctrlaltdel.c:41
-#, fuzzy
msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Aufruf: ctrlaltdef hard|soft\n"
+msgstr "Aufruf: ctrlaltdel hard|soft\n"
#: sys-utils/cytune.c:118
#, c-format
@@ -6736,10 +7456,11 @@ msgstr ""
msgid " %f int/sec; %f rec (char/sec)\n"
msgstr ""
+# "Level"
#: sys-utils/dmesg.c:38
#, c-format
msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr ""
+msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
#: sys-utils/ipcrm.c:46
#, c-format
@@ -7291,17 +8012,6 @@ msgstr ""
msgid "pid"
msgstr ""
-#: sys-utils/kbdrate.c:139 sys-utils/kbdrate.c:271
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-msgstr ""
-"Die Tastaturwiederholrate wurde auf %.1f cps gesetzt\n"
-"Die Verzögerungszeit wurde auf %dms gesetzt\n"
-
-#: sys-utils/kbdrate.c:247
-msgid "Cannot open /dev/port"
-msgstr "Konnte /dev/port nicht öffnen"
-
#: sys-utils/rdev.c:68
msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr ""
@@ -7363,7 +8073,7 @@ msgstr ""
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr ""
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -7376,43 +8086,34 @@ msgid ""
"\t -V print version and exit\n"
msgstr ""
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
msgstr ""
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
msgstr ""
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr ""
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr ""
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
msgstr ""
-#: sys-utils/readprofile.c:221
+#: sys-utils/readprofile.c:226
msgid "total"
msgstr ""
-# This string should be merged with the next one
-#: sys-utils/renice.c:67
-msgid "usage: renice priority [ [ -p ] pids ] "
-msgstr "Aufruf: renice Priorität [[-p] PIDs ] "
-
-#: sys-utils/renice.c:68
-msgid "[ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "[[-g] PGRPs ] [[-u] Benutzernamen ]\n"
-
#: sys-utils/renice.c:67
msgid ""
"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
@@ -7447,7 +8148,7 @@ msgstr "%d: Alte Priorität: %d, neue Priorität: %d\n"
msgid "usage: %s program [arg ...]\n"
msgstr "Aufruf: %s Programm [Argument ...]\n"
-#: sys-utils/tunelp.c:76
+#: sys-utils/tunelp.c:74
#, c-format
msgid ""
"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -7455,94 +8156,94 @@ msgid ""
" -T [on|off] ]\n"
msgstr ""
-#: sys-utils/tunelp.c:92
+#: sys-utils/tunelp.c:90
msgid "malloc error"
msgstr ""
-#: sys-utils/tunelp.c:103
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
msgstr ""
-#: sys-utils/tunelp.c:142
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
-msgstr ""
+msgstr "%s: %s ist kein lp-Gerät.\n"
-#: sys-utils/tunelp.c:254
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
-msgstr ""
+msgstr "Der Status von %s ist 0x%x"
-#: sys-utils/tunelp.c:255
+#: sys-utils/tunelp.c:261
msgid ", busy"
-msgstr ""
+msgstr ", belegt"
-#: sys-utils/tunelp.c:256
+#: sys-utils/tunelp.c:262
msgid ", ready"
-msgstr ""
+msgstr ", bereit"
-#: sys-utils/tunelp.c:257
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
msgstr ""
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:264
msgid ", on-line"
-msgstr ""
+msgstr ", on-line"
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:265
msgid ", error"
-msgstr ""
+msgstr ", Fehler"
-#: sys-utils/tunelp.c:276
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
msgstr ""
-#: sys-utils/tunelp.c:282
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
msgstr ""
-#: sys-utils/tunelp.c:284
+#: sys-utils/tunelp.c:290
#, c-format
msgid "%s using polling\n"
msgstr ""
-#: text-utils/col.c:150
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
msgstr ""
-#: text-utils/col.c:511
+#: text-utils/col.c:516
msgid "usage: col [-bfx] [-l nline]\n"
msgstr ""
-#: text-utils/col.c:517
+#: text-utils/col.c:522
msgid "col: write error.\n"
msgstr ""
-#: text-utils/col.c:524
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
msgstr ""
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "past first line"
msgstr ""
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "-- line already flushed"
msgstr ""
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Aufruf: %s [ - ] [ -2 ] [ Datei ... ]\n"
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
msgstr "Zeile ist zu lang"
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Aufruf: column [-tx] [-c Spalten] [Datei ...]\n"
@@ -7560,20 +8261,12 @@ msgid ""
msgstr ""
#: text-utils/more.c:329
-msgid "usage: "
-msgstr "Aufruf: "
-
-#: text-utils/more.c:331
-msgid " [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr " [-dfln] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
-
-#: text-utils/more.c:328
#, c-format
msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
msgstr ""
"Aufruf: %s [-dfln] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
-#: text-utils/more.c:505
+#: text-utils/more.c:504
#, c-format
msgid ""
"\n"
@@ -7585,7 +8278,7 @@ msgstr ""
"\n"
#. simple ELF detection
-#: text-utils/more.c:544
+#: text-utils/more.c:543
#, c-format
msgid ""
"\n"
@@ -7596,34 +8289,34 @@ msgstr ""
"******** %s: Keine Textdatei ********\n"
"\n"
-#: text-utils/more.c:648
+#: text-utils/more.c:647
msgid "[Use q or Q to quit]"
msgstr "[Benutzen Sie q oder Q zum Beenden]"
-#: text-utils/more.c:834
+#: text-utils/more.c:833
msgid "--More--"
msgstr "--Mehr--"
-#: text-utils/more.c:836
+#: text-utils/more.c:835
#, c-format
msgid "(Next file: %s)"
msgstr "(Nächste Datei: %s)"
-#: text-utils/more.c:842
+#: text-utils/more.c:841
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[Leertaste zum Fortfahren, »q« zum Beenden.]"
-#: text-utils/more.c:1140
+#: text-utils/more.c:1139
#, c-format
msgid "...back %d page"
msgstr "... %d Seiten zurück"
-#: text-utils/more.c:1186
+#: text-utils/more.c:1185
#, c-format
msgid "...skipping %d line"
msgstr "...überspringe %d Zeilen"
-#: text-utils/more.c:1227
+#: text-utils/more.c:1226
msgid ""
"\n"
"***Back***\n"
@@ -7633,37 +8326,37 @@ msgstr ""
"***Zurück***\n"
"\n"
-#: text-utils/more.c:1265
+#: text-utils/more.c:1264
msgid "Can't open help file"
msgstr "Konnte die Hilfedatei nicht öffnen"
-#: text-utils/more.c:1286 text-utils/more.c:1290
+#: text-utils/more.c:1285 text-utils/more.c:1289
msgid "[Press 'h' for instructions.]"
msgstr "[Drücken Sie »h« für Hilfe.]"
-#: text-utils/more.c:1325
+#: text-utils/more.c:1324
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" Zeile %d"
-#: text-utils/more.c:1327
+#: text-utils/more.c:1326
#, c-format
msgid "[Not a file] line %d"
msgstr "[Keine normale Datei] Zeile %d"
-#: text-utils/more.c:1411
+#: text-utils/more.c:1410
msgid " Overflow\n"
msgstr " Überlauf\n"
-#: text-utils/more.c:1458
+#: text-utils/more.c:1457
msgid "...skipping\n"
msgstr "...Überspringe\n"
-#: text-utils/more.c:1488
+#: text-utils/more.c:1487
msgid "Regular expression botch"
msgstr "Fehler beim Ausführen von »re_exec()«"
-#: text-utils/more.c:1500
+#: text-utils/more.c:1499
msgid ""
"\n"
"Pattern not found\n"
@@ -7671,15 +8364,15 @@ msgstr ""
"\n"
"Muster wurde nicht gefunden\n"
-#: text-utils/more.c:1503
+#: text-utils/more.c:1502
msgid "Pattern not found"
msgstr "Muster wurde nicht gefunden"
-#: text-utils/more.c:1564
+#: text-utils/more.c:1563
msgid "can't fork\n"
-msgstr "Konnte »fork()« nicht ausführen\n"
+msgstr "Kann keinen neuen Prozeß erzeugen\n"
-#: text-utils/more.c:1603
+#: text-utils/more.c:1602
msgid ""
"\n"
"...Skipping "
@@ -7687,23 +8380,23 @@ msgstr ""
"\n"
"...Springe "
-#: text-utils/more.c:1607
+#: text-utils/more.c:1606
msgid "...Skipping "
msgstr "...Springe "
-#: text-utils/more.c:1608
+#: text-utils/more.c:1607
msgid "to file "
msgstr "zur Datei "
-#: text-utils/more.c:1608
+#: text-utils/more.c:1607
msgid "back to file "
msgstr "zurück zur Datei "
-#: text-utils/more.c:1847
+#: text-utils/more.c:1846
msgid "Line too long"
msgstr "Zeile ist zu lang"
-#: text-utils/more.c:1891
+#: text-utils/more.c:1890
msgid "No previous command to substitute for"
msgstr "Kein vorheriges Kommando, das eingefügt werden könnte"
@@ -7744,44 +8437,74 @@ msgid "hexdump: %%s requires a precision or a byte count.\n"
msgstr ""
#: text-utils/parse.c:503
-#, c-format
+#, fuzzy, c-format
msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: Ungültiges Format (%s)\n"
#: text-utils/parse.c:509
msgid "hexdump: bad conversion character %%%s.\n"
msgstr ""
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
msgstr "Aufruf: rev [Datei ...]\n"
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
msgstr "Aufruf: %s [ -i ] [ -t Terminalname ] Datei ...\n"
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
msgstr "Probleme beim Lesen der terminfo-Datenbank"
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
msgstr "Unbekannte Escape-Sequenz in der Eingabe: %o, %o\n"
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
msgstr "Eingabezeile ist zu lang.\n"
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
+
+#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+msgstr ""
+"Die Tastaturwiederholrate wurde auf %.1f cps gesetzt\n"
+"Die Verzögerungszeit wurde auf %dms gesetzt\n"
+
+#: kbd/kbdrate.c:247
+msgid "Cannot open /dev/port"
+msgstr "Konnte /dev/port nicht öffnen"
+
+#~ msgid "Cannot read disk drive geometry"
+#~ msgstr "Konnte die Festplattengeometrie nicht lesen"
+
+#~ msgid "Cannot derive a geometry from an empty partition table"
+#~ msgstr ""
+#~ "Konnte die Geometrie nicht aus einer leeren Partitionstabelle ableiten"
+
+#~ msgid "Cannot derive a geometry from the partition table"
+#~ msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: unbekannte Option »--%s«\n"
+
+#~ msgid "'/' in \"%s\""
+#~ msgstr "»%s« enthält einen »/«"
+
+#~ msgid "wall: cannot read %s.\n"
+#~ msgstr "wall: Konnte %s nicht lesen.\n"
diff --git a/po/fr.po b/po/fr.po
index fe22e52ee..c26f86fda 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,7 @@
# cfdisk.po
# Copyright (C) 1999 Les Logiciels du Soleil
# Vincent Renardias <vincent@ldsol.com>, 1999.
+# Martin Quinson <mquinson@zeppelin-cb.de>, 1999.
#
# Permission is granted to copy and distribute this file and
# modified versions of this file provided this header is not removed.
@@ -8,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux VERSION\n"
-"POT-Creation-Date: 1999-03-20 12:27-0300\n"
+"POT-Creation-Date: 1999-11-03 11:39+0100\n"
"PO-Revision-Date: 1999-01-23 19:17+0100\n"
"Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
"Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -16,15 +17,580 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: disk-utils/fdformat.c:33
+#: clock/cmos.c:146
+msgid "booted from MILO\n"
+msgstr "amorçé ŕ partir de MILO\n"
+
+#: clock/cmos.c:154
+msgid "Ruffian BCD clock\n"
+msgstr "Horloge Ruffian BCD\n"
+
+#: clock/cmos.c:170
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "port horloge ajusté ŕ 0x%x\n"
+
+#: clock/cmos.c:180
+#, where TOY stands for time-of-year
+msgid "funky TOY!\n"
+msgstr "JOUET bizarre!\n"
+
+#: clock/cmos.c:234
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr ""
+
+#: clock/cmos.c:558
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Impossible d'ouvrir /dev/port: %s"
+
+#: clock/cmos.c:565
+msgid "I failed to get permission because I didnt try.\n"
+msgstr "J'ai pas réussi ŕ obtenir l'autorisation parce que j'ai pas essayé.\n"
+
+#: clock/cmos.c:568
+#, c-format
+msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
+msgstr "%s ne peux accéder au port d'E/S : l'appel a iopl(3) a échoué.\n"
+
+#: clock/cmos.c:571
+msgid "Probably you need root privileges.\n"
+msgstr "Vous avez probablement besoin des priviléges de root.\n"
+
+#: clock/hwclock.c:213
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr ""
+
+#: clock/hwclock.c:214 clock/hwclock.c:303
+msgid "UTC"
+msgstr "UTC"
+
+#: clock/hwclock.c:214 clock/hwclock.c:302
+msgid "local"
+msgstr "local"
+
+#: clock/hwclock.c:286
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr ""
+
+#: clock/hwclock.c:288
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr ""
+
+#: clock/hwclock.c:297
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr ""
+"Le dernier ajustement du facteur de dérive effectué %d secondes aprčs 1969\n"
+
+#: clock/hwclock.c:299
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr "Dernier calibrage effectué %d secondes aprčs 1969\n"
+
+#: clock/hwclock.c:301
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr ""
+
+#: clock/hwclock.c:303
+msgid "unknown"
+msgstr "inconnu"
+
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop. The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:325
+msgid "Waiting for clock tick...\n"
+msgstr ""
+
+#: clock/hwclock.c:329
+msgid "...got clock tick\n"
+msgstr ""
+
+#: clock/hwclock.c:381
+#, c-format
+msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Valeurs non valides dans l'horloge matérielle : %2d/%.2d/%.2d "
+"%.2d:%.2d:%.2d\n"
+
+#: clock/hwclock.c:390
+#, c-format
+msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+"Heure ŕ l'horloge matérielle : %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
+
+#: clock/hwclock.c:416
+#, c-format
+msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgstr "Heure lue ŕ l'horloge matérielle : %02d:%02d:%02d\n"
+
+#: clock/hwclock.c:442
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+"Réglage de l'horloge matérielle ŕ %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
+
+#: clock/hwclock.c:448
+msgid "Clock not changed - testing only.\n"
+msgstr "Horloge non modifiée. Seulement un test.\n"
+
+#: clock/hwclock.c:496
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+
+#: clock/hwclock.c:520
+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 ""
+"L'horloge matérielle contient soit des valeurs invalides (comme le 50ičme "
+"jour du mois) ou en dehors de l'intervale que nous pouvons gérer (comme "
+"l'année 2095).\n"
+
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end. We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:532
+#, c-format
+msgid "%s %.6f seconds\n"
+msgstr "%s %.6f secondes\n"
+
+#: clock/hwclock.c:566
+msgid "No --date option specified.\n"
+msgstr "Pas d'option --date spécifiée.\n"
+
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:571
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+
+#: clock/hwclock.c:577
+#, fuzzy, c-format
+msgid "Issuing date command: %s\n"
+msgstr "réponse de la commande date = %s\n"
+
+#: clock/hwclock.c:581
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
+"Impossible de lancer le programme 'date' dans le shell /bin/sh. popen() a "
+"échoué"
+
+#: clock/hwclock.c:587
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "réponse de la commande date = %s\n"
+
+#: clock/hwclock.c:589
+#, 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 ""
+"La commande date lancée par %s a retourné des résultats inattendus.\\n\n"
+"La commande était :\n"
+" %s\n"
+"Le résultat était :\n"
+" %s\n"
+
+#: clock/hwclock.c:598
+#, c-format
+msgid ""
+"The date command issued by %s returnedsomething other than an integer where "
+"the convertedtime value was expected.\n"
+"The command was:\n"
+" %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+"La commande date lancée par %s n'a pas retourné de valeur entičre lŕ oů "
+"j'attendais l'heure convertie.\n"
+"La commande était :\n"
+" %s\n"
+"Le résultat était :\n"
+" %s\n"
+
+#: clock/hwclock.c:608
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr "La chaine de date %s équivaut ŕ %d secondes depuis 1969.\n"
+
+#: clock/hwclock.c:643
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"L'horloge matérielle ne contient pas d'heure valide. On ne peut donc pas "
+"rčgler l'horloge systčme ŕ partir d'elle.\n"
+
+#: clock/hwclock.c:659
+msgid "Calling settimeofday:\n"
+msgstr "Appel de settimeofday :\n"
+
+#: clock/hwclock.c:660
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr " tv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: clock/hwclock.c:662
+#, c-format
+msgid "\ttz.tz_minuteswest = %ld\n"
+msgstr " tz.tz_minuteswest = %ld\n"
+
+#: clock/hwclock.c:665
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+"L'heure du systčme n'a pas été modifiée car nous sommes en mode test.\n"
+
+#: clock/hwclock.c:677
+msgid "Must be superuser to set system clock.\n"
+msgstr "Vous devez ętre root pour changer l'heure du systčme.\n"
+
+#: clock/hwclock.c:679
+msgid "settimeofday() failed"
+msgstr "settimeofday() a échoué"
+
+#: clock/hwclock.c:712
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"Pas de modification du facteur de dérive car l'horloge matérielle contient "
+"des déchets.\n"
+
+#: clock/hwclock.c:716
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Le facteur de dérive n'a pas été modifié car la derničre modification date "
+"de moins d'un jour.\n"
+
+#: clock/hwclock.c:725
+#, c-format
+msgid ""
+"Clock drifted %d 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 ""
+"L'horloge a dérivé de %d secondes durant les %d derničres secondes, malgré "
+"le facteur de dérive de %f secondes par jour.\n"
+"J'ajuste le facteur de dérive ŕ %f secondes par jour\n"
+
+#: clock/hwclock.c:776
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "Il s'est écoulé %d secondes depuis le dernier ajustement\n"
+
+#: clock/hwclock.c:778
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
+"Il faut ajouter %d secondes, et se referrer %.6f secondes dans le passé\n"
+
+#: clock/hwclock.c:807
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "Adjtime non modifié en mode test.\n"
+
+#: clock/hwclock.c:808
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+
+#: clock/hwclock.c:832
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Facteur de dérive non modifié.\n"
+
+#: clock/hwclock.c:873
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"L'horloge matérielle ne contient pas d'heure valide, on ne peut donc pas "
+"l'ajuster.\n"
+
+#: clock/hwclock.c:897
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+"L'ajustement nécessaire est inférieur ŕ une seconde, pas de changement "
+"effectué.\n"
+
+#: clock/hwclock.c:923
+#, c-format
+msgid "Using %s.\n"
+msgstr "J'utilise %s.\n"
+
+#: clock/hwclock.c:925
+msgid "No usable clock interface found.\n"
+msgstr "Aucune interface interface avec l'horologe utilisable trouvée.\n"
+
+#: clock/hwclock.c:1020
+msgid "Unable to set system clock.\n"
+msgstr "Impossible de modifier l'horloge du systeme\n"
+
+#: clock/hwclock.c:1049
+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 ""
+"Le noyau utilise un format pour l'horloge matérielle adapté aux machines "
+"Alpha.\n"
+"Cette version de hwclock a été compilé pour une autre architecture que "
+"Alpha\n"
+"(et donc ne s'execute sans doute pas sur un Alpha). Aucune action "
+"entreprise.\n"
+
+#: clock/hwclock.c:1058
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1060
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr ""
+
+#: clock/hwclock.c:1063
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+
+#: clock/hwclock.c:1066
+#, fuzzy, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Horloge non modifiée. Seulement un test.\n"
+
+#: clock/hwclock.c:1069
#, fuzzy
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Impossible de modifier l'horloge du systeme\n"
+
+#: clock/hwclock.c:1151
+#, c-format
+msgid "%s takes no non-option arguments. You supplied %d.\n"
+msgstr "L'option %s ne prend pas d'argument. Cependant, vous avez donné %d.\n"
+
+#: clock/hwclock.c:1159
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+
+#: clock/hwclock.c:1165
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive. You specified "
+"both.\n"
+msgstr ""
+
+#: clock/hwclock.c:1178
+#, fuzzy
+msgid "No usable set-to time. Cannot set clock.\n"
+msgstr "Impossible de modifier l'horloge du systeme\n"
+
+#: clock/hwclock.c:1193
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1197
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1213
+msgid ""
+"Cannot access the Hardware Clock via any known method. Use --debug option "
+"to see the details of our search for an access method.\n"
+msgstr ""
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr ""
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr ""
+
+#: clock/kd.c:65 clock/rtc.c:144
+msgid "Timed out waiting for time change.\n"
+msgstr ""
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr ""
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from /dev/tty1"
+msgstr ""
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr ""
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr ""
+
+#: clock/kd.c:161
+msgid "Can't open /dev/tty1"
+msgstr "Impossible d'ouvrir /dev/tty1"
+
+#: clock/rtc.c:98
+msgid "ioctl() to /dev/rtc to read the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:129
+msgid "Waiting in loop for time from /dev/rtc to change\n"
+msgstr ""
+
+#: clock/rtc.c:165 clock/rtc.c:222
+msgid "open() of /dev/rtc failed"
+msgstr ""
+
+#. This rtc device doesn't have interrupt functions. This is typical
+#. on an Alpha, where the Hardware Clock interrupts are used by the
+#. kernel for the system clock, so aren't at the user's disposal.
+#.
+#: clock/rtc.c:182
+msgid "/dev/rtc does not have interrupt functions. "
+msgstr ""
+
+#: clock/rtc.c:191
+msgid "read() to /dev/rtc to wait for clock tick failed"
+msgstr ""
+
+#: clock/rtc.c:199
+msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+msgstr ""
+
+#: clock/rtc.c:202
+msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+msgstr ""
+
+#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
+msgid "Unable to open /dev/rtc"
+msgstr "Impossible d'ouvrir /dev/rtc"
+
+#: clock/rtc.c:268
+msgid "ioctl() to /dev/rtc to set the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:272
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr ""
+
+#: clock/rtc.c:302
+msgid "Open of /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:320 clock/rtc.c:365
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file /dev/rtc. This file does not "
+"exist on this system.\n"
+msgstr ""
+
+#: clock/rtc.c:331
+msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:337
+#, c-format
+msgid "we have read epoch %ld from /dev/rtc 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.
+#: clock/rtc.c:357
+#, c-format
+msgid "The epoch value may not be less than 1900. You requested %ld\n"
+msgstr ""
+
+#: clock/rtc.c:374
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgstr ""
+
+#: clock/rtc.c:379
+msgid ""
+"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
+"ioctl.\n"
+msgstr ""
+
+#: clock/rtc.c:382
+msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+msgstr ""
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr "nombre invalide `%s'\n"
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr ""
+
+#: clock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr ""
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:33
msgid "Formatting ... "
-msgstr "Vérification en cours ... "
+msgstr "Formatage en cours ... "
#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
-#, fuzzy
msgid "done\n"
-msgstr "Terminé"
+msgstr "terminé\n"
#: disk-utils/fdformat.c:62
msgid "Verifying ... "
@@ -32,7 +598,7 @@ msgstr "Vérification en cours ... "
#: disk-utils/fdformat.c:73
msgid "Read: "
-msgstr "Lecture: "
+msgstr "Lecture : "
#: disk-utils/fdformat.c:75
#, c-format
@@ -60,244 +626,372 @@ msgstr "%s: n'est pas un lecteur de disquettes\n"
#: disk-utils/fdformat.c:128
msgid "Could not determine current format type"
-msgstr ""
+msgstr "Impossible de déterminer le type du format courant"
#: disk-utils/fdformat.c:129
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr ""
+msgstr "%s-faces, %d pistes, %d sec/piste. Capacité totale %d kB.\n"
#: disk-utils/fdformat.c:130
-#, fuzzy
msgid "Double"
-msgstr "Terminé"
+msgstr "Double"
#: disk-utils/fdformat.c:130
msgid "Single"
-msgstr ""
+msgstr "Simple"
+
+#: disk-utils/fsck.minix.c:198
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "usage : %s [ -larvsmf ] /dev/nom\n"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr "%s est monté.\t "
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr "Voulez-vous vraiment continuer"
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr "vérification intérompue.\n"
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
-msgstr ""
+msgstr "Enlever bloc"
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
+#, fuzzy
msgid "Read error: unable to seek to block in file '"
-msgstr ""
+msgstr "Erreur d'écriture: mauvais block dans le fichier '"
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
+#, fuzzy
msgid "Read error: bad block in file '"
-msgstr ""
+msgstr "Erreur d'écriture: mauvais block dans le fichier '"
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
msgstr ""
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+#, fuzzy
+msgid "seek failed in write_block"
+msgstr "la recherche dans write_tables a échoué"
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
msgstr "Erreur d'écriture: mauvais block dans le fichier '"
+#: disk-utils/fsck.minix.c:513
+#, fuzzy
+msgid "seek failed in write_super_block"
+msgstr "la recherche dans write_tables a échoué"
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr "impossible d'écrire les super-blocs"
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr "impossible d'écrire la table des inodes"
+
+#: disk-utils/fsck.minix.c:527
+#, fuzzy
+msgid "Unable to write zone map"
+msgstr "impossible d'écrire la table des zones"
+
+#: disk-utils/fsck.minix.c:529
+#, fuzzy
+msgid "Unable to write inodes"
+msgstr "imossible d'écrire la table des inodes"
+
+#: disk-utils/fsck.minix.c:558
+#, fuzzy
+msgid "seek failed"
+msgstr "settimeofday() a échoué"
+
+#: disk-utils/fsck.minix.c:560
+#, fuzzy
+msgid "unable to read super block"
+msgstr "impossible d'écrire les super-blocs"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:593
+#, fuzzy
+msgid "Unable to allocate buffer for inode map"
+msgstr "Impossible d'allouer le buffer.\n"
+
+#: disk-utils/fsck.minix.c:601
+#, fuzzy
+msgid "Unable to allocate buffer for inodes"
+msgstr "Impossible d'allouer le buffer.\n"
+
+#: disk-utils/fsck.minix.c:604
+#, fuzzy
+msgid "Unable to allocate buffer for inode count"
+msgstr "Impossible d'allouer le buffer.\n"
+
#: disk-utils/fsck.minix.c:607
+#, fuzzy
+msgid "Unable to allocate buffer for zone count"
+msgstr "Impossible d'allouer le buffer.\n"
+
+#: disk-utils/fsck.minix.c:609
+#, fuzzy
+msgid "Unable to read inode map"
+msgstr "imossible d'écrire la table des inodes"
+
+#: disk-utils/fsck.minix.c:611
+#, fuzzy
+msgid "Unable to read zone map"
+msgstr "impossible d'écrire la table des zones"
+
+#: disk-utils/fsck.minix.c:613
+#, fuzzy
+msgid "Unable to read inodes"
+msgstr "imossible d'écrire la table des inodes"
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr ""
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:540
#, c-format
msgid "%ld inodes\n"
msgstr "%ld i-noeuds\n"
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:541
#, c-format
msgid "%ld blocks\n"
msgstr "%ld blocs\n"
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:542
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
msgstr "Premičrezonededonnées=%ld (%ld)\n"
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:543
#, c-format
msgid "Zonesize=%d\n"
msgstr "Tailledelazone=%d\n"
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr "Taillemax=%ld\n"
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr "Etat du systčme de fichier=%d\n"
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
"\n"
msgstr "longueurnom=%d\n"
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
msgstr "I-noeud %d marqué libre, mais utilisé pour le fichier '"
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
msgstr "Marqué utilisé"
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
msgstr " a pour mode %05o\n"
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr "Avertissement: nombre de i-noeuds trop grand.\n"
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
msgstr "Bloc déjŕ utilisé. Maintenant dans le fichier `"
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr "Effacer"
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
msgstr "Bloc %d dans le fichier `"
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
msgstr "' est marqué inutilisé."
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
msgstr "Correct"
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
msgstr "Enlever"
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
msgstr ": mauvais répertoire: '.' ne vient pas en premier\n"
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
msgstr ": mauvais répertoire: '..' ne vient pas en second\n"
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+msgid "internal error"
+msgstr "erreur interne"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
msgstr ": mauvais répertoire: taille<32"
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
msgstr ": mauvais répertoire: taille < 32"
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1111
+#, fuzzy
+msgid "seek failed in bad_zone"
+msgstr "la recherche dans write_tables a échoué"
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
msgstr ""
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
-#, c-format
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
+#, fuzzy, c-format
msgid "Inode %d not used, marked used in the bitmap."
-msgstr ""
+msgstr "I-noeud %d marqué libre, mais utilisé pour le fichier '"
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
msgstr ""
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
msgstr ""
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
-#, c-format
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
msgid "Zone %d: marked in use, no file uses it."
-msgstr ""
+msgstr "I-noeud %d marqué libre, mais utilisé pour le fichier '"
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
msgstr ""
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
-msgstr ""
+msgstr "non "
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
#, fuzzy
msgid "Set"
msgstr "Secteurs"
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:649
+#: disk-utils/mkfs.minix.c:652
+#, fuzzy
+msgid "bad inode size"
+msgstr "%ld i-noeuds\n"
+
+#: disk-utils/fsck.minix.c:1257
+#, fuzzy
+msgid "bad v2 inode size"
+msgstr "%ld i-noeuds\n"
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1287
+#, fuzzy, c-format
+msgid "unable to open '%s'"
+msgstr "Impossible d'ouvrir %s\n"
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -311,72 +1005,68 @@ msgid ""
"%6d files\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
+#, fuzzy
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
"----------------------------\n"
-msgstr ""
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
#: disk-utils/mkfs.c:66
msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
msgstr ""
-#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:324 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:221 mount/sundries.c:192
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:373 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
-msgstr ""
+msgstr "%s: A court de mémoire!\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
-msgstr ""
+#, fuzzy, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs version "
#: disk-utils/mkfs.minix.c:186
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr ""
+msgstr "Usage: %s [-c | -l nom de fichier] [-nXX] [-iXX] /dev/name [blocks]\n"
#: disk-utils/mkfs.minix.c:210
#, c-format
msgid "%s is mounted; will not make a filesystem here!"
-msgstr ""
+msgstr "%s est monté ; je ne vais pas faire un systčme de fichier ici !"
#: disk-utils/mkfs.minix.c:271
msgid "seek to boot block failed in write_tables"
-msgstr ""
+msgstr "la recherche de bloc de boot dans write_tables a échoué"
#: disk-utils/mkfs.minix.c:273
msgid "unable to clear boot sector"
-msgstr ""
+msgstr "impossible d'effacer le secteur de boot"
#: disk-utils/mkfs.minix.c:275
msgid "seek failed in write_tables"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr ""
+msgstr "la recherche dans write_tables a échoué"
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
-msgstr ""
+msgstr "imossible d'écrire la table des inodes"
#: disk-utils/mkfs.minix.c:281
msgid "unable to write zone map"
-msgstr ""
+msgstr "impossible d'écrire la table des zones"
#: disk-utils/mkfs.minix.c:283
+#, fuzzy
msgid "unable to write inodes"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr ""
+msgstr "imossible d'écrire la table des inodes"
#: disk-utils/mkfs.minix.c:292
+#, fuzzy
msgid "write failed in write_block"
-msgstr ""
+msgstr "la recherche dans write_tables a échoué"
#. Could make triple indirect block here
#: disk-utils/mkfs.minix.c:300 disk-utils/mkfs.minix.c:374
@@ -388,117 +1078,146 @@ msgstr ""
msgid "not enough good blocks"
msgstr ""
-#: disk-utils/mkfs.minix.c:517
+#: disk-utils/mkfs.minix.c:529
+#, fuzzy
msgid "unable to allocate buffers for maps"
-msgstr ""
+msgstr "Impossible d'allouer le buffer\n"
-#: disk-utils/mkfs.minix.c:526
+#: disk-utils/mkfs.minix.c:538
+#, fuzzy
msgid "unable to allocate buffer for inodes"
-msgstr ""
+msgstr "Impossible d'allouer le buffer.\n"
-#: disk-utils/mkfs.minix.c:532
+#: disk-utils/mkfs.minix.c:544
#, fuzzy, c-format
msgid ""
"Maxsize=%ld\n"
"\n"
msgstr "Taillemax=%ld\n"
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:558
+#, fuzzy
msgid "seek failed during testing of blocks"
-msgstr ""
+msgstr "la recherche dans write_tables a échoué"
-#: disk-utils/mkfs.minix.c:554
+#: disk-utils/mkfs.minix.c:566
msgid "Weird values in do_check: probably bugs\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:585
+#: disk-utils/mkfs.minix.c:597 disk-utils/mkswap.c:231
+#, fuzzy
msgid "seek failed in check_blocks"
-msgstr ""
+msgstr "la recherche dans write_tables a échoué"
-#: disk-utils/mkfs.minix.c:594
+#: disk-utils/mkfs.minix.c:606
msgid "bad blocks before data-area: cannot make fs"
msgstr ""
-#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
+#: disk-utils/mkfs.minix.c:612 disk-utils/mkfs.minix.c:634
#, fuzzy, c-format
msgid "%d bad blocks\n"
msgstr "%ld blocs\n"
-#: disk-utils/mkfs.minix.c:602 disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:614 disk-utils/mkfs.minix.c:636
#, fuzzy
msgid "one bad block\n"
-msgstr "%ld blocs\n"
+msgstr "une mauvaise page\n"
-#: disk-utils/mkfs.minix.c:614
-msgid "can't open file of bad blocks"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
+#: disk-utils/mkfs.minix.c:626
#, fuzzy
-msgid "bad inode size"
-msgstr "%ld i-noeuds\n"
+msgid "can't open file of bad blocks"
+msgstr "Impossible d'ouvrir le fichier '%s'"
-#: disk-utils/mkfs.minix.c:669
+#: disk-utils/mkfs.minix.c:681
#, c-format
msgid "%s: not compiled with minix v2 support\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:685
+#: disk-utils/mkfs.minix.c:697
#, fuzzy
msgid "strtol error: number of blocks not specified"
msgstr "Erreur d'écriture: mauvais block dans le fichier '"
-#: disk-utils/mkfs.minix.c:717
-#, c-format
+#: disk-utils/mkfs.minix.c:729
+#, fuzzy, c-format
msgid "unable to open %s"
-msgstr ""
+msgstr "Impossible d'ouvrir %s\n"
-#: disk-utils/mkfs.minix.c:719
-#, c-format
+#: disk-utils/mkfs.minix.c:731
+#, fuzzy, c-format
msgid "unable to stat %s"
-msgstr ""
+msgstr "Impossible de lire %s\n"
-#: disk-utils/mkfs.minix.c:723
+#: disk-utils/mkfs.minix.c:735
#, c-format
msgid "will not try to make filesystem on '%s'"
msgstr ""
-#: disk-utils/mkswap.c:99
+#: disk-utils/mkswap.c:101
#, c-format
msgid "Assuming pages of size %d\n"
msgstr ""
-#: disk-utils/mkswap.c:191
-#, c-format
-msgid "%d bad page%s\n"
-msgstr ""
+#: disk-utils/mkswap.c:185
+#, fuzzy, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr "Usage: %s [-c | -l nom de fichier] [-nXX] [-iXX] /dev/name [blocks]\n"
-#: disk-utils/mkswap.c:191 login-utils/shutdown.c:433
-#: login-utils/shutdown.c:436
-msgid "s"
-msgstr "s"
+#: disk-utils/mkswap.c:208
+#, fuzzy
+msgid "too many bad pages"
+msgstr "une mauvaise page\n"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1100
+#: text-utils/more.c:1888 text-utils/more.c:1899
+#, fuzzy
+msgid "Out of memory"
+msgstr "%s: A court de mémoire!\n"
-#: disk-utils/mkswap.c:294
+#: disk-utils/mkswap.c:239
+msgid "one bad page\n"
+msgstr "une mauvaise page\n"
+
+#: disk-utils/mkswap.c:241
+#, c-format
+msgid "%d bad pages\n"
+msgstr "%d mauvaises pages\n"
+
+#: disk-utils/mkswap.c:345
#, c-format
msgid "%s: error: Nowhere to set up swap on?\n"
msgstr "%s: erreur: Aucun endroit défini pour swaper?\n"
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:354
+#, c-format
+msgid "%s: error: size %ld is larger than device size %d\n"
+msgstr "%s: erreur: la taile %ld est plus grande que le périphérique : %d\n"
+
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr "%s: erreur: version inconnue %d\n"
-#: disk-utils/mkswap.c:319
+#: disk-utils/mkswap.c:378
#, c-format
msgid "%s: error: swap area needs to be at least %ldkB\n"
msgstr "%s: erreur: la taille du swap doit ętre d'au moins %ldkB\n"
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:397
#, c-format
msgid "%s: warning: truncating swap area to %ldkB\n"
msgstr "%s: avertissement: troncature de l'aire de swap ŕ %ldkB\n"
-#: disk-utils/mkswap.c:353
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -507,11 +1226,30 @@ msgid ""
"the -f option to force it.\n"
msgstr ""
-#: disk-utils/mkswap.c:378
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr "Configuration de l'espace de swap version %d, taille = %ld octets\n"
+#: disk-utils/mkswap.c:455
+#, fuzzy
+msgid "unable to rewind swap-device"
+msgstr "imossible d'écrire la table des inodes"
+
+#: disk-utils/mkswap.c:458
+#, fuzzy
+msgid "unable to write signature page"
+msgstr "imossible d'écrire la table des inodes"
+
+#: disk-utils/mkswap.c:465
+#, fuzzy
+msgid "fsync failed"
+msgstr "échec de malloc"
+
#: disk-utils/setfdprm.c:30
#, c-format
msgid "Invalid number: %s\n"
@@ -548,46 +1286,46 @@ msgstr ""
msgid " %s [ -c | -y | -n ] dev\n"
msgstr ""
-#: fdisk/cfdisk.c:349 fdisk/cfdisk.c:1764
+#: fdisk/cfdisk.c:398 fdisk/cfdisk.c:1903
msgid "Unusable"
msgstr "Inutilisable"
-#: fdisk/cfdisk.c:351 fdisk/cfdisk.c:1766
+#: fdisk/cfdisk.c:400 fdisk/cfdisk.c:1905
msgid "Free Space"
msgstr "Espace Libre"
-#: fdisk/cfdisk.c:354
+#: fdisk/cfdisk.c:403
msgid "Linux ext2"
msgstr "Linux ext2"
#. also Solaris
-#: fdisk/cfdisk.c:356 fdisk/i386_sys_types.c:53
+#: fdisk/cfdisk.c:405 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr "Linux"
-#: fdisk/cfdisk.c:359
+#: fdisk/cfdisk.c:408
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:361
+#: fdisk/cfdisk.c:410
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:414
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:376
+#: fdisk/cfdisk.c:425
msgid "Disk has been changed.\n"
msgstr "Le disque a été changé.\n"
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:426
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
"Rebootez le systčme pour ętre sur que la table des partitions a été "
"correctement mise ŕ jour.\n"
-#: fdisk/cfdisk.c:380
+#: fdisk/cfdisk.c:429
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -599,727 +1337,770 @@ msgstr ""
"une ou des partitions DOS 6.x, reportez-vous au manuel\n"
"de cfdisk pour avoir plus d'informations.\n"
-#: fdisk/cfdisk.c:475
+#: fdisk/cfdisk.c:524
msgid "FATAL ERROR"
-msgstr ""
+msgstr "ERREUR FATALE"
-#: fdisk/cfdisk.c:484
-#, fuzzy
-msgid "Press any key to exit fdisk"
-msgstr "Appuyez sur une touche pour continuer"
+#: fdisk/cfdisk.c:533
+msgid "Press any key to exit cfdisk"
+msgstr "Appuyez sur une touche pour quitter cfdisk"
-#: fdisk/cfdisk.c:520 fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:569 fdisk/cfdisk.c:577
msgid "Cannot seek on disk drive"
msgstr "Erreur d'accčs sur le disque dur"
-#: fdisk/cfdisk.c:522
+#: fdisk/cfdisk.c:571
msgid "Cannot read disk drive"
msgstr "Impossible de lire le disque dur"
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:579
msgid "Cannot write disk drive"
msgstr "Impossible d'écrire sur le disque dur"
-#: fdisk/cfdisk.c:767
-#, fuzzy
-msgid "Too many parts"
-msgstr "Trops d'arguments.\n"
+#: fdisk/cfdisk.c:818
+msgid "Too many partitions"
+msgstr "Trops de partitions"
-#: fdisk/cfdisk.c:772
-#, fuzzy
+#: fdisk/cfdisk.c:823
msgid "Partition begins before sector 0"
-msgstr "Table de partitions pour %s\n"
+msgstr "La partition commence avant le secteur 0"
-#: fdisk/cfdisk.c:777
-#, fuzzy
+#: fdisk/cfdisk.c:828
msgid "Partition ends before sector 0"
-msgstr "Table de partitions pour %s\n"
+msgstr "La partition se termine avant le secteur 0"
-#: fdisk/cfdisk.c:782
+#: fdisk/cfdisk.c:833
msgid "Partition begins after end-of-disk"
-msgstr ""
+msgstr "La partition commence aprčs la fin du disque"
-#: fdisk/cfdisk.c:787
+#: fdisk/cfdisk.c:838
msgid "Partition ends after end-of-disk"
+msgstr "La partition se termine aprčs la fin du disque"
+
+#: fdisk/cfdisk.c:862
+msgid "logical partitions not in disk order"
msgstr ""
-#: fdisk/cfdisk.c:835
+#: fdisk/cfdisk.c:865
+#, fuzzy
+msgid "logical partitions overlap"
+msgstr "Mauvaise partition logique"
+
+#: fdisk/cfdisk.c:867
+#, fuzzy
+msgid "enlarged logical partitions overlap"
+msgstr "Mauvaise partition logique"
+
+#: fdisk/cfdisk.c:897
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr ""
"!!!! Erreur interne lors de la création d'un lecteur logique sans partition "
"étendue !!!!"
-#: fdisk/cfdisk.c:846 fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:908 fdisk/cfdisk.c:920
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
"Impossible de créér un lecteur logique ici -- cela créérait deux partitions "
"étendues"
-#: fdisk/cfdisk.c:1002
+#: fdisk/cfdisk.c:1070
msgid "Menu item too long. Menu may look odd."
msgstr "Elément de menu trop large. Le menu peut paraitre bizarre."
-#: fdisk/cfdisk.c:1051
+#: fdisk/cfdisk.c:1126
msgid "Menu without direction. Defaulting horizontal."
msgstr "Menu sans direction. Horizontal par défaut."
-#: fdisk/cfdisk.c:1166
+#: fdisk/cfdisk.c:1256
msgid "Illegal key"
msgstr "Touche non valide"
-#: fdisk/cfdisk.c:1189
+#: fdisk/cfdisk.c:1279
msgid "Press a key to continue"
msgstr "Appuyez sur une touche pour continuer"
-#: fdisk/cfdisk.c:1236 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2261
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1326 fdisk/cfdisk.c:1874 fdisk/cfdisk.c:2399
+#: fdisk/cfdisk.c:2401
msgid "Primary"
msgstr "Primaire"
-#: fdisk/cfdisk.c:1236
+#: fdisk/cfdisk.c:1326
msgid "Create a new primary partition"
msgstr "Créér une nouvelle partition primaire"
-#: fdisk/cfdisk.c:1237 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2260
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1327 fdisk/cfdisk.c:1874 fdisk/cfdisk.c:2398
+#: fdisk/cfdisk.c:2401
msgid "Logical"
msgstr "Logique"
-#: fdisk/cfdisk.c:1237
+#: fdisk/cfdisk.c:1327
msgid "Create a new logical partition"
msgstr "Créér une nouvelle partition logique"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291 fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:1328 fdisk/cfdisk.c:1383 fdisk/cfdisk.c:2078
msgid "Cancel"
msgstr "Annuler"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291
+#: fdisk/cfdisk.c:1328 fdisk/cfdisk.c:1383
msgid "Don't create a partition"
msgstr "Ne pas créér la partition"
-#: fdisk/cfdisk.c:1254
+#: fdisk/cfdisk.c:1344
msgid "!!! Internal error !!!"
msgstr "!!! Erreur Interne !!!"
-#: fdisk/cfdisk.c:1257
+#: fdisk/cfdisk.c:1347
msgid "Size (in MB): "
msgstr "Taille (en Mo): "
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1381
msgid "Beginning"
msgstr "Début"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1381
msgid "Add partition at beginning of free space"
msgstr "Ajouter la partition au début de l'espace libre"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1382
msgid "End"
msgstr "Fin"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1382
msgid "Add partition at end of free space"
msgstr "Ajouter la partition ŕ la fin de l'espace libre"
-#: fdisk/cfdisk.c:1308
+#: fdisk/cfdisk.c:1400
msgid "No room to create the extended partition"
msgstr "Pas de place pour créér une partition étendue"
-#: fdisk/cfdisk.c:1354
+#: fdisk/cfdisk.c:1439
+msgid "Bad signature on partition table"
+msgstr "Mauvaise signature de la table de partitions"
+
+#: fdisk/cfdisk.c:1477
+msgid "You specified more cylinders than fit on disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:1507
msgid "Cannot open disk drive"
msgstr "Impossible d'ouvrir le disque dur"
-#: fdisk/cfdisk.c:1356 fdisk/cfdisk.c:1546
+#: fdisk/cfdisk.c:1509 fdisk/cfdisk.c:1690
msgid "Opened disk read-only - you have no permission to write"
msgstr ""
+"Disque ouvert en lecture seule : vous n'avez pas les permissions d'écriture"
-#: fdisk/cfdisk.c:1386
-msgid "Cannot read disk drive geometry"
-msgstr "Impossible de lire la géométrie du disque"
+#: fdisk/cfdisk.c:1530
+msgid "Cannot get disk size"
+msgstr "Impossible de déterminer la taille du disque"
-#: fdisk/cfdisk.c:1408
+#. avoid snprintf - it does not exist on ancient systems
+#: fdisk/cfdisk.c:1556
msgid "Bad primary partition"
msgstr "Mauvaise partition primaire"
-#: fdisk/cfdisk.c:1438
+#. avoid snprintf
+#: fdisk/cfdisk.c:1587
msgid "Bad logical partition"
msgstr "Mauvaise partition logique"
-#: fdisk/cfdisk.c:1558
+#: fdisk/cfdisk.c:1702
msgid "Warning!! This may destroy data on your disk!"
-msgstr ""
+msgstr "Avertissement!! Cela peux détruire des données sur votre disque!"
-#: fdisk/cfdisk.c:1562
+#: fdisk/cfdisk.c:1706
msgid "Are you sure you want write the partition table to disk? (yes or no): "
msgstr ""
"Etes vous sur de vouloir écrire la table de partition sur le disque? (yes ou "
"no): "
-#: fdisk/cfdisk.c:1571
+#: fdisk/cfdisk.c:1712
+msgid "no"
+msgstr "non"
+
+#: fdisk/cfdisk.c:1713
msgid "Did not write partition table to disk"
msgstr "Table de partition non écrite sur le disque"
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1715
+msgid "yes"
+msgstr "oui"
+
+#: fdisk/cfdisk.c:1718
msgid "Please enter `yes' or `no'"
-msgstr ""
+msgstr "Répondez par `oui' ou par `non'"
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1722
msgid "Writing partition table to disk..."
msgstr "Ecriture de la table de partition sur disque..."
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1612
+#: fdisk/cfdisk.c:1747 fdisk/cfdisk.c:1751
msgid "Wrote partition table to disk"
msgstr "Table de partition écrite sur disque"
-#: fdisk/cfdisk.c:1610
+#: fdisk/cfdisk.c:1749
msgid ""
"Wrote partition table, but re-read table failed. Reboot to update table."
msgstr ""
+"Table de partitions écrite, mais échec de sa relecture. Redémarrez pour la "
+"mettre ŕ jour."
-#: fdisk/cfdisk.c:1620
+#: fdisk/cfdisk.c:1759
msgid ""
"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
msgstr ""
+"Il n'y a pas exactement une partition primaire bootable. Un MBR DOS ne "
+"pourra pas fonctionner."
-#: fdisk/cfdisk.c:1678 fdisk/cfdisk.c:1796 fdisk/cfdisk.c:1888
+#: fdisk/cfdisk.c:1817 fdisk/cfdisk.c:1935 fdisk/cfdisk.c:2019
msgid "Enter filename or press RETURN to display on screen: "
msgstr "Entrez un nom de fichier ou tapez ENTREE pour affichage sur l'écran: "
-#: fdisk/cfdisk.c:1686 fdisk/cfdisk.c:1804 fdisk/cfdisk.c:1896
+#: fdisk/cfdisk.c:1825 fdisk/cfdisk.c:1943 fdisk/cfdisk.c:2027
#, c-format
msgid "Cannot open file '%s'"
-msgstr ""
+msgstr "Impossible d'ouvrir le fichier '%s'"
-#: fdisk/cfdisk.c:1697
+#: fdisk/cfdisk.c:1836
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Disque Dur: %s\n"
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1838
msgid "Sector 0:\n"
msgstr "Secteur 0:\n"
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1845
#, c-format
msgid "Sector %d:\n"
msgstr "Secteur %d:\n"
-#: fdisk/cfdisk.c:1726
+#: fdisk/cfdisk.c:1865
msgid " None "
msgstr " Aucun "
-#: fdisk/cfdisk.c:1728
+#: fdisk/cfdisk.c:1867
msgid " Pri/Log"
msgstr " Pri/Log"
-#: fdisk/cfdisk.c:1730
+#: fdisk/cfdisk.c:1869
msgid " Primary"
msgstr " Primaire"
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1871
msgid " Logical"
msgstr " Logique"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1770 fdisk/fdisk.c:1045 fdisk/fdisk.c:1194
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:644 fdisk/sfdisk.c:551
+#: fdisk/cfdisk.c:1909 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "Inconnue"
-#: fdisk/cfdisk.c:1776
+#: fdisk/cfdisk.c:1915
#, c-format
msgid "Boot (%02X)"
msgstr "Boot (%02X)"
-#: fdisk/cfdisk.c:1778 fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:1917 fdisk/cfdisk.c:2407
#, c-format
msgid "Unknown (%02X)"
msgstr "Inconnu (%02X)"
-#: fdisk/cfdisk.c:1780
+#: fdisk/cfdisk.c:1919
#, c-format
msgid "None (%02X)"
msgstr "Aucun (%02X)"
-#: fdisk/cfdisk.c:1815 fdisk/cfdisk.c:1907
+#: fdisk/cfdisk.c:1954 fdisk/cfdisk.c:2038
#, c-format
msgid "Partition Table for %s\n"
msgstr "Table de partitions pour %s\n"
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1956
msgid " First Last\n"
msgstr " Premier Dernier\n"
-#: fdisk/cfdisk.c:1818
+#: fdisk/cfdisk.c:1957
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
+" # Type Secteur Secteur Offset Longueur Syst.Fich. Type (ID) "
+"Drapeaux\n"
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1958
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
msgstr ""
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
-#: fdisk/cfdisk.c:1909
+#: fdisk/cfdisk.c:2040
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr ""
-#: fdisk/cfdisk.c:1910
+#: fdisk/cfdisk.c:2041
msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
msgstr ""
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:2042
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr ""
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2075
msgid "Raw"
msgstr ""
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2075
msgid "Print the table using raw data format"
msgstr ""
-#: fdisk/cfdisk.c:1945 fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2076 fdisk/cfdisk.c:2178
msgid "Sectors"
msgstr "Secteurs"
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:2076
msgid "Print the table ordered by sectors"
-msgstr ""
+msgstr "Affiche la table triée par secteurs"
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2077
msgid "Table"
msgstr "Table"
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2077
msgid "Just print the partition table"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:2078
msgid "Don't print the table"
msgstr "Ne pas imprimer la table"
-#: fdisk/cfdisk.c:1976
-msgid "Help Screen for cfdisk "
+#: fdisk/cfdisk.c:2106
+#, fuzzy
+msgid "Help Screen for cfdisk"
msgstr "Ecran d'aide de cfdisk "
-#: fdisk/cfdisk.c:1978
+#: fdisk/cfdisk.c:2108
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr "Voici cfdisk, un programme de partitionnement de disque, qui"
-#: fdisk/cfdisk.c:1979
+#: fdisk/cfdisk.c:2109
msgid "allows you to create, delete and modify partitions on your hard"
msgstr "permet de créér, effacer ou modifier des partitions sur votre disque"
-#: fdisk/cfdisk.c:1980
+#: fdisk/cfdisk.c:2110
msgid "disk drive."
msgstr "dur."
-#: fdisk/cfdisk.c:1982
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
+#: fdisk/cfdisk.c:2112
+#, fuzzy
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-#: fdisk/cfdisk.c:1984
+#: fdisk/cfdisk.c:2114
msgid "Command Meaning"
msgstr "Commande Signification"
-#: fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:2115
msgid "------- -------"
msgstr "-------- -------------"
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:2116
msgid " b Toggle bootable flag of the current partition"
msgstr " b (Dés)active le drapeau Bootable de la partition courante"
-#: fdisk/cfdisk.c:1987
+#: fdisk/cfdisk.c:2117
msgid " d Delete the current partition"
msgstr " d Effacer la partition courante"
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:2118
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr ""
" g Changer les paramétres cylindres, tętes et secteurs-par-piste"
-#: fdisk/cfdisk.c:1989
+#: fdisk/cfdisk.c:2119
msgid " WARNING: This option should only be used by people who"
msgstr " AVERTISSEMENT: Cette option ne doit ętre utilisée que"
-#: fdisk/cfdisk.c:1990
+#: fdisk/cfdisk.c:2120
msgid " know what they are doing."
msgstr ""
" si vous savez réélement ce que vous étes en train de faire."
-#: fdisk/cfdisk.c:1991
+#: fdisk/cfdisk.c:2121
msgid " h Print this screen"
msgstr " h Afficher cet écran"
-#: fdisk/cfdisk.c:1992
+#: fdisk/cfdisk.c:2122
msgid " m Maximize disk usage of the current partition"
msgstr ""
" m Maximizer l'utilisation du disque pour la partition courante"
-#: fdisk/cfdisk.c:1993
+#: fdisk/cfdisk.c:2123
msgid " Note: This may make the partition incompatible with"
msgstr " Note: Cela peux rendre la partition incompatible avec"
-#: fdisk/cfdisk.c:1994
+#: fdisk/cfdisk.c:2124
msgid " DOS, OS/2, ..."
msgstr " DOS, OS/2, ..."
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2125
msgid " n Create new partition from free space"
msgstr " n Créér une nouvelle partition ŕ partir de l'espace libre"
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:2126
msgid " p Print partition table to the screen or to a file"
msgstr ""
" p Imprimer la table de partitions ŕ l'écran ou dans un fichier"
-#: fdisk/cfdisk.c:1997
+#: fdisk/cfdisk.c:2127
msgid " There are several different formats for the partition"
msgstr " Vous pouvez choisir entre différents formats pour"
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:2128
msgid " that you can choose from:"
msgstr " la table de partition:"
-#: fdisk/cfdisk.c:1999
+#: fdisk/cfdisk.c:2129
msgid " r - Raw data (exactly what would be written to disk)"
msgstr ""
" r - Données brutes (Exactement ce que cfdisk écrirait sur le "
"disque)"
-#: fdisk/cfdisk.c:2000
+#: fdisk/cfdisk.c:2130
msgid " s - Table ordered by sectors"
msgstr " s - Table triée par secteurs"
-#: fdisk/cfdisk.c:2001
+#: fdisk/cfdisk.c:2131
msgid " t - Table in raw format"
msgstr " t - Table au format brut"
-#: fdisk/cfdisk.c:2002
+#: fdisk/cfdisk.c:2132
msgid " q Quit program without writing partition table"
msgstr " q Quitter le programme sans écrire la table de partitions"
-#: fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:2133
msgid " t Change the filesystem type"
msgstr " t Changer le type de systčme de fichiers"
-#: fdisk/cfdisk.c:2004
+#: fdisk/cfdisk.c:2134
msgid " u Change units of the partition size display"
msgstr ""
" u Changement de l'unité utilisée pour la taille des partitions"
-#: fdisk/cfdisk.c:2005
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2135
+#, fuzzy
+msgid " Rotates through MB, sectors and cylinders"
msgstr " Alternativement: Mo, secteurs et cylindres"
-#: fdisk/cfdisk.c:2006
+#: fdisk/cfdisk.c:2136
msgid " W Write partition table to disk (must enter upper case W)"
msgstr " W Ecrire la table de partitions sur le disque (W doit ętre"
-#: fdisk/cfdisk.c:2007
+#: fdisk/cfdisk.c:2137
msgid " Since this might destroy data on the disk, you must"
msgstr ""
" en majuscule) Etant donné que cela peux détruire des données"
-#: fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:2138
msgid " either confirm or deny the write by entering `yes' or"
msgstr " sur votre disque, vous devrez confirmer en entrant `yes'"
-#: fdisk/cfdisk.c:2009
+#: fdisk/cfdisk.c:2139
msgid " `no'"
msgstr " ou `no'"
-#: fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:2140
msgid "Up Arrow Move cursor to the previous partition"
msgstr "Fléche Haut Déplacer le curseur sur vers la partition précédente"
-#: fdisk/cfdisk.c:2011
+#: fdisk/cfdisk.c:2141
msgid "Down Arrow Move cursor to the next partition"
msgstr "Fléche Bas Déplacer le curseur vers la partition suivante"
-#: fdisk/cfdisk.c:2012
+#: fdisk/cfdisk.c:2142
msgid "CTRL-L Redraws the screen"
msgstr "CTRL-L Redessine l'écran"
-#: fdisk/cfdisk.c:2013
+#: fdisk/cfdisk.c:2143
msgid " ? Print this screen"
msgstr " ? Affiche cet écran"
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2145
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "Note: Toutes ces commandes peuvent ętre entrée en majuscules ou"
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:2146
msgid "case letters (except for Writes)."
msgstr "minuscules (ŕ l'exception de Write)."
-#: fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2350 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2176 fdisk/cfdisk.c:2493 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr "Cylindres"
-#: fdisk/cfdisk.c:2048
+#: fdisk/cfdisk.c:2176
msgid "Change cylinder geometry"
msgstr "Changer la géométrie des cylindres"
-#: fdisk/cfdisk.c:2049 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2177 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "Tętes"
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:2177
msgid "Change head geometry"
msgstr "Changer la géométrie des tętes"
-#: fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2178
msgid "Change sector geometry"
msgstr "Changer la géométrie des secteurs"
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2179
msgid "Done"
msgstr "Terminé"
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2179
msgid "Done with changing geometry"
msgstr "Changement de géométrie terminé"
-#: fdisk/cfdisk.c:2064
+#: fdisk/cfdisk.c:2192
msgid "Enter the number of cylinders: "
-msgstr "Entrez le nombre de cylindres: "
+msgstr "Entrez le nombre de cylindres : "
-#: fdisk/cfdisk.c:2071 fdisk/cfdisk.c:2614
+#: fdisk/cfdisk.c:2204 fdisk/cfdisk.c:2761
msgid "Illegal cylinders value"
-msgstr ""
+msgstr "Nombre de cylindres non valide"
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2210
msgid "Enter the number of heads: "
-msgstr "Entrez le nombre de tętes: "
+msgstr "Entrez le nombre de tętes : "
-#: fdisk/cfdisk.c:2084 fdisk/cfdisk.c:2621
-#, fuzzy
+#: fdisk/cfdisk.c:2217 fdisk/cfdisk.c:2771
msgid "Illegal heads value"
-msgstr "Touche non valide"
+msgstr "Nombre de tętes non valide"
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2223
msgid "Enter the number of sectors per track: "
-msgstr "Entrez le nombre de secteurs par piste: "
+msgstr "Entrez le nombre de secteurs par piste : "
-#: fdisk/cfdisk.c:2097 fdisk/cfdisk.c:2628
+#: fdisk/cfdisk.c:2230 fdisk/cfdisk.c:2778
msgid "Illegal sectors value"
-msgstr ""
+msgstr "Nombre de secteurs non valide"
-#: fdisk/cfdisk.c:2196
+#: fdisk/cfdisk.c:2333
msgid "Enter filesystem type: "
-msgstr "Entrez le type de systčme de fichiers: "
+msgstr "Entrez le type de systčme de fichiers : "
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2351
msgid "Cannot change FS Type to empty"
-msgstr ""
+msgstr "Impossible de changer le type de SF ŕ vide"
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2353
msgid "Cannot change FS Type to extended"
-msgstr ""
+msgstr "Impossible de changer le type de SF ŕ étendu"
-#: fdisk/cfdisk.c:2238 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2376 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "Boot"
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2378
#, c-format
msgid "Unk(%02X)"
msgstr "Inc(%02X)"
-#: fdisk/cfdisk.c:2243 fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2381 fdisk/cfdisk.c:2384
msgid ", NC"
msgstr ", NC"
-#: fdisk/cfdisk.c:2251 fdisk/cfdisk.c:2254
+#: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2392
msgid "NC"
msgstr "NC"
-#: fdisk/cfdisk.c:2262
+#: fdisk/cfdisk.c:2400
msgid "Pri/Log"
msgstr "Pri/Log"
-#: fdisk/cfdisk.c:2336
+#: fdisk/cfdisk.c:2476
#, c-format
msgid "Disk Drive: %s"
msgstr "Disque Dur: %s"
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2479
+#, c-format
+msgid "Size: %lld bytes"
+msgstr ""
+
+#: fdisk/cfdisk.c:2481
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "Tętes: %d Secteurs par Piste: %d Cylindres: %d"
-#: fdisk/cfdisk.c:2342
+#: fdisk/cfdisk.c:2485
msgid "Name"
msgstr "Nom"
-#: fdisk/cfdisk.c:2343
+#: fdisk/cfdisk.c:2486
msgid "Flags"
msgstr "Drapeaux"
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2487
msgid "Part Type"
msgstr "Type de SF"
-#: fdisk/cfdisk.c:2345
+#: fdisk/cfdisk.c:2488
msgid "FS Type"
msgstr "Type SF"
-#: fdisk/cfdisk.c:2346
+#: fdisk/cfdisk.c:2489
msgid "[Label]"
msgstr "[Label]"
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2491
msgid " Sectors"
msgstr " Secteurs"
-#: fdisk/cfdisk.c:2352
+#: fdisk/cfdisk.c:2495
msgid "Size (MB)"
msgstr "Taille(Mo)"
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2497
+#, fuzzy
+msgid "Size (GB)"
+msgstr "Taille(Mo)"
+
+#: fdisk/cfdisk.c:2552
msgid "Bootable"
msgstr "Bootable"
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2552
msgid "Toggle bootable flag of the current partition"
msgstr "(Dés)activer le drapeau bootable pour la partition courante"
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2553
msgid "Delete"
msgstr "Effacer"
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2553
msgid "Delete the current partition"
msgstr "Effacer la partition courante"
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2554
msgid "Geometry"
msgstr "Géométrie"
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2554
msgid "Change disk geometry (experts only)"
msgstr "Changer la géométrie disque (experts seulement)"
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2555
msgid "Help"
msgstr "Aide"
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2555
msgid "Print help screen"
msgstr "Affiche l'écran d'aide"
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2556
msgid "Maximize"
msgstr "Maximize"
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2556
msgid "Maximize disk usage of the current partition (experts only)"
msgstr ""
"Maximizer l'utilisation disque pour la partition courante (experts seulement)"
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2557
msgid "New"
msgstr "Nouvelle"
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2557
msgid "Create new partition from free space"
msgstr "Créér une nouvelle partition"
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2558
msgid "Print"
msgstr "Imprimer"
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2558
msgid "Print partition table to the screen or to a file"
msgstr "Imprimer la table des partition ŕ l'écran ou dans un fichier"
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2559
msgid "Quit"
msgstr "Quitter"
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2559
msgid "Quit program without writing partition table"
msgstr "Quitter le programme sans écrire la table de partition"
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2560
msgid "Type"
msgstr "Type"
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2560
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr "Changer le type du systčme de fichiers (DOS, Linux, OS/2, etc)"
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2561
msgid "Units"
msgstr "Unités"
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2561
msgid "Change units of the partition size display (MB, sect, cyl)"
msgstr "Changer l'unité pour la taille des partitions (Mo, sect, cyl)"
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2562
msgid "Write"
msgstr "Ecrire"
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2562
msgid "Write partition table to disk (this might destroy data)"
msgstr "Ecrire la table de partition sur disque (peux détruire des données)"
-#: fdisk/cfdisk.c:2463
-#, fuzzy
+#: fdisk/cfdisk.c:2608
msgid "Cannot make this partition bootable"
-msgstr "Seulement imprimer la table de partitions"
+msgstr "Impossible de rendre cette partition bootable"
-#: fdisk/cfdisk.c:2473
-#, fuzzy
+#: fdisk/cfdisk.c:2618
msgid "Cannot delete an empty partition"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Impossible d'effacer une partition vide"
-#: fdisk/cfdisk.c:2493 fdisk/cfdisk.c:2495
-#, fuzzy
+#: fdisk/cfdisk.c:2638 fdisk/cfdisk.c:2640
msgid "Cannot maximize this partition"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Impossible de maximiser cette partition"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2648
msgid "This partition is unusable"
-msgstr ""
+msgstr "Cette partition est unitilisable"
-#: fdisk/cfdisk.c:2505
+#: fdisk/cfdisk.c:2650
msgid "This partition is already in use"
-msgstr ""
+msgstr "Cette partition est déjŕ utilisée"
-#: fdisk/cfdisk.c:2522
+#: fdisk/cfdisk.c:2667
msgid "Cannot change the type of an empty partition"
-msgstr ""
+msgstr "Impossible de changer le type d'une partition vide"
-#: fdisk/cfdisk.c:2547 fdisk/cfdisk.c:2553
-#, fuzzy
+#: fdisk/cfdisk.c:2694 fdisk/cfdisk.c:2700
msgid "No more partitions"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
-#: fdisk/cfdisk.c:2560
-#, fuzzy
+#: fdisk/cfdisk.c:2707
msgid "Illegal command"
-msgstr "Touche non valide"
+msgstr "Commande non valide"
-#: fdisk/cfdisk.c:2570
-#, fuzzy
+#: fdisk/cfdisk.c:2717
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1997 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
#. Unfortunately, xgettext does not handle multi-line strings
#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2577
+#: fdisk/cfdisk.c:2724
#, c-format
msgid ""
"\n"
@@ -1338,285 +2119,296 @@ msgid ""
" the number of heads and the number of sectors/track.\n"
"\n"
msgstr ""
+"\n"
+"Usage:\n"
+"Afficher la version :\n"
+" %s -v\n"
+"Afficher la table de partition :\n"
+" %s -P {r|s|t} [options] périphérique\n"
+"Utilisation interactive :\n"
+" %s [options] périphérique\n"
+"\n"
+"Options:\n"
+"-a: Utilise une fléche ŕ la place de la vedéo inverse;\n"
+"-z: Démarrer avec une table de partition vide a lieu de lire celle du "
+"disque;\n"
+"-c C -h H -s S: Forcer l'idée que ce fait le noyau du nombre de cylindres,\n"
+" de tętes et de secteurs par piste.\n"
+"\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:246
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"
+"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 drives) use 2048-byte sectors\n"
msgstr ""
-#: fdisk/fdisk.c:245
-msgid "A disk block device is needed.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:258
msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
+"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 ""
-#: fdisk/fdisk.c:252
-#, fuzzy, c-format
+#: fdisk/fdisk.c:266
+#, c-format
msgid "Unable to open %s\n"
-msgstr "Impossible d'ouvrir le disque dur"
+msgstr "Impossible d'ouvrir %s\n"
-#: fdisk/fdisk.c:255
+#: fdisk/fdisk.c:269
#, c-format
msgid "Unable to read %s\n"
-msgstr ""
+msgstr "Impossible de lire %s\n"
-#: fdisk/fdisk.c:258
-#, c-format
+#: fdisk/fdisk.c:272
+#, fuzzy, c-format
msgid "Unable to seek on %s\n"
-msgstr ""
+msgstr "Impossible d'ouvrir %s\n"
-#: fdisk/fdisk.c:261
+#: fdisk/fdisk.c:275
#, c-format
msgid "Unable to write %s\n"
+msgstr "Impossible d'écrire %s\n"
+
+#: fdisk/fdisk.c:278
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr ""
-#: fdisk/fdisk.c:264
+#: fdisk/fdisk.c:282
msgid "Unable to allocate any more memory\n"
-msgstr ""
+msgstr "Impossible d'allouer plus de mémoire\n"
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:284
msgid "Fatal error\n"
-msgstr ""
+msgstr "Erreur fatale\n"
-#: fdisk/fdisk.c:277 fdisk/fdisk.c:296 fdisk/fdisk.c:314 fdisk/fdisk.c:321
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdiskbsdlabel.c:105
-#, fuzzy
+#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
+#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:107
msgid "Command action"
-msgstr "Commande Signification"
+msgstr "Commande Action"
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:296
msgid " a toggle a read only flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:279 fdisk/fdisk.c:323
+#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
msgid " b edit bsd disklabel"
msgstr ""
-#: fdisk/fdisk.c:280
+#: fdisk/fdisk.c:298
msgid " c toggle the mountable flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:281 fdisk/fdisk.c:300 fdisk/fdisk.c:325
-#, fuzzy
+#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
msgid " d delete a partition"
-msgstr " d Effacer la partition courante"
+msgstr " d effacer une partition"
-#: fdisk/fdisk.c:282 fdisk/fdisk.c:301 fdisk/fdisk.c:326
-#, fuzzy
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " l list known partition types"
-msgstr " t Changer le type de systčme de fichiers"
+msgstr " l liste les types de partitions connus"
#. sun
-#: fdisk/fdisk.c:283 fdisk/fdisk.c:302 fdisk/fdisk.c:315 fdisk/fdisk.c:327
-#: fdisk/fdisk.c:352 fdisk/fdisk.c:369 fdisk/fdiskbsdlabel.c:110
-#, fuzzy
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
+#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:112
msgid " m print this menu"
-msgstr " h Afficher cet écran"
+msgstr " m affiche cet écran"
-#: fdisk/fdisk.c:284 fdisk/fdisk.c:303 fdisk/fdisk.c:328
-#, fuzzy
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
msgid " n add a new partition"
-msgstr "Créér une nouvelle partition primaire"
+msgstr " n ajouter une nouvelle partition"
-#: fdisk/fdisk.c:285 fdisk/fdisk.c:304 fdisk/fdisk.c:316 fdisk/fdisk.c:329
-#, fuzzy
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
msgid " o create a new empty DOS partition table"
-msgstr "Seulement imprimer la table de partitions"
+msgstr " o créér une nouvelle table de partitions DOS vide"
-#: fdisk/fdisk.c:286 fdisk/fdisk.c:305 fdisk/fdisk.c:330 fdisk/fdisk.c:353
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:388
#, fuzzy
msgid " p print the partition table"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/fdisk.c:287 fdisk/fdisk.c:306 fdisk/fdisk.c:317 fdisk/fdisk.c:331
-#: fdisk/fdisk.c:354 fdisk/fdisk.c:371 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
+#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:115
msgid " q quit without saving changes"
msgstr ""
-#: fdisk/fdisk.c:288 fdisk/fdisk.c:307 fdisk/fdisk.c:318 fdisk/fdisk.c:332
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
msgid " s create a new empty Sun disklabel"
msgstr ""
#. sun
-#: fdisk/fdisk.c:289 fdisk/fdisk.c:308 fdisk/fdisk.c:333
-#, fuzzy
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
msgid " t change a partition's system id"
-msgstr " t Changer le type de systčme de fichiers"
+msgstr ""
-#: fdisk/fdisk.c:290 fdisk/fdisk.c:309 fdisk/fdisk.c:334
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
msgid " u change display/entry units"
msgstr ""
-#: fdisk/fdisk.c:291 fdisk/fdisk.c:310 fdisk/fdisk.c:335 fdisk/fdisk.c:357
-#: fdisk/fdisk.c:374
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
+#: fdisk/fdisk.c:392
#, fuzzy
msgid " v verify the partition table"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/fdisk.c:292 fdisk/fdisk.c:311 fdisk/fdisk.c:336 fdisk/fdisk.c:358
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
msgid " w write table to disk and exit"
msgstr ""
-#: fdisk/fdisk.c:293 fdisk/fdisk.c:337
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
msgid " x extra functionality (experts only)"
msgstr ""
-#: fdisk/fdisk.c:297
+#: fdisk/fdisk.c:315
#, fuzzy
msgid " a select bootable partition"
msgstr " d Effacer la partition courante"
#. sgi flavour
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:316
msgid " b edit bootfile entry"
msgstr ""
#. sgi
-#: fdisk/fdisk.c:299
+#: fdisk/fdisk.c:317
#, fuzzy
msgid " c select sgi swap partition"
msgstr " d Effacer la partition courante"
-#: fdisk/fdisk.c:322
+#: fdisk/fdisk.c:340
msgid " a toggle a bootable flag"
msgstr ""
-#: fdisk/fdisk.c:324
+#: fdisk/fdisk.c:342
msgid " c toggle the dos compatibility flag"
msgstr ""
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:363
#, fuzzy
msgid " a change number of alternate cylinders"
msgstr "Entrez le nombre de cylindres: "
#. sun
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:364
+#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
#, fuzzy
msgid " c change number of cylinders"
msgstr "Entrez le nombre de cylindres: "
-#: fdisk/fdisk.c:347 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
#, fuzzy
msgid " d print the raw data in the partition table"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/fdisk.c:348
+#: fdisk/fdisk.c:366
#, fuzzy
msgid " e change number of extra sectors per cylinder"
msgstr "Entrez le nombre de secteurs par piste: "
#. sun
-#: fdisk/fdisk.c:349 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
#, fuzzy
msgid " h change number of heads"
msgstr "Entrez le nombre de tętes: "
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:368
msgid " i change interleave factor"
msgstr ""
#. sun
-#: fdisk/fdisk.c:351
-#, fuzzy
+#: fdisk/fdisk.c:369
msgid " o change rotation speed (rpm)"
-msgstr " t Changer le type de systčme de fichiers"
+msgstr ""
-#: fdisk/fdisk.c:355 fdisk/fdisk.c:372 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:117
msgid " r return to main menu"
msgstr ""
-#: fdisk/fdisk.c:356 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
#, fuzzy
-msgid " s change number of sectors"
+msgid " s change number of sectors/track"
msgstr "Entrez le nombre de secteurs par piste: "
-#: fdisk/fdisk.c:359
+#: fdisk/fdisk.c:377
#, fuzzy
msgid " y change number of physical cylinders"
msgstr "Entrez le nombre de cylindres: "
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:381
msgid " b move beginning of data in a partition"
msgstr ""
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:384
#, fuzzy
msgid " e list extended partitions"
msgstr "Pas de place pour créér une partition étendue"
#. !sun
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:385
#, fuzzy
msgid " g create an IRIX partition table"
-msgstr "Seulement imprimer la table de partitions"
+msgstr "Mauvaise signature de la table de partitions"
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:481
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:477
-#, fuzzy
+#: fdisk/fdisk.c:495
msgid "heads"
-msgstr "Tętes"
+msgstr "tętes"
-#: fdisk/fdisk.c:479 fdisk/sfdisk.c:825
-#, fuzzy
+#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
msgid "sectors"
-msgstr "Secteurs"
+msgstr "secteurs"
-#: fdisk/fdisk.c:481 fdisk/fdiskbsdlabel.c:441 fdisk/sfdisk.c:825
-#, fuzzy
+#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
+#: fdisk/sfdisk.c:842
msgid "cylinders"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdisk.c:485
+#: fdisk/fdisk.c:503
#, c-format
msgid ""
"%s%s.\n"
"You can do this from the extra functions menu.\n"
msgstr ""
-#: fdisk/fdisk.c:486
+#: fdisk/fdisk.c:504
msgid " and "
-msgstr ""
+msgstr " et "
-#: fdisk/fdisk.c:520
+#: fdisk/fdisk.c:538
#, fuzzy
msgid "Bad offset in primary extended partition\n"
msgstr "Mauvaise partition primaire"
-#: fdisk/fdisk.c:524
+#: fdisk/fdisk.c:545
#, fuzzy, c-format
msgid "Warning: deleting partitions after %d\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Ecriture de la table de partition sur disque..."
-#: fdisk/fdisk.c:545
-#, fuzzy, c-format
+#: fdisk/fdisk.c:566
+#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr ""
-#: fdisk/fdisk.c:553
-#, c-format
+#: fdisk/fdisk.c:574
+#, fuzzy, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr ""
+msgstr "Mauvaise signature de la table de partitions"
-#: fdisk/fdisk.c:579
+#: fdisk/fdisk.c:600
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"
@@ -1624,107 +2416,107 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:615
+#: fdisk/fdisk.c:636
#, fuzzy
msgid "You will not be able to write the partition table.\n"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:645
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr ""
-#: fdisk/fdisk.c:671
+#: fdisk/fdisk.c:693
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
msgstr ""
-#: fdisk/fdisk.c:687
+#: fdisk/fdisk.c:709
#, fuzzy
msgid "Internal error\n"
msgstr "!!! Erreur Interne !!!"
-#: fdisk/fdisk.c:697
+#: fdisk/fdisk.c:719
#, fuzzy, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Pas de place pour créér une partition étendue"
-#: fdisk/fdisk.c:704
+#: fdisk/fdisk.c:726
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
"w(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:725
+#: fdisk/fdisk.c:747
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:762
+#: fdisk/fdisk.c:784
msgid "Hex code (type L to list codes): "
msgstr ""
-#: fdisk/fdisk.c:801
+#: fdisk/fdisk.c:823
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr ""
-#: fdisk/fdisk.c:855
+#: fdisk/fdisk.c:877
#, c-format
msgid "Using default value %d\n"
msgstr ""
-#: fdisk/fdisk.c:859
+#: fdisk/fdisk.c:881
msgid "Value out of range.\n"
msgstr ""
-#: fdisk/fdisk.c:866
+#: fdisk/fdisk.c:888
#, fuzzy
msgid "Partition number"
msgstr "Table de partitions pour %s\n"
-#: fdisk/fdisk.c:874
-#, fuzzy, c-format
+#: fdisk/fdisk.c:896
+#, c-format
msgid "Warning: partition %d has empty type\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr ""
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:903
#, fuzzy
msgid "cylinder"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:903
#, fuzzy
msgid "sector"
-msgstr "Secteurs"
+msgstr "secteurs"
-#: fdisk/fdisk.c:887
-#, c-format
-msgid "Changing display/entry units to %ss\n"
-msgstr ""
+#: fdisk/fdisk.c:912
+#, fuzzy, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr "Changement du mot de passe pour %s\n"
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:922
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:910
+#: fdisk/fdisk.c:935
msgid "DOS Compatibility flag is set\n"
msgstr ""
-#: fdisk/fdisk.c:914
+#: fdisk/fdisk.c:939
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:999
-#, c-format
+#: fdisk/fdisk.c:1025
+#, fuzzy, c-format
msgid "Partition %d does not exist yet!\n"
-msgstr ""
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1030
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -1732,92 +2524,92 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1013
+#: fdisk/fdisk.c:1039
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1022
+#: fdisk/fdisk.c:1048
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1028
+#: fdisk/fdisk.c:1054
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1042
+#: fdisk/fdisk.c:1068
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1095
+#: fdisk/fdisk.c:1121
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1097 fdisk/fdisk.c:1105 fdisk/fdisk.c:1114 fdisk/fdisk.c:1123
+#: fdisk/fdisk.c:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1098 fdisk/fdisk.c:1106
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1103
+#: fdisk/fdisk.c:1129
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1112
+#: fdisk/fdisk.c:1138
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1115
+#: fdisk/fdisk.c:1141
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1121
+#: fdisk/fdisk.c:1147
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1150
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1131
+#: fdisk/fdisk.c:1157
#, c-format
msgid ""
"\n"
"Disk %s: %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * %d bytes\n"
+"Units = %s of %d * %d bytes\n"
"\n"
msgstr ""
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1168
+#: fdisk/fdisk.c:1194
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisk.c:1169 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:629
+#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr ""
-#: fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1235
#, c-format
msgid ""
"\n"
@@ -1825,104 +2617,104 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1211
+#: fdisk/fdisk.c:1237
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr ""
-#: fdisk/fdisk.c:1250
+#: fdisk/fdisk.c:1276
#, fuzzy, c-format
msgid "Warning: partition %d contains sector 0\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr "Avertissement: nombre de i-noeuds trop grand.\n"
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1279
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1256
+#: fdisk/fdisk.c:1282
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1259
+#: fdisk/fdisk.c:1285
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1263
+#: fdisk/fdisk.c:1289
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1293
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1319
+#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr ""
-#: fdisk/fdisk.c:1301
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1327
+#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr ""
-#: fdisk/fdisk.c:1319
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1345
+#, c-format
msgid "Warning: partition %d is empty\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr ""
-#: fdisk/fdisk.c:1324
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1350
+#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr ""
-#: fdisk/fdisk.c:1330
+#: fdisk/fdisk.c:1356
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1333
-#, c-format
+#: fdisk/fdisk.c:1359
+#, fuzzy, c-format
msgid "%d unallocated sectors\n"
-msgstr ""
+msgstr "impossible d'effacer le secteur de boot"
-#: fdisk/fdisk.c:1345 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
-#: fdisk/fdisk.c:1366 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:254 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr ""
-#: fdisk/fdisk.c:1381 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
msgstr ""
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1439
msgid "No free sectors available\n"
msgstr ""
-#: fdisk/fdisk.c:1417 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:258 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr ""
-#: fdisk/fdisk.c:1447
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr ""
-#: fdisk/fdisk.c:1484 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
msgid "The maximum number of partitions has been created\n"
msgstr ""
-#: fdisk/fdisk.c:1494
+#: fdisk/fdisk.c:1526
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1530
#, c-format
msgid ""
"Command action\n"
@@ -1930,36 +2722,30 @@ msgid ""
" p primary partition (1-4)\n"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1532
msgid "l logical (5 or over)"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1532
msgid "e extended"
msgstr ""
-#: fdisk/fdisk.c:1517
+#: fdisk/fdisk.c:1549
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr ""
-#: fdisk/fdisk.c:1549
-#, fuzzy
+#: fdisk/fdisk.c:1581
msgid ""
"The partition table has been altered!\n"
"\n"
-msgstr "Table de partition écrite sur disque"
+msgstr ""
-#: fdisk/fdisk.c:1551
-#, fuzzy
+#: fdisk/fdisk.c:1590
msgid "Calling ioctl() to re-read partition table.\n"
-msgstr "Seulement imprimer la table de partitions"
-
-#: fdisk/fdisk.c:1568
-msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:1573
+#: fdisk/fdisk.c:1606
#, fuzzy, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
@@ -1968,7 +2754,7 @@ msgstr ""
"Rebootez le systčme pour ętre sur que la table des partitions a été "
"correctement mise ŕ jour.\n"
-#: fdisk/fdisk.c:1579
+#: fdisk/fdisk.c:1612
#, fuzzy
msgid ""
"\n"
@@ -1981,89 +2767,87 @@ msgstr ""
"une ou des partitions DOS 6.x, reportez-vous au manuel\n"
"de cfdisk pour avoir plus d'informations.\n"
-#: fdisk/fdisk.c:1610
+#: fdisk/fdisk.c:1619
+msgid "Syncing disks.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1650
#, fuzzy, c-format
msgid "Device: %s\n"
msgstr "Disque Dur: %s\n"
-#: fdisk/fdisk.c:1625
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1665
+#, c-format
msgid "Partition %d has no data area\n"
-msgstr "Table de partitions pour %s\n"
+msgstr ""
-#: fdisk/fdisk.c:1631
+#: fdisk/fdisk.c:1671
msgid "New beginning of data"
msgstr ""
-#: fdisk/fdisk.c:1645
+#: fdisk/fdisk.c:1685
msgid "Expert command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:1656
+#: fdisk/fdisk.c:1696
#, fuzzy
msgid "Number of cylinders"
msgstr "Entrez le nombre de cylindres: "
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1717
#, fuzzy
msgid "Number of heads"
msgstr "Entrez le nombre de tętes: "
-#: fdisk/fdisk.c:1702
+#: fdisk/fdisk.c:1742
#, fuzzy
msgid "Number of sectors"
msgstr " Secteurs"
-#: fdisk/fdisk.c:1705
+#: fdisk/fdisk.c:1745
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:1767
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1807
+#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr ""
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1821
#, fuzzy, c-format
msgid "Cannot open %s\n"
-msgstr "Impossible d'ouvrir le disque dur"
+msgstr "Impossible d'ouvrir le fichier '%s'"
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1886
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:1839
+#: fdisk/fdisk.c:1889
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
#: fdisk/fdisk.c:1947
-#, fuzzy, c-format
-msgid "Using %s as default device!\n"
-msgstr "%s: n'est pas un lecteur de disquettes\n"
-
-#: fdisk/fdisk.c:1953
msgid "Command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:1967
+#: fdisk/fdisk.c:1961
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:1969
+#: fdisk/fdisk.c:1963
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:1971
-#, fuzzy
+#: fdisk/fdisk.c:1965
msgid "Boot file unchanged\n"
-msgstr "Le disque a été changé.\n"
+msgstr ""
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2025
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2086,295 +2870,296 @@ msgid ""
"\t machine. (Otherwise you become an AIXpert)."
msgstr ""
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:99
#, c-format
msgid ""
"\n"
"BSD label for device: %s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:108
#, fuzzy
msgid " d delete a BSD partition"
msgstr " d Effacer la partition courante"
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:109
msgid " e edit drive data"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:110
msgid " i install bootstrap"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:111
#, fuzzy
msgid " l list known filesystem types"
msgstr " t Changer le type de systčme de fichiers"
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:113
#, fuzzy
msgid " n add a new BSD partition"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Créér une nouvelle partition logique"
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:114
#, fuzzy
msgid " p print BSD partition table"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:119
msgid " s show complete disklabel"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:120
#, fuzzy
msgid " t change a partition's filesystem id"
msgstr " t Changer le type de systčme de fichiers"
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:121
msgid " w write disklabel to disk"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:123
msgid " x link BSD partition to non-BSD partition"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:148
#, fuzzy, c-format
msgid "Partition %s%d has invalid starting sector 0.\n"
-msgstr "Table de partitions pour %s\n"
+msgstr "La partition se termine avant le secteur 0"
-#: fdisk/fdiskbsdlabel.c:150
+#: fdisk/fdiskbsdlabel.c:152
#, c-format
msgid "Reading disklabel of %s%d at sector %d.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:159
-#, fuzzy, c-format
+#: fdisk/fdiskbsdlabel.c:161
+#, c-format
msgid "There is no *BSD partition on %s.\n"
-msgstr "Table de partition non écrite sur le disque"
+msgstr ""
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:176
msgid "BSD disklabel command (m for help): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:286
+#: fdisk/fdiskbsdlabel.c:288
#, c-format
msgid "type: %s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:290
#, c-format
msgid "type: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:289
+#: fdisk/fdiskbsdlabel.c:291
#, fuzzy, c-format
msgid "disk: %.*s\n"
msgstr "Disque Dur: %s\n"
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:292
#, c-format
msgid "label: %.*s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:293
#, fuzzy
msgid "flags:"
msgstr "Drapeaux"
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:295
#, fuzzy
msgid " removable"
msgstr "Enlever"
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:297
msgid " ecc"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:299
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:301
+#: fdisk/fdiskbsdlabel.c:303
#, fuzzy, c-format
msgid "bytes/sector: %ld\n"
msgstr "Secteur %d:\n"
-#: fdisk/fdiskbsdlabel.c:302
+#: fdisk/fdiskbsdlabel.c:304
#, fuzzy, c-format
msgid "sectors/track: %ld\n"
msgstr "Secteur %d:\n"
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:305
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:306
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:307
#, fuzzy, c-format
msgid "cylinders: %ld\n"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:308
#, c-format
msgid "rpm: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:309
#, c-format
msgid "interleave: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:310
#, c-format
msgid "trackskew: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:311
#, fuzzy, c-format
msgid "cylinderskew: %d\n"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:312
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:313
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:314
msgid "drivedata: "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:321
+#: fdisk/fdiskbsdlabel.c:323
#, fuzzy, c-format
msgid ""
"\n"
"%d partitions:\n"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:324
msgid "# size offset fstype [fsize bsize cpg]\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:378
+#: fdisk/fdiskbsdlabel.c:380
#, fuzzy, c-format
msgid "Writing disklabel to %s%d.\n"
msgstr "Table de partitions pour %s\n"
-#: fdisk/fdiskbsdlabel.c:381
+#: fdisk/fdiskbsdlabel.c:383
#, fuzzy, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Table de partitions pour %s\n"
-#: fdisk/fdiskbsdlabel.c:392
+#: fdisk/fdiskbsdlabel.c:395
#, c-format
msgid "%s%d contains no disklabel.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:395
+#: fdisk/fdiskbsdlabel.c:398
#, c-format
msgid "%s contains no disklabel.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:399
+#: fdisk/fdiskbsdlabel.c:402
msgid "Do you want to create a disklabel? (y/n) "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:438
+#: fdisk/fdiskbsdlabel.c:441
#, fuzzy
msgid "bytes/sector"
-msgstr "Secteurs"
+msgstr "secteurs"
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:442
#, fuzzy
msgid "sectors/track"
-msgstr "Secteurs"
+msgstr "secteurs"
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:443
#, fuzzy
msgid "tracks/cylinder"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdiskbsdlabel.c:448
+#: fdisk/fdiskbsdlabel.c:451
#, fuzzy
msgid "sectors/cylinder"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdiskbsdlabel.c:452
+#: fdisk/fdiskbsdlabel.c:455
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:454
+#: fdisk/fdiskbsdlabel.c:457
msgid "rpm"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:458
msgid "interleave"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:459
msgid "trackskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:460
#, fuzzy
msgid "cylinderskew"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:461
+#, fuzzy
msgid "headswitch"
-msgstr ""
+msgstr "tętes"
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:462
msgid "track-to-track seek"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:500
+#: fdisk/fdiskbsdlabel.c:503
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:526
+#: fdisk/fdiskbsdlabel.c:529
msgid "Bootstrap overlaps with disk label!\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:547
+#: fdisk/fdiskbsdlabel.c:550
#, c-format
msgid "Bootstrap installed on %s%d.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:549
+#: fdisk/fdiskbsdlabel.c:552
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:570
+#: fdisk/fdiskbsdlabel.c:573
#, c-format
msgid "Partition (a-%c): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:601
+#: fdisk/fdiskbsdlabel.c:604
#, fuzzy
msgid "This partition already exists.\n"
-msgstr "Table de partition écrite sur disque"
+msgstr "Cette partition est déjŕ utilisée"
-#: fdisk/fdiskbsdlabel.c:723
-#, fuzzy, c-format
+#: fdisk/fdiskbsdlabel.c:726
+#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr ""
-#: fdisk/fdiskbsdlabel.c:769
+#: fdisk/fdiskbsdlabel.c:772
msgid ""
"\n"
"Syncing disks.\n"
@@ -2433,7 +3218,7 @@ msgid "SGI rxlvol"
msgstr ""
#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:52
+#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
#, fuzzy
msgid "Linux swap"
msgstr "Linux"
@@ -2461,7 +3246,7 @@ msgid ""
"%d cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2470,7 +3255,7 @@ msgstr ""
msgid ""
"\n"
"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2535,7 +3320,7 @@ msgstr ""
#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
#, fuzzy
msgid "No partitions defined\n"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
#: fdisk/fdisksgilabel.c:463
msgid "IRIX likes when Partition 11 covers the entire disk.\n"
@@ -2560,9 +3345,9 @@ msgid "One Partition (#11) should cover the entire disk.\n"
msgstr ""
#: fdisk/fdisksgilabel.c:488
-#, fuzzy, c-format
+#, c-format
msgid "Partition %d does not start on cylinder boundary.\n"
-msgstr "Table de partitions pour %s\n"
+msgstr ""
#: fdisk/fdisksgilabel.c:495
#, c-format
@@ -2580,32 +3365,33 @@ msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
msgstr ""
#: fdisk/fdisksgilabel.c:545
-#, fuzzy
msgid ""
"\n"
"The boot partition does not exist.\n"
-msgstr "Table de partition écrite sur disque"
+msgstr ""
#: fdisk/fdisksgilabel.c:549
#, fuzzy
msgid ""
"\n"
"The swap partition does not exist.\n"
-msgstr "Table de partition écrite sur disque"
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
#: fdisk/fdisksgilabel.c:554
+#, fuzzy
msgid ""
"\n"
"The swap partition has no swap type.\n"
-msgstr ""
+msgstr "Cette partition est unitilisable"
#: fdisk/fdisksgilabel.c:558
msgid "\tYou have chosen an unusual boot file name.\n"
msgstr ""
#: fdisk/fdisksgilabel.c:569
+#, fuzzy
msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
+msgstr "Impossible de changer le type d'une partition vide"
#: fdisk/fdisksgilabel.c:576
msgid ""
@@ -2742,25 +3528,24 @@ msgstr "Secteurs"
#: fdisk/fdisksunlabel.c:310
#, fuzzy
msgid "Alternate cylinders"
-msgstr "Cylindres"
+msgstr "cylindres"
#: fdisk/fdisksunlabel.c:313
#, fuzzy
msgid "Physical cylinders"
-msgstr "Cylindres"
+msgstr "cylindres"
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
msgid "Rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
msgid "Interleave factor"
msgstr ""
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:665
-#, fuzzy
+#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
msgid "Extra sectors per cylinder"
-msgstr "Cylindres"
+msgstr ""
#: fdisk/fdisksunlabel.c:334
msgid "You may change all the disk params from the x menu"
@@ -2781,9 +3566,9 @@ msgid "Partition %d doesn't end on cylinder boundary\n"
msgstr ""
#: fdisk/fdisksunlabel.c:438
-#, fuzzy, c-format
+#, c-format
msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr "Table de partitions pour %s\n"
+msgstr ""
#: fdisk/fdisksunlabel.c:460
#, c-format
@@ -2804,19 +3589,19 @@ msgstr ""
#: fdisk/fdisksunlabel.c:547
#, c-format
msgid ""
-"You haven't covered whole disk with 3rd partition, but your value\n"
-"%d %s covers some other partition. Your entry have been changed\n"
+"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 ""
-#: fdisk/fdisksunlabel.c:565
+#: fdisk/fdisksunlabel.c:567
#, 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:578
+#: fdisk/fdisksunlabel.c:580
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -2825,7 +3610,7 @@ msgid ""
"tagged with 82 (Linux swap): "
msgstr ""
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
#, c-format
msgid ""
"\n"
@@ -2833,30 +3618,30 @@ msgid ""
"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:625
#, c-format
msgid ""
"\n"
"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:630
#, c-format
msgid "%*s Flag Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:655
#, fuzzy
msgid "Number of alternate cylinders"
msgstr "Entrez le nombre de cylindres: "
-#: fdisk/fdisksunlabel.c:686
+#: fdisk/fdisksunlabel.c:688
#, fuzzy
msgid "Number of physical cylinders"
msgstr "Entrez le nombre de cylindres: "
@@ -2955,278 +3740,298 @@ msgid "AST Windows swapfile"
msgstr ""
#: fdisk/i386_sys_types.c:28
-msgid "NEC DOS"
+msgid "Hidden Win95 FAT32"
msgstr ""
#: fdisk/i386_sys_types.c:29
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:32
#, fuzzy
msgid "PartitionMagic recovery"
-msgstr "Table de partitions pour %s\n"
+msgstr "La partition commence avant le secteur 0"
-#: fdisk/i386_sys_types.c:30
+#: fdisk/i386_sys_types.c:33
msgid "Venix 80286"
msgstr ""
-#: fdisk/i386_sys_types.c:31
+#: fdisk/i386_sys_types.c:34
msgid "PPC PReP Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:32
+#: fdisk/i386_sys_types.c:35
msgid "SFS"
msgstr ""
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:36
msgid "QNX4.x"
msgstr ""
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:37
msgid "QNX4.x 2nd part"
msgstr ""
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:38
msgid "QNX4.x 3rd part"
msgstr ""
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:39
msgid "OnTrack DM"
msgstr ""
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:40
msgid "OnTrack DM6 Aux1"
msgstr ""
#. (or Novell)
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:41
msgid "CP/M"
msgstr ""
#. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:42
msgid "OnTrack DM6 Aux3"
msgstr ""
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:43
msgid "OnTrackDM6"
msgstr ""
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:44
msgid "EZ-Drive"
msgstr ""
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:45
msgid "Golden Bow"
msgstr ""
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:46
msgid "Priam Edisk"
msgstr ""
#. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:44 fdisk/i386_sys_types.c:73
-#: fdisk/i386_sys_types.c:75 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
#, fuzzy
msgid "SpeedStor"
msgstr "Secteurs"
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:48
msgid "GNU HURD or SysV"
msgstr ""
#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:49
msgid "Novell Netware 286"
msgstr ""
-#: fdisk/i386_sys_types.c:47
+#: fdisk/i386_sys_types.c:50
msgid "Novell Netware 386"
msgstr ""
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:51
msgid "DiskSecure Multi-Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:52
msgid "PC/IX"
msgstr ""
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:53
msgid "Old Minix"
msgstr ""
#. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:54
msgid "Minix / old Linux"
msgstr ""
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:57
msgid "OS/2 hidden C: drive"
msgstr ""
-#: fdisk/i386_sys_types.c:55
+#: fdisk/i386_sys_types.c:58
#, fuzzy
msgid "Linux extended"
msgstr "Linux ext2"
-#: fdisk/i386_sys_types.c:56 fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
msgid "NTFS volume set"
msgstr ""
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:61
msgid "Amoeba"
msgstr ""
-#: fdisk/i386_sys_types.c:59
+#: fdisk/i386_sys_types.c:62
msgid "Amoeba BBT"
msgstr ""
#. (bad block table)
-#: fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:63
msgid "IBM Thinkpad hibernation"
msgstr ""
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:64
msgid "BSD/386"
msgstr ""
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:65
msgid "OpenBSD"
msgstr ""
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:66
msgid "NeXTSTEP"
msgstr ""
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
msgid "BSDI fs"
msgstr ""
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
msgid "BSDI swap"
msgstr ""
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
msgid "DRDOS/sec (FAT-12)"
msgstr ""
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
msgid "DRDOS/sec (FAT-16 < 32M)"
msgstr ""
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
msgid "DRDOS/sec (FAT-16)"
msgstr ""
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
msgid "Syrinx"
msgstr ""
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
msgid "CP/M / CTOS / ..."
msgstr ""
#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
msgid "DOS access"
msgstr ""
#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
msgid "DOS R/O"
msgstr ""
#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
msgid "BeOS fs"
msgstr ""
#. SpeedStor large partition
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
msgid "DOS secondary"
msgstr ""
#. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:78
+#: fdisk/i386_sys_types.c:81
+msgid "Linux raid autodetect"
+msgstr ""
+
+#. New (2.2.x) raid partition with autodetect
+#. using persistent superblock
+#: fdisk/i386_sys_types.c:83
msgid "LANstep"
msgstr ""
#. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:84
msgid "BBT"
msgstr ""
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:153
+#: fdisk/sfdisk.c:152
#, c-format
msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
msgstr ""
-#: fdisk/sfdisk.c:199
+#: fdisk/sfdisk.c:198
+#, fuzzy
msgid "out of memory - giving up\n"
-msgstr ""
+msgstr "Pas assez de mémoire pour agrandir le buffer.\n"
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr ""
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:274
+#: fdisk/sfdisk.c:273
#, c-format
msgid "cannot open partition sector save file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:292
-#, c-format
+#: fdisk/sfdisk.c:291
+#, fuzzy, c-format
msgid "write error on %s\n"
-msgstr ""
+msgstr "col: erreur d'écriture.\n"
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, c-format
msgid "cannot stat partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
msgid "partition restore file has wrong size - not restoring\n"
msgstr ""
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:318
+#, fuzzy
msgid "out of memory?\n"
-msgstr ""
+msgstr "%s: A court de mémoire!\n"
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, c-format
msgid "cannot open partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:331
-#, c-format
+#: fdisk/sfdisk.c:330
+#, fuzzy, c-format
msgid "error reading %s\n"
-msgstr ""
+msgstr "Impossible de lire %s\n"
-#: fdisk/sfdisk.c:338
+#: fdisk/sfdisk.c:337
#, fuzzy, c-format
msgid "cannot open device %s for writing\n"
-msgstr "Impossible d'ouvrir le disque dur"
+msgstr "Impossible d'ouvrir /dev/port"
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:407
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3234,519 +4039,501 @@ msgid ""
"[Use the --force option if you really want this]\n"
msgstr ""
-#: fdisk/sfdisk.c:413
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr ""
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:419
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr ""
-#: fdisk/sfdisk.c:423
+#: fdisk/sfdisk.c:431
#, fuzzy, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr "Changement de géométrie terminé"
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
"This will give problems with all software that uses C/H/S addressing.\n"
msgstr ""
-#: fdisk/sfdisk.c:429
+#: fdisk/sfdisk.c:437
#, c-format
msgid ""
"\n"
-"Disk %s: %lu heads, %lu sectors, %lu cylinders\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:514
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
"0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:558
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:703
+#: fdisk/sfdisk.c:719
#, fuzzy
msgid "Re-reading the partition table ...\n"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/sfdisk.c:709
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
msgstr ""
-#: fdisk/sfdisk.c:714
+#: fdisk/sfdisk.c:730
#, c-format
msgid "Error closing %s\n"
msgstr ""
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:768
#, fuzzy, c-format
msgid "%s: no such partition\n"
msgstr "Mauvaise partition logique"
-#: fdisk/sfdisk.c:775
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:830
#, fuzzy, c-format
msgid "# partition table of %s\n"
msgstr "Table de partitions pour %s\n"
-#: fdisk/sfdisk.c:814
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr ""
-#: fdisk/sfdisk.c:828
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:831
+#: fdisk/sfdisk.c:848
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:836
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:838
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:843
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:903
-#, c-format
-msgid " start=%9lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:904
-#, fuzzy, c-format
-msgid ", size=%8lu"
-msgstr "Taillemax=%ld\n"
-
-#: fdisk/sfdisk.c:906
-#, c-format
-msgid ", Id=%2x"
-msgstr ""
-
-#: fdisk/sfdisk.c:908
-#, fuzzy
-msgid ", bootable"
-msgstr "Bootable"
-
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:997
#, c-format
msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:1004
#, c-format
msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:1007
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:989
+#: fdisk/sfdisk.c:1018
#, fuzzy
msgid "No partitions found\n"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
-#: fdisk/sfdisk.c:1034
+#: fdisk/sfdisk.c:1025
+#, c-format
+msgid ""
+"Warning: The first partition 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 ""
+
+#: fdisk/sfdisk.c:1075
#, fuzzy
msgid "no partition table present.\n"
msgstr "Table de partition écrite sur disque"
-#: fdisk/sfdisk.c:1036
+#: fdisk/sfdisk.c:1077
#, c-format
msgid "strange, only %d partitions defined.\n"
msgstr ""
-#: fdisk/sfdisk.c:1045
+#: fdisk/sfdisk.c:1086
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
msgstr ""
-#: fdisk/sfdisk.c:1048
+#: fdisk/sfdisk.c:1089
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
msgstr ""
-#: fdisk/sfdisk.c:1051
+#: fdisk/sfdisk.c:1092
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
msgstr ""
-#: fdisk/sfdisk.c:1062
+#: fdisk/sfdisk.c:1103
#, fuzzy, c-format
msgid "Warning: partition %s "
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr "Trops de partitions"
-#: fdisk/sfdisk.c:1063
+#: fdisk/sfdisk.c:1104
#, fuzzy, c-format
msgid "is not contained in partition %s\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Impossible de maximiser cette partition"
-#: fdisk/sfdisk.c:1074
-#, c-format
+#: fdisk/sfdisk.c:1115
+#, fuzzy, c-format
msgid "Warning: partitions %s "
-msgstr ""
+msgstr "Trops de partitions"
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr ""
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1127
#, fuzzy, c-format
msgid "Warning: partition %s contains part of "
msgstr "Ecriture de la table de partition sur disque..."
-#: fdisk/sfdisk.c:1087
+#: fdisk/sfdisk.c:1128
#, fuzzy, c-format
msgid "the partition table (sector %lu),\n"
msgstr "Table de partition écrite sur disque"
-#: fdisk/sfdisk.c:1088
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr ""
-#: fdisk/sfdisk.c:1097
+#: fdisk/sfdisk.c:1138
#, c-format
msgid "Warning: partition %s starts at sector 0\n"
msgstr ""
-#: fdisk/sfdisk.c:1101
+#: fdisk/sfdisk.c:1142
#, fuzzy, c-format
msgid "Warning: partition %s extends past end of disk\n"
-msgstr "Ecriture de la table de partition sur disque..."
+msgstr "La partition se termine aprčs la fin du disque"
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr ""
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr ""
-#: fdisk/sfdisk.c:1133
+#: fdisk/sfdisk.c:1174
#, c-format
msgid "Warning: partition %s does not start at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1180
#, c-format
msgid "Warning: partition %s does not end at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1198
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:1164
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
msgstr ""
-#: fdisk/sfdisk.c:1170
+#: fdisk/sfdisk.c:1211
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:1187
+#: fdisk/sfdisk.c:1228
#, c-format
msgid ""
"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1196
+#: fdisk/sfdisk.c:1237
#, c-format
msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1199
+#: fdisk/sfdisk.c:1240
#, c-format
msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1232 fdisk/sfdisk.c:1309
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, c-format
msgid "too many partitions - ignoring those past nr (%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1288
#, fuzzy
msgid "tree of partitions?\n"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr ""
-#: fdisk/sfdisk.c:1358
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:1378
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1417
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1470
msgid "-n flag was given: Nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:1442
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr ""
-#: fdisk/sfdisk.c:1447
+#: fdisk/sfdisk.c:1488
#, fuzzy, c-format
msgid "Failed writing the partition on %s\n"
msgstr "Table de partition non écrite sur le disque"
-#: fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr ""
-#: fdisk/sfdisk.c:1560
+#: fdisk/sfdisk.c:1601
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1567
+#: fdisk/sfdisk.c:1608
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1573
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1605
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr ""
-#: fdisk/sfdisk.c:1609
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr ""
-#: fdisk/sfdisk.c:1725
+#: fdisk/sfdisk.c:1766
#, fuzzy
msgid "no room for partition descriptor\n"
-msgstr "Ne pas créér la partition"
+msgstr "Plus de partitions"
-#: fdisk/sfdisk.c:1758
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1809
-#, fuzzy
+#: fdisk/sfdisk.c:1850
msgid "too many input fields\n"
-msgstr "Trops d'arguments.\n"
+msgstr ""
#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1843
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr ""
-#: fdisk/sfdisk.c:1862
+#: fdisk/sfdisk.c:1903
#, fuzzy
msgid "Illegal type\n"
msgstr "Touche non valide"
-#: fdisk/sfdisk.c:1894
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1899
+#: fdisk/sfdisk.c:1940
#, fuzzy
msgid "Warning: empty partition\n"
-msgstr "Créér une nouvelle partition primaire"
+msgstr "Impossible d'effacer une partition vide"
-#: fdisk/sfdisk.c:1913
+#: fdisk/sfdisk.c:1954
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1926
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr ""
-#: fdisk/sfdisk.c:1943 fdisk/sfdisk.c:1956
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr ""
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2008
#, fuzzy
msgid "Extended partition not where expected\n"
msgstr "Créér une nouvelle partition"
-#: fdisk/sfdisk.c:1999
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr ""
-#: fdisk/sfdisk.c:2021
+#: fdisk/sfdisk.c:2062
#, fuzzy
msgid "too many partitions\n"
-msgstr "Trops d'arguments.\n"
+msgstr "Trops de partitions"
-#: fdisk/sfdisk.c:2054
+#: fdisk/sfdisk.c:2095
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:2074
+#: fdisk/sfdisk.c:2115
+#, fuzzy
msgid "version"
-msgstr ""
+msgstr "mkfs version "
-#: fdisk/sfdisk.c:2080
+#: fdisk/sfdisk.c:2121
#, fuzzy, c-format
msgid "Usage: %s [options] device ...\n"
msgstr "usage: %s [ -n ] périphérique\n"
-#: fdisk/sfdisk.c:2081
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr ""
-#: fdisk/sfdisk.c:2082
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr ""
-#: fdisk/sfdisk.c:2083
+#: fdisk/sfdisk.c:2124
msgid " -s [or --show-size]: list size of a partition"
msgstr ""
-#: fdisk/sfdisk.c:2084
+#: fdisk/sfdisk.c:2125
msgid " -c [or --id]: print or change partition Id"
msgstr ""
-#: fdisk/sfdisk.c:2085
+#: fdisk/sfdisk.c:2126
msgid " -l [or --list]: list partitions of each device"
msgstr ""
-#: fdisk/sfdisk.c:2086
+#: fdisk/sfdisk.c:2127
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr ""
-#: fdisk/sfdisk.c:2087
+#: fdisk/sfdisk.c:2128
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr ""
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2129
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of "
"sectors/blocks/cylinders/MB"
msgstr ""
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2130
msgid " -T [or --list-types]:list the known partition types"
msgstr ""
-#: fdisk/sfdisk.c:2090
+#: fdisk/sfdisk.c:2131
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr ""
-#: fdisk/sfdisk.c:2091
+#: fdisk/sfdisk.c:2132
msgid " -R [or --re-read]: make kernel reread partition table"
msgstr ""
-#: fdisk/sfdisk.c:2092
+#: fdisk/sfdisk.c:2133
#, fuzzy
msgid " -N# : change only the partition with number #"
msgstr ""
" u Changement de l'unité utilisée pour la taille des partitions"
-#: fdisk/sfdisk.c:2093
+#: fdisk/sfdisk.c:2134
#, fuzzy
msgid " -n : do not actually write to disk"
msgstr ""
" r - Données brutes (Exactement ce que cfdisk écrirait sur le "
"disque)"
-#: fdisk/sfdisk.c:2094
+#: fdisk/sfdisk.c:2135
#, fuzzy
msgid ""
" -O file : save the sectors that will be overwritten to file"
@@ -3754,193 +4541,194 @@ msgstr ""
" r - Données brutes (Exactement ce que cfdisk écrirait sur le "
"disque)"
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2136
#, fuzzy
msgid " -I file : restore these sectors again"
msgstr " s - Table triée par secteurs"
-#: fdisk/sfdisk.c:2096
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr ""
-#: fdisk/sfdisk.c:2097
+#: fdisk/sfdisk.c:2138
#, fuzzy
msgid " -? [or --help]: print this message"
-msgstr " h Afficher cet écran"
+msgstr " ? Affiche cet écran"
-#: fdisk/sfdisk.c:2098
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr ""
-#: fdisk/sfdisk.c:2099
+#: fdisk/sfdisk.c:2140
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr ""
-#: fdisk/sfdisk.c:2100
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
msgstr ""
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2143
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr ""
-#: fdisk/sfdisk.c:2103
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr ""
-#: fdisk/sfdisk.c:2104
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr ""
-#: fdisk/sfdisk.c:2105
+#: fdisk/sfdisk.c:2146
#, fuzzy
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr "Entrez le nombre de cylindres: "
-#: fdisk/sfdisk.c:2106
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr ""
-#: fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr ""
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr ""
-#: fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2150
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr ""
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2156
msgid "Usage:"
msgstr ""
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2157
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr ""
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2158
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2159
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr ""
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr ""
-#: fdisk/sfdisk.c:2360
+#: fdisk/sfdisk.c:2401
#, fuzzy, c-format
msgid "total: %d blocks\n"
msgstr "%ld blocs\n"
-#: fdisk/sfdisk.c:2397
+#: fdisk/sfdisk.c:2438
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr ""
-#: fdisk/sfdisk.c:2399
+#: fdisk/sfdisk.c:2440
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr ""
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2442
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr ""
-#: fdisk/sfdisk.c:2408
+#: fdisk/sfdisk.c:2449
msgid "can specify only one device (except with -l or -s)\n"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
#, fuzzy, c-format
msgid "cannot open %s %s\n"
-msgstr "Impossible d'ouvrir le disque dur"
+msgstr "Impossible d'ouvrir le fichier '%s'"
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr ""
-#: fdisk/sfdisk.c:2458
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr ""
-#: fdisk/sfdisk.c:2475
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:2478
-#, c-format
+#: fdisk/sfdisk.c:2519
+#, fuzzy, c-format
msgid "%s: unknown geometry\n"
-msgstr ""
+msgstr "renice: %s: utilisateur inconnu\n"
-#: fdisk/sfdisk.c:2493
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2570
+#: fdisk/sfdisk.c:2612
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr ""
-#: fdisk/sfdisk.c:2587 fdisk/sfdisk.c:2640 fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
#, fuzzy
msgid ""
"Done\n"
"\n"
msgstr "Terminé"
-#: fdisk/sfdisk.c:2596
+#: fdisk/sfdisk.c:2638
#, 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:2610
+#: fdisk/sfdisk.c:2652
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr ""
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr ""
-#: fdisk/sfdisk.c:2681
+#: fdisk/sfdisk.c:2723
+#, fuzzy
msgid "This disk is currently in use.\n"
-msgstr ""
+msgstr "Cette partition est déjŕ utilisée"
-#: fdisk/sfdisk.c:2698
-#, c-format
+#: fdisk/sfdisk.c:2740
+#, fuzzy, c-format
msgid "Fatal error: cannot find %s\n"
-msgstr ""
+msgstr "Erreur fatale\n"
-#: fdisk/sfdisk.c:2701
+#: fdisk/sfdisk.c:2743
#, fuzzy, c-format
msgid "Warning: %s is not a block device\n"
-msgstr "%s: n'est pas un lecteur de disquettes\n"
+msgstr "%s: %s n'est pas un périphérique lp.\n"
-#: fdisk/sfdisk.c:2706
+#: fdisk/sfdisk.c:2749
msgid "Checking that no-one is using this disk right now ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -3948,87 +4736,89 @@ msgid ""
"--no-reread flag to suppress this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2755
msgid "Use the --force flag to overrule all checks.\n"
msgstr ""
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr ""
-#: fdisk/sfdisk.c:2725
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2772
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr ""
-#: fdisk/sfdisk.c:2737
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
msgstr ""
-#: fdisk/sfdisk.c:2745
+#: fdisk/sfdisk.c:2788
msgid "I don't like this - probably you should answer No\n"
msgstr ""
-#: fdisk/sfdisk.c:2750
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2752
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2757
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
msgstr ""
-#: fdisk/sfdisk.c:2759
+#: fdisk/sfdisk.c:2802
+#, fuzzy
msgid "Quitting - nothing changed\n"
-msgstr ""
+msgstr "Informations utilisateurs non changées.\n"
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2808
+#, fuzzy
msgid "Please answer one of y,n,q\n"
-msgstr ""
+msgstr "Répondez par `oui' ou par `non'"
-#: fdisk/sfdisk.c:2773
+#: fdisk/sfdisk.c:2816
#, fuzzy
msgid ""
"Successfully wrote the new partition table\n"
"\n"
msgstr "Seulement imprimer la table de partitions"
-#: fdisk/sfdisk.c:2779
+#: fdisk/sfdisk.c:2822
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 ""
-#: games/banner.c:1051
+#: games/banner.c:1048
msgid "usage: banner [-w width]\n"
msgstr ""
-#: games/banner.c:1071
+#: games/banner.c:1068
msgid "Message: "
msgstr ""
-#: games/banner.c:1105
+#: games/banner.c:1102
#, c-format
msgid "The character '%c' is not in my character set"
msgstr ""
-#: games/banner.c:1113
+#: games/banner.c:1110
#, c-format
msgid "Message '%s' is OK\n"
msgstr ""
@@ -4117,152 +4907,154 @@ msgstr ""
msgid "internal error, contact the author."
msgstr ""
-#: login-utils/agetty.c:300
+#: login-utils/agetty.c:307
+#, fuzzy
msgid "calling open_tty\n"
-msgstr ""
+msgstr "Appel de settimeofday :\n"
#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:313
+#: login-utils/agetty.c:320
msgid "calling termio_init\n"
msgstr ""
-#: login-utils/agetty.c:318
+#: login-utils/agetty.c:325
msgid "writing init string\n"
msgstr ""
#. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:328
+#: login-utils/agetty.c:335
msgid "before autobaud\n"
msgstr ""
-#: login-utils/agetty.c:340
+#: login-utils/agetty.c:347
msgid "waiting for cr-lf\n"
msgstr ""
-#: login-utils/agetty.c:344
+#: login-utils/agetty.c:351
#, c-format
msgid "read %c\n"
msgstr ""
#. Read the login name.
-#: login-utils/agetty.c:353
+#: login-utils/agetty.c:360
msgid "reading login name\n"
msgstr ""
-#: login-utils/agetty.c:374
+#: login-utils/agetty.c:381
#, c-format
msgid "%s: can't exec %s: %m"
msgstr ""
-#: login-utils/agetty.c:394
+#: login-utils/agetty.c:401
msgid "can't malloc initstring"
msgstr ""
-#: login-utils/agetty.c:456
+#: login-utils/agetty.c:466
#, c-format
msgid "bad timeout value: %s"
msgstr ""
-#: login-utils/agetty.c:465
+#: login-utils/agetty.c:475
msgid "after getopt loop\n"
msgstr ""
-#: login-utils/agetty.c:483
+#: login-utils/agetty.c:493
msgid "exiting parseargs\n"
msgstr ""
-#: login-utils/agetty.c:496
+#: login-utils/agetty.c:506
msgid "entered parse_speeds\n"
msgstr ""
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:509
#, c-format
msgid "bad speed: %s"
msgstr ""
-#: login-utils/agetty.c:501
+#: login-utils/agetty.c:511
msgid "too many alternate speeds"
msgstr ""
-#: login-utils/agetty.c:503
+#: login-utils/agetty.c:513
msgid "exiting parsespeeds\n"
msgstr ""
-#: login-utils/agetty.c:576
+#: login-utils/agetty.c:588
#, c-format
msgid "%s: open for update: %m"
msgstr ""
-#: login-utils/agetty.c:592
+#: login-utils/agetty.c:606
#, c-format
msgid "%s: no utmp entry"
msgstr ""
-#: login-utils/agetty.c:621
+#: login-utils/agetty.c:635
#, c-format
msgid "/dev: chdir() failed: %m"
msgstr ""
-#: login-utils/agetty.c:625
-#, c-format
+#: login-utils/agetty.c:639
+#, fuzzy, c-format
msgid "/dev/%s: not a character device"
-msgstr ""
+msgstr "%s: n'est pas un lecteur de disquettes\n"
#. ignore close(2) errors
-#: login-utils/agetty.c:632
+#: login-utils/agetty.c:646
msgid "open(2)\n"
msgstr ""
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:648
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr ""
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:658
#, c-format
msgid "%s: not open for read/write"
msgstr ""
#. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:648
+#: login-utils/agetty.c:662
msgid "duping\n"
msgstr ""
#. set up stdout and stderr
-#: login-utils/agetty.c:650
+#: login-utils/agetty.c:664
#, c-format
msgid "%s: dup problem: %m"
msgstr ""
-#: login-utils/agetty.c:712
+#: login-utils/agetty.c:769
msgid "term_io 2\n"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:951
msgid "user"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:951
+#, fuzzy
msgid "users"
-msgstr ""
+msgstr "secteurs"
-#: login-utils/agetty.c:982
+#: login-utils/agetty.c:1039
#, c-format
msgid "%s: read: %m"
msgstr ""
-#: login-utils/agetty.c:1028
+#: login-utils/agetty.c:1085
#, c-format
msgid "%s: input overrun"
msgstr ""
-#: login-utils/agetty.c:1152
+#: login-utils/agetty.c:1209
#, c-format
msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
-"baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] 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 ""
#: login-utils/checktty.c:46
@@ -4288,186 +5080,190 @@ msgid "can't malloc for grplist"
msgstr ""
#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:424
+#: login-utils/checktty.c:431
#, c-format
msgid "Login on %s from %s denied by default.\n"
-msgstr ""
+msgstr "Connexion sur %s ŕ partir de %s refusée 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:435
+#: login-utils/checktty.c:442
#, c-format
msgid "Login on %s from %s denied.\n"
-msgstr ""
+msgstr "Connexion sur %s ŕ partir de %s refusée.\n"
-#: login-utils/chfn.c:139 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
-msgstr ""
+msgstr "%s: vous (utilisateur %d) n'existez pas.\n"
-#: login-utils/chfn.c:146 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
-#: login-utils/chfn.c:151 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr ""
+"%s: peux seulement changer les entrées locales; utilisez plutot yp%s.\n"
-#: login-utils/chfn.c:163
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
-msgstr ""
+msgstr "Changement des informations utilisateur pour %s.\n"
-#: login-utils/chfn.c:169 login-utils/chfn.c:173 login-utils/chfn.c:180
-#: login-utils/chfn.c:184 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
-msgstr ""
+msgstr "Erreur de mot de passe."
-#: login-utils/chfn.c:193 login-utils/chsh.c:178 login-utils/login.c:650
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:196
-#: mount/lomount.c:202 mount/losetup.c:115 mount/losetup.c:121
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:684
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:209
+#: mount/lomount.c:215 mount/losetup.c:125 mount/losetup.c:131
msgid "Password: "
-msgstr ""
+msgstr "Mot de passe: "
-#: login-utils/chfn.c:196 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
-msgstr ""
+msgstr "Mot de passe incorrect."
-#: login-utils/chfn.c:207
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
-msgstr ""
+msgstr "Informations utilisateurs non changées.\n"
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr ""
+msgstr "Usage: %s [ -f nom-complet ] [ -o bureau ] "
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
msgstr ""
+"[ -p téléphone-bureau ]\n"
+"\t[ -h téléphone-maison ] "
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
-msgstr ""
+msgstr "[ --help ] [ --version ]\n"
-#: login-utils/chfn.c:381 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
msgstr ""
+"\n"
+"Abandon.\n"
-#: login-utils/chfn.c:414
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
-msgstr ""
+msgstr "champ trop long.\n"
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
-msgstr ""
+msgstr "'%c' n'est pas un caractčre permis.\n"
-#: login-utils/chfn.c:427
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
-msgstr ""
+msgstr "Les caractčres de contrôle de sont pas permis.\n"
-#: login-utils/chfn.c:492
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
-msgstr ""
+msgstr "Informations utilisateur *NON* changés. Essayez ŕ nouveau plus tard.\n"
-#: login-utils/chfn.c:495
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
-msgstr ""
+msgstr "Informations utilisateur non changées.\n"
-#: login-utils/chfn.c:509 login-utils/chsh.c:412 sys-utils/cytune.c:315
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
msgid "malloc failed"
-msgstr ""
+msgstr "échec de malloc"
#: login-utils/chsh.c:141
#, c-format
msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
msgstr ""
+"%s: Votre shell n'est pas dans /etc/shells, changement de shell annulé\n"
#: login-utils/chsh.c:148
#, c-format
msgid "Changing shell for %s.\n"
-msgstr ""
+msgstr "Changement du shell pour %s.\n"
#: login-utils/chsh.c:189
msgid "New shell"
-msgstr ""
+msgstr "Nouveau shell"
#: login-utils/chsh.c:196
-#, fuzzy
msgid "Shell not changed.\n"
-msgstr "Le disque a été changé.\n"
+msgstr "Shell non changé.\n"
#: login-utils/chsh.c:203
msgid "Shell *NOT* changed. Try again later.\n"
-msgstr ""
+msgstr "Shell *NON* changé. Essayez ŕ nouveau plus tard.\n"
#: login-utils/chsh.c:206
-#, fuzzy
msgid "Shell changed.\n"
msgstr "Le disque a été changé.\n"
#: login-utils/chsh.c:274
#, c-format
msgid "Usage: %s [ -s shell ] "
-msgstr ""
+msgstr "Usage: %s [ -s shell ] "
#: login-utils/chsh.c:275
msgid "[ --list-shells ] [ --help ] [ --version ]\n"
-msgstr ""
+msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
#: login-utils/chsh.c:276
msgid " [ username ]\n"
-msgstr ""
+msgstr " [ nom-utilisateur ]\n"
#: login-utils/chsh.c:320
#, c-format
msgid "%s: shell must be a full path name.\n"
-msgstr ""
+msgstr "%s: le shell doit ętre un path complet.\n"
#: login-utils/chsh.c:324
#, c-format
msgid "%s: \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
#: login-utils/chsh.c:328
#, c-format
msgid "%s: \"%s\" is not executable.\n"
-msgstr ""
+msgstr "%s: \"%s\" n'est pas exécutable.\n"
#: login-utils/chsh.c:335
#, c-format
msgid "%s: '%c' is not allowed.\n"
-msgstr ""
+msgstr "%s: '%c' n'est pas un caractčre permis.\n"
#: login-utils/chsh.c:339
#, c-format
msgid "%s: Control characters are not allowed.\n"
-msgstr ""
+msgstr "%s: Les caractčres de contrôle de sont pas permis.\n"
#: login-utils/chsh.c:346
#, c-format
msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr ""
+msgstr "Avertissement: \"%s\" n'est pas listé dans /etc/shells\n"
#: login-utils/chsh.c:348
#, c-format
msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "%s: \"%s\" n'est pas listé dans /etc/shells.\n"
#: login-utils/chsh.c:350
#, c-format
msgid "%s: use -l option to see list\n"
-msgstr ""
+msgstr "%s: utilisez l'option -l pour voir la liste\n"
#: login-utils/chsh.c:356
#, c-format
@@ -4516,272 +5312,281 @@ msgstr ""
msgid "Can't read %s, exiting."
msgstr ""
-#: login-utils/last.c:138
+#: login-utils/last.c:143
msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
msgstr ""
-#: login-utils/last.c:215
-#, c-format
-msgid "last: %s: "
-msgstr ""
-
-#: login-utils/last.c:270
+#: login-utils/last.c:283
msgid " still logged in"
msgstr ""
-#: login-utils/last.c:291
+#: login-utils/last.c:305
#, c-format
msgid ""
"\n"
-"wtmp begins %10.10s %5.5s \n"
+"wtmp begins %s"
msgstr ""
-#: login-utils/last.c:352 login-utils/last.c:372 login-utils/last.c:427
+#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
msgid "last: malloc failure.\n"
msgstr ""
-#: login-utils/last.c:401
+#: login-utils/last.c:416
msgid "last: gethostname"
msgstr ""
-#: login-utils/last.c:454
+#: login-utils/last.c:469
#, c-format
msgid ""
"\n"
"interrupted %10.10s %5.5s \n"
msgstr ""
-#: login-utils/login.c:349
+#: login-utils/login.c:377
msgid "login: -h for super-user only.\n"
msgstr ""
-#: login-utils/login.c:374
+#: login-utils/login.c:402
+#, fuzzy
msgid "usage: login [-fp] [username]\n"
-msgstr ""
+msgstr "usage: %s [ -p ] périph nom\n"
-#: login-utils/login.c:476
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr ""
-#: login-utils/login.c:478
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr ""
-#: login-utils/login.c:518
+#. 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:519
+#, fuzzy
+msgid "login: "
+msgstr "\"%s\" ligne %d"
+
+#: login-utils/login.c:552
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:520
+#: login-utils/login.c:554
msgid ""
"Login incorrect\n"
"\n"
msgstr ""
-#: login-utils/login.c:529
+#: login-utils/login.c:563
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:533
+#: login-utils/login.c:567
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:536
+#: login-utils/login.c:570
msgid ""
"\n"
"Login incorrect\n"
msgstr ""
-#: login-utils/login.c:585
+#: login-utils/login.c:619
#, fuzzy
msgid "Illegal username"
-msgstr "Touche non valide"
+msgstr "Nombre de secteurs non valide"
-#: login-utils/login.c:628
+#: login-utils/login.c:662
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr ""
-#: login-utils/login.c:633
+#: login-utils/login.c:667
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
msgstr ""
-#: login-utils/login.c:637
+#: login-utils/login.c:671
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
msgstr ""
-#: login-utils/login.c:689
+#: login-utils/login.c:723
msgid "Login incorrect\n"
msgstr ""
-#: login-utils/login.c:711
+#: login-utils/login.c:745
+#, fuzzy
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
-msgstr ""
+msgstr "Mot de passe *NON* changé. Essayez ŕ nouveau plus tard.\n"
-#: login-utils/login.c:715
+#: login-utils/login.c:749
msgid "You have too many processes running.\n"
msgstr ""
-#: login-utils/login.c:761
+#: login-utils/login.c:795
msgid "Warning: no Kerberos tickets issued\n"
msgstr ""
-#: login-utils/login.c:773
+#: login-utils/login.c:807
msgid "Sorry -- your password has expired.\n"
msgstr ""
-#: login-utils/login.c:779
+#: login-utils/login.c:813
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:787
+#: login-utils/login.c:821
msgid "Sorry -- your account has expired.\n"
msgstr ""
-#: login-utils/login.c:793
+#: login-utils/login.c:827
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:1012
+#: login-utils/login.c:1061
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr ""
-#: login-utils/login.c:1019
+#: login-utils/login.c:1068
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr ""
-#: login-utils/login.c:1022
+#: login-utils/login.c:1071
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr ""
-#: login-utils/login.c:1025
+#: login-utils/login.c:1074
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr ""
-#: login-utils/login.c:1028
+#: login-utils/login.c:1077
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr ""
-#: login-utils/login.c:1039
+#: login-utils/login.c:1089
#, c-format
msgid "You have %smail.\n"
msgstr ""
-#: login-utils/login.c:1040
+#: login-utils/login.c:1090
msgid "new "
msgstr ""
#. error in fork()
-#: login-utils/login.c:1057
+#: login-utils/login.c:1108
#, c-format
msgid "login: failure forking: %s"
msgstr ""
-#: login-utils/login.c:1072
+#: login-utils/login.c:1123
+#, fuzzy
msgid "setuid() failed"
-msgstr ""
+msgstr "settimeofday() a échoué"
-#: login-utils/login.c:1078
+#: login-utils/login.c:1129
#, c-format
msgid "No directory %s!\n"
msgstr ""
-#: login-utils/login.c:1082
+#: login-utils/login.c:1133
msgid "Logging in with home = \"/\".\n"
msgstr ""
-#: login-utils/login.c:1090
+#: login-utils/login.c:1141
msgid "login: no memory for shell script.\n"
msgstr ""
-#: login-utils/login.c:1116
+#: login-utils/login.c:1169
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr ""
-#: login-utils/login.c:1119
+#: login-utils/login.c:1172
#, c-format
msgid "login: no shell: %s.\n"
msgstr ""
-#: login-utils/login.c:1135
-#, c-format
+#: login-utils/login.c:1188
+#, fuzzy, c-format
msgid ""
"\n"
"%s login: "
-msgstr ""
+msgstr "\"%s\" ligne %d"
-#: login-utils/login.c:1146
+#: login-utils/login.c:1199
+#, fuzzy
msgid "login name much too long.\n"
-msgstr ""
+msgstr "ligne trop longue"
-#: login-utils/login.c:1147
+#: login-utils/login.c:1200
+#, fuzzy
msgid "NAME too long"
-msgstr ""
+msgstr "Ligne trop longue"
-#: login-utils/login.c:1154
+#: login-utils/login.c:1207
msgid "login names may not start with '-'.\n"
msgstr ""
-#: login-utils/login.c:1164
+#: login-utils/login.c:1217
+#, fuzzy
msgid "too many bare linefeeds.\n"
-msgstr ""
+msgstr "Trops d'arguments.\n"
-#: login-utils/login.c:1165
+#: login-utils/login.c:1218
msgid "EXCESSIVE linefeeds"
msgstr ""
-#: login-utils/login.c:1176
+#: login-utils/login.c:1229
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr ""
-#: login-utils/login.c:1276
+#: login-utils/login.c:1329
#, c-format
msgid "Last login: %.*s "
msgstr ""
-#: login-utils/login.c:1280
+#: login-utils/login.c:1333
#, c-format
msgid "from %.*s\n"
msgstr ""
-#: login-utils/login.c:1283
+#: login-utils/login.c:1336
#, c-format
msgid "on %.*s\n"
msgstr ""
-#: login-utils/login.c:1306
+#: login-utils/login.c:1359
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1309
+#: login-utils/login.c:1362
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
msgstr ""
-#: login-utils/login.c:1313
+#: login-utils/login.c:1366
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1316
+#: login-utils/login.c:1369
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
msgstr ""
@@ -4795,8 +5600,9 @@ msgid "is n\n"
msgstr ""
#: login-utils/mesg.c:112
+#, fuzzy
msgid "usage: mesg [y | n]\n"
-msgstr ""
+msgstr "usage: %s [ -n ] périphérique\n"
#: login-utils/newgrp.c:67
msgid "newgrp: Who are you?"
@@ -4822,132 +5628,132 @@ msgstr ""
msgid "No shell"
msgstr ""
-#: login-utils/passwd.c:165
+#: login-utils/passwd.c:163
msgid "The password must have at least 6 characters, try again.\n"
msgstr ""
-#: login-utils/passwd.c:178
+#: login-utils/passwd.c:176
msgid "The password must contain characters out of two of the following\n"
msgstr ""
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:177
msgid "classes: upper and lower case letters, digits and non alphanumeric\n"
msgstr ""
-#: login-utils/passwd.c:180
+#: login-utils/passwd.c:178
msgid "characters. See passwd(1) for more information.\n"
msgstr ""
-#: login-utils/passwd.c:185
+#: login-utils/passwd.c:183
msgid "You cannot reuse the old password.\n"
msgstr ""
-#: login-utils/passwd.c:190
+#: login-utils/passwd.c:188
msgid "Please don't use something like your username as password!\n"
msgstr ""
-#: login-utils/passwd.c:201 login-utils/passwd.c:208
+#: login-utils/passwd.c:199 login-utils/passwd.c:206
msgid "Please don't use something like your realname as password!\n"
msgstr ""
-#: login-utils/passwd.c:225
+#: login-utils/passwd.c:223
msgid "Usage: passwd [username [password]]\n"
msgstr ""
-#: login-utils/passwd.c:226
+#: login-utils/passwd.c:224
msgid "Only root may use the one and two argument forms.\n"
msgstr ""
-#: login-utils/passwd.c:282
+#: login-utils/passwd.c:280
msgid "Usage: passwd [-foqsvV] [user [password]]\n"
msgstr ""
-#: login-utils/passwd.c:302
+#: login-utils/passwd.c:301
#, c-format
msgid "Can't exec %s: %s\n"
msgstr ""
-#: login-utils/passwd.c:313
+#: login-utils/passwd.c:312
msgid "Cannot find login name"
msgstr ""
-#: login-utils/passwd.c:320 login-utils/passwd.c:327
+#: login-utils/passwd.c:319 login-utils/passwd.c:326
msgid "Only root can change the password for others.\n"
msgstr ""
-#: login-utils/passwd.c:335
+#: login-utils/passwd.c:334
msgid "Too many arguments.\n"
msgstr "Trops d'arguments.\n"
-#: login-utils/passwd.c:340
+#: login-utils/passwd.c:339
#, c-format
msgid "Can't find username anywhere. Is `%s' really a user?"
msgstr ""
"Impossible de trouver ce nom d'utilisateur. Es ce que `%s' est réélement un "
"utilisateur?"
-#: login-utils/passwd.c:344
+#: login-utils/passwd.c:343
msgid "Sorry, I can only change local passwords. Use yppasswd instead."
msgstr ""
"Désolé, je peux seulement changer les mots de passe locaux. Utilisez "
"yppasswd ŕ la place."
-#: login-utils/passwd.c:350
+#: login-utils/passwd.c:349
msgid "UID and username does not match, imposter!"
msgstr "UID et nom d'utilisaeur ne correspondent pas, imposteur!"
-#: login-utils/passwd.c:355
+#: 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:359
+#: login-utils/passwd.c:358
msgid "Enter old password: "
msgstr "Donnez l'ancien mot de passe: "
-#: login-utils/passwd.c:361
+#: login-utils/passwd.c:360
msgid "Illegal password, imposter."
msgstr "Mot de passe invalide, imposteur."
-#: login-utils/passwd.c:373
+#: login-utils/passwd.c:372
msgid "Enter new password: "
msgstr "Donnez le nouveau mot de passe: "
-#: login-utils/passwd.c:375
+#: login-utils/passwd.c:374
msgid "Password not changed."
msgstr "Mot de passe inchangé."
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:384
msgid "Re-type new password: "
msgstr "Redonnez le nouveau mot de passe: "
-#: login-utils/passwd.c:388
+#: login-utils/passwd.c:387
msgid "You misspelled it. Password not changed."
msgstr "Vous avez fait une faute de frappe. Mot de passe inchangé."
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:402
#, c-format
msgid "password changed, user %s"
msgstr "mot de passe changé pour l'utilisateur %s"
-#: login-utils/passwd.c:406
+#: login-utils/passwd.c:405
msgid "ROOT PASSWORD CHANGED"
msgstr "MOT DE PASSE DE ROOT CHANGÉ"
-#: login-utils/passwd.c:408
-#, c-format
+#: login-utils/passwd.c:407
+#, fuzzy, c-format
msgid "password changed by root, user %s"
-msgstr ""
+msgstr "mot de passe changé pour l'utilisateur %s"
-#: login-utils/passwd.c:415
+#: login-utils/passwd.c:414
msgid "calling setpwnam to set password.\n"
msgstr ""
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:418
msgid "Password *NOT* changed. Try again later.\n"
msgstr "Mot de passe *NON* changé. Essayez ŕ nouveau plus tard.\n"
-#: login-utils/passwd.c:425
+#: login-utils/passwd.c:424
msgid "Password changed.\n"
msgstr "Mot de passe changé.\n"
@@ -4965,11 +5771,7 @@ msgid "%s: Only root can shut a system down.\n"
msgstr "%s: Seulement le super-utilisateur peux éteindre le systčme.\n"
#: login-utils/shutdown.c:219
-msgid "That must be tomorrow, "
-msgstr ""
-
-#: login-utils/shutdown.c:220
-msgid "can't you wait till then?\n"
+msgid "That must be tomorrow, can't you wait till then?\n"
msgstr ""
#: login-utils/shutdown.c:271
@@ -5003,7 +5805,7 @@ msgid "halted"
msgstr ""
#. RB_AUTOBOOT
-#: login-utils/shutdown.c:369
+#: login-utils/shutdown.c:377
msgid ""
"\n"
"Why am I still alive after reboot?"
@@ -5011,7 +5813,7 @@ msgstr ""
"\n"
"Pourquoi suis-je encore vivant aprčs le redémarrage?"
-#: login-utils/shutdown.c:371
+#: login-utils/shutdown.c:379
msgid ""
"\n"
"Now you can turn off the power..."
@@ -5019,82 +5821,79 @@ msgstr ""
"\n"
"Maintenant vous pouvez éteindre la machine..."
-#: login-utils/shutdown.c:386
+#: login-utils/shutdown.c:394
msgid "Calling kernel power-off facility...\n"
msgstr ""
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:397
#, c-format
msgid "Error powering off\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:405
#, c-format
msgid "Executing the program \"%s\" ...\n"
msgstr ""
-#: login-utils/shutdown.c:400
+#: login-utils/shutdown.c:408
#, c-format
msgid "Error executing\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:423
+#: login-utils/shutdown.c:431
#, c-format
msgid "URGENT: broadcast message from %s:"
msgstr ""
-#: login-utils/shutdown.c:429
+#: login-utils/shutdown.c:437
msgid "System going down IMMEDIATELY!\n"
msgstr "Arręt IMMÉDIAT du systčme!\n"
-#: login-utils/shutdown.c:432
+#: login-utils/shutdown.c:440
#, c-format
msgid "System going down in %d hour%s %d minutes"
msgstr ""
-#: login-utils/shutdown.c:435
+#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+msgid "s"
+msgstr "s"
+
+#: login-utils/shutdown.c:443
#, c-format
msgid "System going down in %d minute%s\n"
msgstr ""
-#: login-utils/shutdown.c:441
+#: login-utils/shutdown.c:449
#, c-format
msgid "\t... %s ...\n"
msgstr "\t... %s ...\n"
-#: login-utils/shutdown.c:498
-msgid "Cannot fork for swapoff. Shrug!"
-msgstr ""
-
#: login-utils/shutdown.c:506
-msgid "Cannot exec swapoff, "
+msgid "Cannot fork for swapoff. Shrug!"
msgstr ""
-#: login-utils/shutdown.c:507
-msgid "hoping umount will do the trick."
+#: login-utils/shutdown.c:514
+msgid "Cannot exec swapoff, hoping umount will do the trick."
msgstr ""
-#: login-utils/shutdown.c:525
+#: login-utils/shutdown.c:533
msgid "Cannot fork for umount, trying manually."
msgstr ""
-#: login-utils/shutdown.c:531
-msgid "Cannot exec "
-msgstr ""
-
-#: login-utils/shutdown.c:531
-msgid ", trying umount."
+#: login-utils/shutdown.c:542
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
msgstr ""
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:546
msgid "Cannot exec umount, giving up on umount."
msgstr ""
-#: login-utils/shutdown.c:538
+#: login-utils/shutdown.c:551
msgid "Unmounting any remaining filesystems..."
msgstr ""
-#: login-utils/shutdown.c:574
+#: login-utils/shutdown.c:587
#, c-format
msgid "shutdown: Couldn't umount %s\n"
msgstr ""
@@ -5112,10 +5911,11 @@ msgid "fork of single user shell failed\n"
msgstr ""
#: login-utils/simpleinit.c:226
+#, fuzzy
msgid ""
"\n"
"Wrong password.\n"
-msgstr ""
+msgstr "Mot de passe incorrect."
#: login-utils/simpleinit.c:252
msgid "exec rc failed\n"
@@ -5133,126 +5933,116 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:302 text-utils/more.c:1469
+#: login-utils/simpleinit.c:302 text-utils/more.c:1574
msgid "exec failed\n"
msgstr ""
#: login-utils/simpleinit.c:324
+#, fuzzy
msgid "cannot open inittab\n"
-msgstr ""
+msgstr "Impossible d'ouvrir le disque dur"
#: login-utils/simpleinit.c:362
msgid "no TERM or cannot stat tty\n"
msgstr ""
-#: login-utils/ttymsg.c:79
+#: login-utils/ttymsg.c:81
msgid "too many iov's (change code in wall/ttymsg.c)"
msgstr ""
-#. A slash is an attempt to break security...
-#: login-utils/ttymsg.c:83
-#, c-format
-msgid "'/' in \"%s\""
-msgstr ""
-
-#: login-utils/ttymsg.c:88
+#: login-utils/ttymsg.c:91
msgid "excessively long line arg"
msgstr ""
-#: login-utils/ttymsg.c:142
+#: login-utils/ttymsg.c:145
msgid "cannot fork"
msgstr ""
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:149
#, c-format
msgid "fork: %s"
msgstr ""
-#: login-utils/ttymsg.c:172
+#: login-utils/ttymsg.c:177
#, c-format
msgid "%s: BAD ERROR"
msgstr ""
-#: login-utils/vipw.c:147
+#: login-utils/vipw.c:149
#, c-format
msgid "%s: the %s file is busy.\n"
msgstr ""
-#: login-utils/vipw.c:163
+#: login-utils/vipw.c:165
#, c-format
msgid "%s: the %s file is busy (%s present)\n"
msgstr ""
-#: login-utils/vipw.c:168
-#, c-format
+#: login-utils/vipw.c:171
+#, fuzzy, c-format
msgid "%s: can't link %s: %s\n"
-msgstr ""
+msgstr "%s: impossible de trouver \"_stext\" dans %s\n"
-#: login-utils/vipw.c:188
+#: login-utils/vipw.c:193
#, c-format
msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
msgstr ""
-#: login-utils/vipw.c:212
+#: login-utils/vipw.c:217
#, c-format
msgid "%s: Cannot fork\n"
msgstr ""
-#: login-utils/vipw.c:252
+#: login-utils/vipw.c:257
#, fuzzy, c-format
msgid "%s: %s unchanged\n"
msgstr "Le disque a été changé.\n"
-#: login-utils/vipw.c:295
+#: login-utils/vipw.c:300
#, c-format
msgid "%s: no changes made\n"
msgstr ""
-#: login-utils/wall.c:104
-msgid "usage: wall [file]\n"
-msgstr ""
+#: login-utils/wall.c:103
+#, fuzzy, c-format
+msgid "usage: %s [file]\n"
+msgstr "usage: rev [fichier ...]\n"
-#: login-utils/wall.c:115
-#, c-format
-msgid "wall: cannot read %s.\n"
-msgstr ""
+#: login-utils/wall.c:151
+#, fuzzy, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "Impossible d'ouvrir le fichier d'aide"
-#: login-utils/wall.c:132
+#: login-utils/wall.c:178
#, c-format
-msgid "wall: %s\n"
+msgid "Broadcast Message from %s@%s"
msgstr ""
-#: login-utils/wall.c:154
-msgid "wall: can't open temporary file.\n"
-msgstr ""
+#: login-utils/wall.c:188
+#, fuzzy, c-format
+msgid "%s: can't read %s.\n"
+msgstr "hexdump: impossible de lire %s.\n"
-#: login-utils/wall.c:181
+#: login-utils/wall.c:213
#, c-format
-msgid "Broadcast Message from %s@%s"
+msgid "%s: can't stat temporary file.\n"
msgstr ""
-#: login-utils/wall.c:191
+#: login-utils/wall.c:222
#, c-format
-msgid "wall: can't read %s.\n"
-msgstr ""
-
-#: login-utils/wall.c:216
-msgid "wall: can't stat temporary file.\n"
-msgstr ""
-
-#: login-utils/wall.c:225
-msgid "wall: can't read temporary file.\n"
+msgid "%s: can't read temporary file.\n"
msgstr ""
-#: misc-utils/cal.c:198
+#: misc-utils/cal.c:184
msgid "illegal month value: use 1-12"
msgstr ""
-#: misc-utils/cal.c:202
+#: misc-utils/cal.c:188
+#, fuzzy
msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "Nombre de tętes non valide"
-#: misc-utils/cal.c:498
+#: misc-utils/cal.c:484
msgid "usage: cal [-mjy] [[month] year]\n"
msgstr ""
@@ -5267,14 +6057,14 @@ msgid "St. Tib's Day"
msgstr ""
#: misc-utils/kill.c:199
-#, c-format
+#, fuzzy, c-format
msgid "%s: unknown signal %s\n"
-msgstr ""
+msgstr "%s: erreur: version inconnue %d\n"
#: misc-utils/kill.c:261
-#, c-format
+#, fuzzy, c-format
msgid "%s: can't find process \"%s\"\n"
-msgstr ""
+msgstr "%s: impossible de trouver \"_stext\" dans %s\n"
#: misc-utils/kill.c:303
#, c-format
@@ -5282,53 +6072,46 @@ msgid "%s: unknown signal %s; valid signals:\n"
msgstr ""
#: misc-utils/kill.c:343
-#, c-format
+#, fuzzy, c-format
msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr ""
+msgstr "usage: %s [ -i ] [ -tTerm ] fichier...\n"
#: misc-utils/kill.c:344
#, c-format
msgid " %s -l [ signal ]\n"
msgstr ""
-#: misc-utils/logger.c:135
+#: misc-utils/logger.c:137
#, c-format
msgid "logger: %s: %s.\n"
msgstr ""
-#: misc-utils/logger.c:232
+#: misc-utils/logger.c:234
#, c-format
msgid "logger: unknown facility name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:244
+#: misc-utils/logger.c:246
#, c-format
msgid "logger: unknown priority name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:271
-msgid "logger: [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-
-#: misc-utils/look.c:170 misc-utils/setterm.c:1153 text-utils/more.c:1782
-#: text-utils/more.c:1793
-msgid "Out of memory"
+#: misc-utils/logger.c:273
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr ""
#: misc-utils/look.c:340
+#, fuzzy
msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr ""
+msgstr "usage: %s [ - ] [ -2 ] [ fichier ... ]\n"
-#: misc-utils/look.c:365
-msgid "look: "
-msgstr ""
-
-#: misc-utils/mcookie.c:95 misc-utils/mcookie.c:120
-#, c-format
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, fuzzy, c-format
msgid "Could not open %s\n"
-msgstr ""
+msgstr "Impossible d'ouvrir %s\n"
-#: misc-utils/mcookie.c:103 misc-utils/mcookie.c:117
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
#, c-format
msgid "Got %d bytes from %s\n"
msgstr ""
@@ -5361,9 +6144,9 @@ msgid " ? could not chdir into %s - %s (%d)\n"
msgstr ""
#: misc-utils/namei.c:248
-#, c-format
+#, fuzzy, c-format
msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr ""
+msgstr "Problčme lors de la lecture du cylindre %d, %d attendu, %d lu\n"
#: misc-utils/namei.c:258
msgid " *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"
@@ -5374,279 +6157,256 @@ msgstr ""
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr ""
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
+#, fuzzy
msgid "usage: script [-a] [file]\n"
-msgstr ""
+msgstr "usage: rev [fichier ...]\n"
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, c-format
msgid "Script started, file is %s\n"
msgstr ""
-#: misc-utils/script.c:197
+#: misc-utils/script.c:198
#, c-format
msgid "Script started on %s"
msgstr ""
-#: misc-utils/script.c:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
"Script done on %s"
msgstr ""
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr ""
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr ""
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
msgid "Out of pty's\n"
msgstr ""
#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:713
#, c-format
msgid "%s: Argument error, usage\n"
msgstr ""
-#: misc-utils/setterm.c:747
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:716
msgid " [ -term terminal_name ]\n"
msgstr ""
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:717
msgid " [ -reset ]\n"
msgstr ""
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:718
msgid " [ -initialize ]\n"
msgstr ""
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:719
msgid " [ -cursor [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:721
msgid " [ -snow [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:722
msgid " [ -softscroll [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:755
-msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
-msgstr ""
-
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:724
msgid " [ -repeat [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:725
msgid " [ -appcursorkeys [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:726
msgid " [ -linewrap [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:727
msgid " [ -default ]\n"
msgstr ""
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:728
msgid " [ -foreground black|blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
msgid "|red|magenta|yellow|white|default ]\n"
msgstr ""
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:730
msgid " [ -background black|blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:732
msgid " [ -ulcolor black|grey|blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
+#: misc-utils/setterm.c:739
msgid "|red|magenta|yellow|white ]\n"
msgstr ""
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:734
msgid " [ -ulcolor bright blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:736
msgid " [ -hbcolor black|grey|blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:738
msgid " [ -hbcolor bright blue|green|cyan"
msgstr ""
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:741
msgid " [ -standout [ attr ] ]\n"
msgstr ""
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:743
msgid " [ -inversescreen [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:744
msgid " [ -bold [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:745
msgid " [ -half-bright [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:746
msgid " [ -blink [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:747
msgid " [ -reverse [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:748
msgid " [ -underline [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:749
msgid " [ -store ]\n"
msgstr ""
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:750
msgid " [ -clear [all|rest] ]\n"
msgstr ""
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:751
msgid " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr ""
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:752
msgid " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr ""
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:753
msgid " [ -regtabs [1-160] ]\n"
msgstr ""
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:754
msgid " [ -blank [0-60] ]\n"
msgstr ""
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:755
msgid " [ -dump [1-NR_CONSOLES] ]\n"
msgstr ""
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:756
msgid " [ -append [1-NR_CONSOLES] ]\n"
msgstr ""
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:757
msgid " [ -file dumpfilename ]\n"
msgstr ""
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:758
msgid " [ -msg [on|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:759
msgid " [ -msglevel [0-8] ]\n"
msgstr ""
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:760
msgid " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
msgstr ""
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:761
msgid " [ -powerdown [0-60] ]\n"
msgstr ""
-#: misc-utils/setterm.c:795
+#: misc-utils/setterm.c:762
msgid " [ -blength [0-2000] ]\n"
msgstr ""
-#: misc-utils/setterm.c:796
+#: misc-utils/setterm.c:763
msgid " [ -bfreq freqnumber ]\n"
msgstr ""
-#: misc-utils/setterm.c:841
-msgid "keyboard.pc"
-msgstr ""
-
-#: misc-utils/setterm.c:844
-msgid "keyboard.olivetti"
-msgstr ""
-
-#: misc-utils/setterm.c:847
-msgid "keyboard.dutch"
-msgstr ""
-
-#: misc-utils/setterm.c:850
-msgid "keyboard.extended"
-msgstr ""
-
-#: misc-utils/setterm.c:884
+#: misc-utils/setterm.c:831
msgid "snow.on"
msgstr ""
-#: misc-utils/setterm.c:886
+#: misc-utils/setterm.c:833
msgid "snow.off"
msgstr ""
-#: misc-utils/setterm.c:892
+#: misc-utils/setterm.c:839
msgid "softscroll.on"
msgstr ""
-#: misc-utils/setterm.c:894
+#: misc-utils/setterm.c:841
msgid "softscroll.off"
msgstr ""
-#: misc-utils/setterm.c:1069
+#: misc-utils/setterm.c:1016
msgid "cannot (un)set powersave mode\n"
msgstr ""
-#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
-#, c-format
+#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#, fuzzy, c-format
msgid "klogctl error: %s\n"
-msgstr ""
+msgstr "Erreur de syntaxe: '%s'\n"
-#: misc-utils/setterm.c:1157
+#: misc-utils/setterm.c:1104
#, c-format
msgid "Error reading %s\n"
msgstr ""
-#: misc-utils/setterm.c:1172
+#: misc-utils/setterm.c:1119
msgid "Error writing screendump\n"
msgstr ""
-#: misc-utils/setterm.c:1186
+#: misc-utils/setterm.c:1133
#, c-format
msgid "couldn't read %s, and cannot ioctl dump\n"
msgstr ""
-#: misc-utils/setterm.c:1251
-#, c-format
+#: misc-utils/setterm.c:1198
+#, fuzzy, c-format
msgid "%s: $TERM is not defined.\n"
-msgstr ""
+msgstr "%s: %s n'est pas un périphérique lp.\n"
#: misc-utils/tsort.c:119
+#, fuzzy
msgid "usage: tsort [ inputfile ]\n"
-msgstr ""
+msgstr "usage: rev [fichier ...]\n"
#: misc-utils/tsort.c:156
msgid "tsort: odd data count.\n"
@@ -5660,158 +6420,154 @@ msgstr ""
msgid "tsort: internal error -- could not find cycle.\n"
msgstr ""
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:149
msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
msgstr ""
-#: misc-utils/write.c:101
+#: misc-utils/write.c:99
msgid "write: can't find your tty's name\n"
msgstr ""
-#: misc-utils/write.c:112
+#: misc-utils/write.c:110
msgid "write: you have write permission turned off.\n"
msgstr ""
-#: misc-utils/write.c:133
+#: misc-utils/write.c:131
#, c-format
msgid "write: %s is not logged in on %s.\n"
msgstr ""
-#: misc-utils/write.c:141
+#: misc-utils/write.c:139
#, c-format
msgid "write: %s has messages disabled on %s\n"
msgstr ""
-#: misc-utils/write.c:148
+#: misc-utils/write.c:146
+#, fuzzy
msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "usage: rev [fichier ...]\n"
-#: misc-utils/write.c:247
+#: misc-utils/write.c:245
#, c-format
msgid "write: %s is not logged in\n"
msgstr ""
-#: misc-utils/write.c:256
+#: misc-utils/write.c:254
#, c-format
msgid "write: %s has messages disabled\n"
msgstr ""
-#: misc-utils/write.c:260
+#: misc-utils/write.c:258
#, c-format
msgid "write: %s is logged in more than once; writing to %s\n"
msgstr ""
-#: misc-utils/write.c:327
+#: misc-utils/write.c:325
#, c-format
msgid "Message from %s@%s on %s at %s ..."
msgstr ""
-#: mount/fstab.c:113
+#: mount/fstab.c:116
#, c-format
msgid "warning: error reading %s: %s"
msgstr ""
-#: mount/fstab.c:140 mount/fstab.c:162
-#, c-format
+#: mount/fstab.c:143 mount/fstab.c:166
+#, fuzzy, c-format
msgid "warning: can't open %s: %s"
-msgstr ""
+msgstr "col: avertissement : impossible de revenir jusqu'ŕ %s.\n"
-#: mount/fstab.c:144
+#: mount/fstab.c:147
#, c-format
msgid "mount: could not open %s - using %s instead\n"
msgstr ""
-#. MOUNTLOCK_LINKTARGET does not exist (as a file)
+#. 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:346
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:358
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:369
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:383
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr ""
-#: mount/fstab.c:392
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr ""
-#: mount/fstab.c:394
+#: mount/fstab.c:427
msgid "timed out"
msgstr ""
-#: mount/fstab.c:438
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr ""
-#: mount/fstab.c:445
-#, c-format
-msgid "can't open %s (%s) - mtab not updated"
-msgstr ""
-
-#: mount/fstab.c:470
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr ""
-#: mount/fstab.c:475
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr ""
-#: mount/fstab.c:482 mount/fstab.c:486
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr ""
-#: mount/fstab.c:491
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr ""
-#: mount/fstab.c:496
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr ""
-#: mount/lomount.c:75
+#: mount/lomount.c:87
#, c-format
msgid "loop: can't open device %s: %s\n"
msgstr ""
-#: mount/lomount.c:80
+#: mount/lomount.c:93
#, c-format
msgid "loop: can't get info on device %s: %s\n"
msgstr ""
-#: mount/lomount.c:85 mount/losetup.c:74
+#: mount/lomount.c:98 mount/losetup.c:83
#, c-format
msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
msgstr ""
-#: mount/lomount.c:139
+#: mount/lomount.c:152
msgid "mount: could not find any device /dev/loop#"
msgstr ""
-#: mount/lomount.c:143
+#: mount/lomount.c:156
msgid ""
"mount: Could not find any loop device.\n"
" Maybe /dev/loop# has a wrong major number?"
msgstr ""
-#: mount/lomount.c:147
+#: mount/lomount.c:160
#, c-format
msgid ""
"mount: Could not find any loop device, and, according to %s,\n"
@@ -5819,60 +6575,61 @@ msgid ""
" (If so, then recompile or `insmod loop.o'.)"
msgstr ""
-#: mount/lomount.c:152
+#: mount/lomount.c:165
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/lomount.c:156
+#: mount/lomount.c:169
msgid "mount: could not find any free loop device"
msgstr ""
-#: mount/lomount.c:187 mount/losetup.c:106
+#: mount/lomount.c:200 mount/losetup.c:115
#, c-format
msgid "Unsupported encryption type %s\n"
msgstr ""
-#: mount/lomount.c:206 mount/losetup.c:125
+#: mount/lomount.c:219 mount/losetup.c:135
msgid "Init (up to 16 hex digits): "
msgstr ""
-#: mount/lomount.c:213 mount/losetup.c:132
+#: mount/lomount.c:226 mount/losetup.c:142
#, c-format
msgid "Non-hex digit '%c'.\n"
msgstr ""
-#: mount/lomount.c:219 mount/losetup.c:138
+#: mount/lomount.c:250 mount/losetup.c:165
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr ""
-#: mount/lomount.c:235
+#: mount/lomount.c:266
#, c-format
msgid "set_loop(%s,%s,%d): success\n"
msgstr ""
-#: mount/lomount.c:245
+#: mount/lomount.c:277
#, c-format
msgid "loop: can't delete device %s: %s\n"
msgstr ""
-#: mount/lomount.c:255
+#: mount/lomount.c:287
#, c-format
msgid "del_loop(%s): success\n"
msgstr ""
-#: mount/lomount.c:263
+#: mount/lomount.c:295
msgid "This mount was compiled without loop support. Please recompile.\n"
msgstr ""
-#: mount/losetup.c:70
+#: mount/losetup.c:79
+#, fuzzy
msgid "Cannot get loop info"
-msgstr ""
+msgstr "Impossible de déterminer la taille du disque"
-#: mount/losetup.c:174
+#: mount/losetup.c:202
#, c-format
msgid ""
"usage:\n"
@@ -5881,7 +6638,7 @@ msgid ""
" %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
msgstr ""
-#: mount/losetup.c:231
+#: mount/losetup.c:266
msgid "No loop support was available at compile time. Please recompile.\n"
msgstr ""
@@ -5890,318 +6647,331 @@ msgstr ""
msgid "[mntent]: warning: no final newline at the end of %s\n"
msgstr ""
-#: mount/mntent.c:214
+#: mount/mntent.c:216
#, c-format
msgid "[mntent]: line %d in %s is bad%s\n"
msgstr ""
-#: mount/mntent.c:217
+#: mount/mntent.c:219
msgid "; rest of file ignored"
msgstr ""
-#: mount/mount.c:319
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:322
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:342
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:355 mount/mount.c:597
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:360
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:434
+#: mount/mount.c:473
msgid "mount failed"
msgstr ""
-#: mount/mount.c:436
-#, c-format
+#: mount/mount.c:475
+#, fuzzy, c-format
msgid "mount: only root can mount %s on %s"
-msgstr ""
+msgstr "%s: Seulement le super-utilisateur peux éteindre le systčme.\n"
-#: mount/mount.c:461
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:467
+#: mount/mount.c:509
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:479
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:488
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:492
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:496
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:509
+#: mount/mount.c:551
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
-#: mount/mount.c:557 mount/mount.c:969
+#: mount/mount.c:601 mount/mount.c:1030
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:593
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:619
+#: mount/mount.c:668
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+
+#: mount/mount.c:671
#, fuzzy
msgid "mount: you must specify the filesystem type"
msgstr " t Changer le type de systčme de fichiers"
-#: mount/mount.c:626 mount/mount.c:660
+#: mount/mount.c:678 mount/mount.c:713
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:628
+#: mount/mount.c:680
msgid "mount: permission denied"
msgstr ""
-#: mount/mount.c:630
+#: mount/mount.c:682
+#, fuzzy
msgid "mount: must be superuser to use mount"
-msgstr ""
+msgstr "Vous devez ętre root pour changer l'heure du systčme.\n"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:634 mount/mount.c:638
+#: mount/mount.c:686 mount/mount.c:690
#, c-format
msgid "mount: %s is busy"
msgstr ""
#. no
#. yes, don't mention it
-#: mount/mount.c:640
+#: mount/mount.c:692
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:642
+#: mount/mount.c:694
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:648
-#, c-format
+#: mount/mount.c:700
+#, fuzzy, c-format
msgid "mount: mount point %s does not exist"
-msgstr ""
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
-#: mount/mount.c:650
+#: mount/mount.c:702
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:653
-#, c-format
+#: mount/mount.c:705
+#, fuzzy, c-format
msgid "mount: special device %s does not exist"
+msgstr "%s: l'utilisateur \"%s\" n'existe pas.\n"
+
+#: mount/mount.c:715
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:666
+#: mount/mount.c:727
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:668
+#: mount/mount.c:729
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" or too many mounted file systems"
msgstr ""
-#: mount/mount.c:683
+#: mount/mount.c:744
msgid "mount table full"
msgstr ""
-#: mount/mount.c:685
-#, c-format
+#: mount/mount.c:746
+#, fuzzy, c-format
msgid "mount: %s: can't read superblock"
-msgstr ""
+msgstr "impossible d'écrire les super-blocs"
-#: mount/mount.c:688
+#: mount/mount.c:749
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr ""
-#: mount/mount.c:693
+#: mount/mount.c:754
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
-#: mount/mount.c:705
+#: mount/mount.c:766
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:707
+#: mount/mount.c:768
msgid "mount: maybe you meant iso9660 ?"
msgstr ""
-#: mount/mount.c:710
+#: mount/mount.c:771
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
#. strange ...
-#: mount/mount.c:715
+#: mount/mount.c:776
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:717
+#: mount/mount.c:778
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
" (maybe `insmod driver'?)"
msgstr ""
-#: mount/mount.c:720
+#: mount/mount.c:781
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:723
-#, c-format
+#: mount/mount.c:784
+#, fuzzy, c-format
msgid "mount: %s is not a block device"
-msgstr ""
+msgstr "%s: %s n'est pas un périphérique lp.\n"
-#: mount/mount.c:726
-#, c-format
+#: mount/mount.c:787
+#, fuzzy, c-format
msgid "mount: %s is not a valid block device"
-msgstr ""
+msgstr "%s: %s n'est pas un périphérique lp.\n"
-#: mount/mount.c:730
+#: mount/mount.c:791
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr ""
-#: mount/mount.c:747
+#: mount/mount.c:807
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:748
+#: mount/mount.c:808
msgid "block device "
msgstr ""
-#: mount/mount.c:834
+#: mount/mount.c:894
#, c-format
msgid "mount: consider mounting %s by %s\n"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:895
msgid "UUID"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:895
#, fuzzy
msgid "label"
msgstr "[Label]"
-#: mount/mount.c:837 mount/mount.c:1151
+#: mount/mount.c:897 mount/mount.c:1213
msgid "mount: no such partition found"
msgstr ""
-#: mount/mount.c:845
+#: mount/mount.c:905
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
#.
#. * Retry in the background.
#.
-#: mount/mount.c:861
+#: mount/mount.c:921
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr ""
-#: mount/mount.c:872
+#: mount/mount.c:932
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr ""
-#: mount/mount.c:921
+#: mount/mount.c:981
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1030
+#: mount/mount.c:1092
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 ."
+" A special device can be indicated by -L label or -U uuid .\n"
msgstr ""
-#: mount/mount.c:1136
+#: mount/mount.c:1198
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:1141
+#: mount/mount.c:1203
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1153
+#: mount/mount.c:1215
#, c-format
msgid "mount: mounting %s\n"
msgstr ""
-#: mount/mount.c:1162
-msgid "not mounted anything"
+#: mount/mount.c:1224
+msgid "not mounting anything"
msgstr ""
-#: mount/mount.c:1175
-#, c-format
+#: mount/mount.c:1237
+#, fuzzy, c-format
msgid "mount: cannot find %s in %s"
-msgstr ""
+msgstr "%s: impossible de trouver \"_stext\" dans %s\n"
-#: mount/mount.c:1189
-#, c-format
+#: mount/mount.c:1251
+#, fuzzy, c-format
msgid "mount: can't find %s in %s or %s"
-msgstr ""
+msgstr "%s: impossible de trouver \"_stext\" dans %s\n"
#: mount/mount_by_label.c:141
msgid "mount: bad UUID"
msgstr ""
-#: mount/mount_guess_fstype.c:186
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:189
+#: mount/mount_guess_fstype.c:201
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:191
+#: mount/mount_guess_fstype.c:203
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
@@ -6232,8 +7002,9 @@ msgid "mount: excessively long option argument\n"
msgstr ""
#: mount/nfsmount.c:299
+#, fuzzy
msgid "Warning: Unrecognized proto= option.\n"
-msgstr ""
+msgstr "Avertissement: nombre de i-noeuds trop grand.\n"
#: mount/nfsmount.c:306
msgid "Warning: Option namlen is not supported.\n"
@@ -6253,10 +7024,6 @@ msgstr ""
msgid "unknown nfs mount option: %s%s\n"
msgstr ""
-#: mount/nfsmount.c:349
-msgid "no"
-msgstr ""
-
#: mount/nfsmount.c:426
msgid "mount: got bad hp->h_length?\n"
msgstr ""
@@ -6304,7 +7071,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr ""
-#: mount/swapon.c:49
+#: mount/swapon.c:51
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -6313,186 +7080,189 @@ msgid ""
" %s [-s]\n"
msgstr ""
-#: mount/swapon.c:86
+#: mount/swapon.c:88
#, c-format
msgid "%s on %s\n"
-msgstr ""
+msgstr "%s sur %s\n"
-#: mount/swapon.c:90
+#: mount/swapon.c:93
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr ""
-#: mount/swapon.c:95
+#: mount/swapon.c:100
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
msgstr ""
-#: mount/swapon.c:103
+#: mount/swapon.c:108
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr ""
-#: mount/swapon.c:204
+#: mount/swapon.c:213
#, c-format
msgid "%s: cannot open %s: %s\n"
-msgstr ""
+msgstr "%s: impossible d'ouvrir le fichier %s : %s\n"
-#: mount/umount.c:65
+#: mount/umount.c:69
msgid "umount: compiled without support for -f\n"
-msgstr ""
+msgstr "umount : compilé sans support pour -f\n"
-#: mount/umount.c:115
+#: mount/umount.c:121
#, c-format
msgid "host: %s, directory: %s\n"
-msgstr ""
+msgstr "hôte : %s, répertoire : %s\n"
-#: mount/umount.c:132
+#: mount/umount.c:138
#, c-format
msgid "umount: can't get address for %s\n"
msgstr ""
-#: mount/umount.c:137
+#: mount/umount.c:143
msgid "umount: got bad hostp->h_length\n"
msgstr ""
-#: mount/umount.c:175
+#: mount/umount.c:181
#, c-format
msgid "umount: %s: invalid block device"
msgstr ""
-#: mount/umount.c:177
+#: mount/umount.c:183
#, c-format
msgid "umount: %s: not mounted"
msgstr ""
-#: mount/umount.c:179
-#, c-format
+#: mount/umount.c:185
+#, fuzzy, c-format
msgid "umount: %s: can't write superblock"
-msgstr ""
+msgstr "impossible d'écrire les super-blocs"
#. Let us hope fstab has a line "proc /proc ..."
#. and not "none /proc ..."
-#: mount/umount.c:183
+#: mount/umount.c:189
#, c-format
msgid "umount: %s: device is busy"
msgstr ""
-#: mount/umount.c:185
+#: mount/umount.c:191
#, c-format
msgid "umount: %s: not found"
msgstr ""
-#: mount/umount.c:187
+#: mount/umount.c:193
#, c-format
msgid "umount: %s: must be superuser to umount"
msgstr ""
-#: mount/umount.c:189
+#: mount/umount.c:195
#, c-format
msgid "umount: %s: block devices not permitted on fs"
msgstr ""
-#: mount/umount.c:191
+#: mount/umount.c:197
#, c-format
msgid "umount: %s: %s"
-msgstr ""
+msgstr "umount : %s : %s"
-#: mount/umount.c:235
+#: mount/umount.c:241
msgid "no umount2, trying umount...\n"
msgstr ""
-#: mount/umount.c:248
+#: mount/umount.c:254
#, c-format
msgid "could not umount %s - trying %s instead\n"
msgstr ""
-#: mount/umount.c:264
+#: mount/umount.c:270
#, c-format
msgid "umount: %s busy - remounted read-only\n"
-msgstr ""
+msgstr "umount : %s en cours d'utilisation - remonté en lecture seule\n"
-#: mount/umount.c:272
+#: mount/umount.c:278
#, c-format
msgid "umount: could not remount %s read-only\n"
-msgstr ""
+msgstr "umount : impossible de remonter %s en lecture-seule\n"
-#: mount/umount.c:280
+#: mount/umount.c:286
#, c-format
msgid "%s umounted\n"
-msgstr ""
+msgstr "%s démonté\n"
-#: mount/umount.c:363
+#: mount/umount.c:369
msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
+msgstr "umount : impossible de trouver la liste des systčmes de fichiers a démonter"
-#: mount/umount.c:392
+#: mount/umount.c:398
msgid ""
"Usage: umount [-hV]\n"
" umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
" umount [-f] [-r] [-n] [-v] special | node...\n"
msgstr ""
+"usage : umount [-hV]\n"
+" umount -a [-f] [-r] [-n] [-v] [-t type-de-fs]\n"
+" umount [-f] [-r] [-n] [-v] special | noeud...\n"
-#: mount/umount.c:453
+#: mount/umount.c:459
msgid "umount: only root can do that"
-msgstr ""
+msgstr "umount: seulement root peux faire cela"
-#: mount/umount.c:468
+#: mount/umount.c:474
#, c-format
msgid "Trying to umount %s\n"
-msgstr ""
+msgstr "Tentative de démonter %s\n"
-#: mount/umount.c:472
+#: mount/umount.c:478
#, c-format
msgid "Could not find %s in mtab\n"
-msgstr ""
+msgstr "Impossible de trouver %s dans mtab\n"
-#: mount/umount.c:476
+#: mount/umount.c:482
#, c-format
msgid "umount: %s is not mounted (according to mtab)"
-msgstr ""
+msgstr "umount: %s n'est pas monté (selon mtab)"
-#: mount/umount.c:478
+#: mount/umount.c:484
#, c-format
msgid "umount: it seems %s is mounted multiple times"
-msgstr ""
+msgstr "umount: il semble de %s soit monté en plusieurs endroits"
-#: mount/umount.c:480
+#: mount/umount.c:496
#, c-format
msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr ""
+msgstr "umount: %s n'est pas dans le fichier fstab (et vous n'ętes pas root)"
-#: mount/umount.c:486
+#: mount/umount.c:499
#, c-format
msgid "umount: %s mount disagrees with the fstab"
-msgstr ""
+msgstr "umount: %s est en désacord avec le fichier fstab"
-#: mount/umount.c:505
+#: mount/umount.c:520
#, c-format
msgid "umount: only root can unmount %s from %s"
-msgstr ""
+msgstr "umount: seulement root peux démonter %s de %s"
-#: mount/umount.c:515
+#: mount/umount.c:531
#, c-format
msgid "umount: only %s can unmount %s from %s"
-msgstr ""
+msgstr "umount: seulement %s peux démonter %s de %s"
#: sys-utils/ctrlaltdel.c:26
msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
+msgstr "Vous devez ętre root pour changer le comportement de Ctrl-Alt-Del.\n"
#: sys-utils/ctrlaltdel.c:41
msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr ""
+msgstr "usage : ctrlaltdel hard|soft\n"
-#: sys-utils/cytune.c:116
+#: sys-utils/cytune.c:118
#, 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 ""
-#: sys-utils/cytune.c:127
+#: sys-utils/cytune.c:129
#, c-format
msgid ""
"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -6500,135 +7270,136 @@ msgid ""
"and the maximum transfer rate in characters/second was %f\n"
msgstr ""
-#: sys-utils/cytune.c:194
-#, c-format
+#: sys-utils/cytune.c:196
+#, fuzzy, c-format
msgid "Invalid interval value: %s\n"
-msgstr ""
+msgstr "Nombre invalide: %s\n"
-#: sys-utils/cytune.c:202
-#, c-format
+#: sys-utils/cytune.c:204
+#, fuzzy, c-format
msgid "Invalid set value: %s\n"
-msgstr ""
+msgstr "Nombre invalide: %s\n"
-#: sys-utils/cytune.c:210
-#, c-format
+#: sys-utils/cytune.c:212
+#, fuzzy, c-format
msgid "Invalid default value: %s\n"
-msgstr ""
+msgstr "Nombre invalide: %s\n"
-#: sys-utils/cytune.c:218
-#, c-format
+#: sys-utils/cytune.c:220
+#, fuzzy, c-format
msgid "Invalid set time value: %s\n"
-msgstr ""
+msgstr "Nombre invalide: %s\n"
-#: sys-utils/cytune.c:226
-#, c-format
+#: sys-utils/cytune.c:228
+#, fuzzy, c-format
msgid "Invalid default time value: %s\n"
-msgstr ""
+msgstr "Nombre invalide: %s\n"
-#: sys-utils/cytune.c:243
+#: sys-utils/cytune.c:245
#, c-format
msgid ""
"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
"[-g|-G] file [file...]\n"
msgstr ""
-#: sys-utils/cytune.c:254 sys-utils/cytune.c:270 sys-utils/cytune.c:287
-#: sys-utils/cytune.c:332
-#, c-format
+#: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
+#: sys-utils/cytune.c:342
+#, fuzzy, c-format
msgid "Can't open %s: %s\n"
-msgstr ""
+msgstr "Impossible d'ouvrir le fichier '%s'"
-#: sys-utils/cytune.c:260
+#: sys-utils/cytune.c:264
#, c-format
msgid "Can't set %s to threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:276
+#: sys-utils/cytune.c:282
#, c-format
msgid "Can't set %s to time threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:291 sys-utils/cytune.c:342 sys-utils/cytune.c:370
+#: sys-utils/cytune.c:299 sys-utils/cytune.c:354 sys-utils/cytune.c:385
#, c-format
msgid "Can't get threshold for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:296 sys-utils/cytune.c:347 sys-utils/cytune.c:375
+#: sys-utils/cytune.c:305 sys-utils/cytune.c:360 sys-utils/cytune.c:391
#, c-format
msgid "Can't get timeout for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:300
+#: sys-utils/cytune.c:309
#, c-format
msgid "%s: %ld %s threshold and %ld %s timeout\n"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "current"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "default"
msgstr ""
-#: sys-utils/cytune.c:321
+#: sys-utils/cytune.c:330
msgid "Can't set signal handler"
msgstr ""
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:356
+#: sys-utils/cytune.c:334 sys-utils/cytune.c:369
+#, fuzzy
msgid "gettimeofday failed"
-msgstr ""
+msgstr "settimeofday() a échoué"
-#: sys-utils/cytune.c:336 sys-utils/cytune.c:365
+#: sys-utils/cytune.c:347 sys-utils/cytune.c:379
#, c-format
msgid "Can't issue CYGETMON on %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:405
+#: sys-utils/cytune.c:421
#, c-format
msgid "%s: %lu ints, %lu/%lu chars; "
msgstr ""
-#: sys-utils/cytune.c:406
+#: sys-utils/cytune.c:422
#, c-format
msgid "fifo: %lu thresh, %lu tmout, "
msgstr ""
-#: sys-utils/cytune.c:407
+#: sys-utils/cytune.c:423
#, c-format
msgid "%lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:428
#, c-format
msgid " %f int/sec; %f rec, %f send (char/sec)\n"
msgstr ""
-#: sys-utils/cytune.c:417
+#: sys-utils/cytune.c:433
#, c-format
msgid ""
"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:422
+#: sys-utils/cytune.c:438
#, c-format
msgid " %f int/sec; %f rec (char/sec)\n"
msgstr ""
#: sys-utils/dmesg.c:38
-#, c-format
+#, fuzzy, c-format
msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr ""
+msgstr "usage: %s [ - ] [ -2 ] [ fichier ... ]\n"
#: sys-utils/ipcrm.c:46
-#, c-format
+#, fuzzy, c-format
msgid "usage: %s [shm | msg | sem] id\n"
-msgstr ""
+msgstr "usage: %s [ -i ] [ -tTerm ] fichier...\n"
#: sys-utils/ipcrm.c:70
-#, c-format
+#, fuzzy, c-format
msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr ""
+msgstr "usage: %s [ -i ] [ -tTerm ] fichier...\n"
#: sys-utils/ipcrm.c:73
msgid "resource deleted\n"
@@ -6793,9 +7564,8 @@ msgstr ""
#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:276 sys-utils/ipcs.c:282
#: sys-utils/ipcs.c:377 sys-utils/ipcs.c:386 sys-utils/ipcs.c:469
#: sys-utils/ipcs.c:474 sys-utils/ipcs.c:480
-#, fuzzy
msgid "owner"
-msgstr "Terminé"
+msgstr "propriétaire"
#: sys-utils/ipcs.c:271
msgid "attached"
@@ -6840,8 +7610,9 @@ msgid "key"
msgstr ""
#: sys-utils/ipcs.c:282
+#, fuzzy
msgid "bytes"
-msgstr ""
+msgstr "oui"
#: sys-utils/ipcs.c:282
msgid "nattch"
@@ -6936,8 +7707,9 @@ msgid "last-op"
msgstr ""
#: sys-utils/ipcs.c:377
+#, fuzzy
msgid "last-changed"
-msgstr ""
+msgstr "Mot de passe inchangé."
#: sys-utils/ipcs.c:384
#, fuzzy
@@ -7139,9 +7911,9 @@ msgid "mode=%#o, access_perms=%#o\n"
msgstr ""
#: sys-utils/ipcs.c:596
-#, c-format
+#, fuzzy, c-format
msgid "nsems = %d\n"
-msgstr ""
+msgstr "Tailledelazone=%d\n"
#: sys-utils/ipcs.c:597
#, c-format
@@ -7163,9 +7935,8 @@ msgid "semnum"
msgstr ""
#: sys-utils/ipcs.c:601
-#, fuzzy
msgid "value"
-msgstr "Table"
+msgstr "valeur"
#: sys-utils/ipcs.c:601
msgid "ncount"
@@ -7179,20 +7950,6 @@ msgstr ""
msgid "pid"
msgstr ""
-#: sys-utils/kbdrate.c:126
-#, c-format
-msgid "util-linux kbdrate %s \n"
-msgstr ""
-
-#: sys-utils/kbdrate.c:159 sys-utils/kbdrate.c:206
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d mS)\n"
-msgstr ""
-
-#: sys-utils/kbdrate.c:182
-msgid "Cannot open /dev/port"
-msgstr ""
-
#: sys-utils/rdev.c:68
msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr ""
@@ -7223,35 +7980,43 @@ msgid " rdev -v /dev/fd0 1 set the bootup VIDEOMODE"
msgstr ""
#: sys-utils/rdev.c:75
+#, fuzzy
msgid " rdev -o N ... use the byte offset N"
-msgstr ""
+msgstr " mode vidéo ... pareil que rdev -v"
#: sys-utils/rdev.c:76
+#, fuzzy
msgid " rootflags ... same as rdev -R"
-msgstr ""
+msgstr " mode vidéo ... pareil que rdev -v"
#: sys-utils/rdev.c:77
+#, fuzzy
msgid " swapdev ... same as rdev -s"
-msgstr ""
+msgstr " mode vidéo ... pareil que rdev -v"
#: sys-utils/rdev.c:78
+#, fuzzy
msgid " ramsize ... same as rdev -r"
-msgstr ""
+msgstr " mode vidéo ... pareil que rdev -v"
#: sys-utils/rdev.c:79
msgid " vidmode ... same as rdev -v"
-msgstr ""
+msgstr " mode vidéo ... pareil que rdev -v"
#: sys-utils/rdev.c:80
msgid ""
"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
msgstr ""
+"Note: les modes vidéo sont : -3=Demander, -2=Etendu, -1=NormalVga, "
+"1=touche1, 2=touche2,..."
#: sys-utils/rdev.c:81
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr ""
+" utilisez -R 1 pour monter la racine en lecture seule, -R 0 pour "
+"lecture/écriture."
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -7263,53 +8028,60 @@ msgid ""
"\t -r reset all the counters (root only)\n"
"\t -V print version and exit\n"
msgstr ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile> (defaut = \"%s\")\n"
+"\t -p <pro-file> (defaut = \"%s\")\n"
+"\t -i affiche seulement ce qui concerne la phase de prélčvement "
+"(sampling)\n"
+"\t -v affiche des données bavardes\n"
+"\t -a affiche tous les symboles, męme si le compteur vaut 0\n"
+"\t -r remet tous les compteurs ŕ zéro (seulement root)\n"
+"\t -V affiche le numéro de version et quitte\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
-msgstr ""
+msgstr "%s Version %s\n"
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
msgstr ""
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr ""
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr ""
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
-msgstr ""
+msgstr "%s: impossible de trouver \"_stext\" dans %s\n"
-#: sys-utils/readprofile.c:221
-#, fuzzy
+#: sys-utils/readprofile.c:226
msgid "total"
-msgstr "Bootable"
-
-#: sys-utils/renice.c:66
-msgid "usage: renice priority [ [ -p ] pids ] "
-msgstr ""
+msgstr "total"
#: sys-utils/renice.c:67
-msgid "[ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
msgstr ""
+"usage: renice priorité [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"utilisateurs ]\n"
-#: sys-utils/renice.c:93
+#: sys-utils/renice.c:94
#, c-format
msgid "renice: %s: unknown user\n"
-msgstr ""
+msgstr "renice: %s: utilisateur inconnu\n"
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:102
#, c-format
msgid "renice: %s: bad value\n"
-msgstr ""
+msgstr "renice: %s: mauvaise valeur\n"
#: sys-utils/renice.c:121
msgid "getpriority"
@@ -7322,253 +8094,261 @@ msgstr ""
#: sys-utils/renice.c:129
#, c-format
msgid "%d: old priority %d, new priority %d\n"
-msgstr ""
+msgstr "%d: ancienne priorité %d, nouvelle priorité %d\n"
#: sys-utils/setsid.c:23
#, c-format
msgid "usage: %s program [arg ...]\n"
-msgstr ""
+msgstr "usage: %s programme [arg ...]\n"
-#: sys-utils/tunelp.c:77
+#: sys-utils/tunelp.c:74
#, 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"
+" -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+" -T [on|off] ]\n"
msgstr ""
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
msgid "malloc error"
-msgstr ""
+msgstr "erreur de malloc"
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
-msgstr ""
+msgstr "erreur de sscanf"
-#: sys-utils/tunelp.c:140
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
-msgstr ""
+msgstr "%s: %s n'est pas un périphérique lp.\n"
-#: sys-utils/tunelp.c:239
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
msgstr ""
-#: sys-utils/tunelp.c:240
+#: sys-utils/tunelp.c:261
msgid ", busy"
-msgstr ""
+msgstr ", occupé"
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:262
msgid ", ready"
-msgstr ""
+msgstr ", pręt"
-#: sys-utils/tunelp.c:242
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
-msgstr ""
+msgstr ", plus de papier"
-#: sys-utils/tunelp.c:243
+#: sys-utils/tunelp.c:264
msgid ", on-line"
-msgstr ""
+msgstr ", en ligne"
-#: sys-utils/tunelp.c:244
+#: sys-utils/tunelp.c:265
msgid ", error"
-msgstr ""
+msgstr ", erreur"
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
-msgstr ""
+msgstr "erreur LPGETIRQ"
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
-msgstr ""
+msgstr "%s utilise l'IRQ %d\n"
-#: sys-utils/tunelp.c:269
-#, c-format
+#: sys-utils/tunelp.c:290
+#, fuzzy, c-format
msgid "%s using polling\n"
-msgstr ""
+msgstr "%s utilise l'IRQ %d\n"
-#: text-utils/col.c:154
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
-msgstr ""
+msgstr "col: mauvais argument pour -l %s.\n"
-#: text-utils/col.c:515
+#: text-utils/col.c:516
+#, fuzzy
msgid "usage: col [-bfx] [-l nline]\n"
-msgstr ""
+msgstr "usage: column [-tx] [-c colonnes] [fichier ...]\n"
-#: text-utils/col.c:521
+#: text-utils/col.c:522
msgid "col: write error.\n"
-msgstr ""
+msgstr "col: erreur d'écriture.\n"
-#: text-utils/col.c:528
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
-msgstr ""
+msgstr "col: avertissement : impossible de revenir jusqu'ŕ %s.\n"
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "past first line"
msgstr ""
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "-- line already flushed"
-msgstr ""
+msgstr "-- ligne déjŕ vidée sur disque"
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr ""
+msgstr "usage: %s [ - ] [ -2 ] [ fichier ... ]\n"
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
-msgstr ""
+msgstr "ligne trop longue"
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr ""
+msgstr "usage: column [-tx] [-c colonnes] [fichier ...]\n"
#: text-utils/hexsyntax.c:80
msgid "hexdump: bad length value.\n"
-msgstr ""
+msgstr "hexdump: mauvaise valeur pour la longueur.\n"
#: text-utils/hexsyntax.c:91
msgid "hexdump: bad skip value.\n"
-msgstr ""
+msgstr "hexdump: mauvaise valeur de saut.\n"
#: text-utils/hexsyntax.c:129
msgid ""
"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
msgstr ""
-#: text-utils/more.c:247
-msgid "usage: "
-msgstr ""
-
-#: text-utils/more.c:249
-msgid " [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr ""
+#: text-utils/more.c:327
+#, c-format
+msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "usage: %s [-dfln] [+lignenum | +/motif] nom1 nom2 ...\n"
-#: text-utils/more.c:423
+#: text-utils/more.c:502
#, c-format
msgid ""
"\n"
"*** %s: directory ***\n"
"\n"
msgstr ""
+"\n"
+"*** %s: répertoire ***\n"
+"\n"
-#. simple ELF detection
-#: text-utils/more.c:462
+#: text-utils/more.c:542
#, c-format
msgid ""
"\n"
"******** %s: Not a text file ********\n"
"\n"
msgstr ""
+"\n"
+"******** %s: Pas un fichier texte ********\n"
+"\n"
-#: text-utils/more.c:566
+#: text-utils/more.c:646
msgid "[Use q or Q to quit]"
-msgstr ""
+msgstr "[utilisez q ou Q pour quitter]"
-#: text-utils/more.c:752
+#: text-utils/more.c:832
msgid "--More--"
-msgstr ""
+msgstr "--Encore--"
-#: text-utils/more.c:754
+#: text-utils/more.c:834
#, c-format
msgid "(Next file: %s)"
-msgstr ""
+msgstr "(Prochain fichier : %s)"
-#: text-utils/more.c:760
-#, fuzzy
+#: text-utils/more.c:840
msgid "[Press space to continue, 'q' to quit.]"
-msgstr "Appuyez sur une touche pour continuer"
+msgstr "[Appuyez sur espace pour continuer, 'q' pour quitter.]"
-#: text-utils/more.c:1058
+#: text-utils/more.c:1141
#, c-format
msgid "...back %d page"
-msgstr ""
+msgstr "...retour de %d pages"
-#: text-utils/more.c:1104
+#: text-utils/more.c:1189
#, c-format
msgid "...skipping %d line"
msgstr ""
-#: text-utils/more.c:1145
+#: text-utils/more.c:1230
msgid ""
"\n"
"***Back***\n"
"\n"
msgstr ""
+"\n"
+"***Arričre***\n"
+"\n"
-#: text-utils/more.c:1183
+#: text-utils/more.c:1268
msgid "Can't open help file"
-msgstr ""
+msgstr "Impossible d'ouvrir le fichier d'aide"
-#: text-utils/more.c:1204 text-utils/more.c:1208
+#: text-utils/more.c:1310 text-utils/more.c:1314
msgid "[Press 'h' for instructions.]"
-msgstr ""
+msgstr "[appuyez sur 'h' pour l'aide.]"
-#: text-utils/more.c:1243
+#: text-utils/more.c:1349
#, c-format
msgid "\"%s\" line %d"
-msgstr ""
+msgstr "\"%s\" ligne %d"
-#: text-utils/more.c:1245
+#: text-utils/more.c:1351
#, c-format
msgid "[Not a file] line %d"
-msgstr ""
+msgstr "[Pas un fichier] ligne %d"
-#: text-utils/more.c:1329
+#: text-utils/more.c:1435
msgid " Overflow\n"
-msgstr ""
+msgstr " Dépassement\n"
-#: text-utils/more.c:1376
+#: text-utils/more.c:1482
msgid "...skipping\n"
msgstr ""
-#: text-utils/more.c:1406
+#: text-utils/more.c:1512
msgid "Regular expression botch"
msgstr ""
-#: text-utils/more.c:1418
+#: text-utils/more.c:1524
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
+"\n"
+"Motif introuvable\n"
-#: text-utils/more.c:1421
+#: text-utils/more.c:1527
msgid "Pattern not found"
-msgstr ""
+msgstr "Motif introuvable"
-#: text-utils/more.c:1483
+#: text-utils/more.c:1588
msgid "can't fork\n"
-msgstr ""
+msgstr "impossible de forker\n"
-#: text-utils/more.c:1522
+#: text-utils/more.c:1627
msgid ""
"\n"
"...Skipping "
msgstr ""
-#: text-utils/more.c:1526
+#: text-utils/more.c:1631
msgid "...Skipping "
msgstr ""
-#: text-utils/more.c:1527
+#: text-utils/more.c:1632
msgid "to file "
-msgstr ""
+msgstr "vers le fichier "
-#: text-utils/more.c:1527
+#: text-utils/more.c:1632
msgid "back to file "
-msgstr ""
+msgstr "retour au fichier "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1871
msgid "Line too long"
-msgstr ""
+msgstr "Ligne trop longue"
-#: text-utils/more.c:1809
+#: text-utils/more.c:1915
msgid "No previous command to substitute for"
-msgstr ""
+msgstr "Aucune commande antérieure ŕ substituer"
#: text-utils/odsyntax.c:133
msgid "od: od(1) has been deprecated for hexdump(1).\n"
@@ -7576,74 +8356,86 @@ msgstr ""
#: text-utils/odsyntax.c:136
#, c-format
+#, FIXME
msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
+msgstr "od: la compatibilité avec hexdump(1) ne supporte pas l'option%s -%c\n"
#: text-utils/odsyntax.c:137
msgid "; see strings(1)."
-msgstr ""
+msgstr "; voir strings(1)."
#: text-utils/parse.c:63
#, c-format
msgid "hexdump: can't read %s.\n"
-msgstr ""
+msgstr "hexdump: impossible de lire %s.\n"
#: text-utils/parse.c:68
msgid "hexdump: line too long.\n"
-msgstr ""
+msgstr "hexdump: ligne trop longue.\n"
#: text-utils/parse.c:406
+#, fuzzy
msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr ""
+msgstr "hexdump: mauvais nombre d'octets pour la conversion de caractčre %s.\n"
#: text-utils/parse.c:490
#, c-format
msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: mauvais nombre d'octets pour la conversion de caractčre %s.\n"
#: text-utils/parse.c:497
msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: %%s requiert une précision ou un nombre d'octets.\n"
#: text-utils/parse.c:503
#, c-format
msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: mauvais format {%s}\n"
#: text-utils/parse.c:509
msgid "hexdump: bad conversion character %%%s.\n"
-msgstr ""
+msgstr "hexdump: mauvaise conversion de caractčre %%%s.\n"
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
-msgstr ""
+msgstr "Impossible d'allouer le buffer\n"
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
-msgstr ""
+msgstr "usage: rev [fichier ...]\n"
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr ""
+msgstr "usage: %s [ -i ] [ -tTerm ] fichier...\n"
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
-msgstr ""
+msgstr "problčme lors de la lecture de terminfo"
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr ""
+msgstr "Séquence d'échappement inconnue en entrée : %o, %o\n"
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
-msgstr ""
+msgstr "Impossible d'allouer le buffer.\n"
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
-msgstr ""
+msgstr "Ligne en entrée trop longue.\n"
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
+msgstr "Pas assez de mémoire pour agrandir le buffer.\n"
+
+#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
msgstr ""
+
+#: kbd/kbdrate.c:247
+msgid "Cannot open /dev/port"
+msgstr "Impossible d'ouvrir /dev/port"
+
diff --git a/po/it.po b/po/it.po
index 15f9e9459..73b8c6a7e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,11 +2,10 @@
# Copyright (C) 1999 Marco d'Itri
# Marco d'Itri <md@linux.it>, 1999.
#
-#: fdisk/cfdisk.c:2554
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.9i\n"
-"POT-Creation-Date: 1999-02-21 22:08+0100\n"
+"POT-Creation-Date: 1999-09-25 13:07+0200\n"
"PO-Revision-Date: 1999-04-04 21:12+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -14,221 +13,1207 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: fdisk/cfdisk.c:323
-msgid "Linux/MINIX"
-msgstr "Linux/MINIX"
+#: clock/cmos.c:146
+msgid "booted from MILO\n"
+msgstr ""
-#: fdisk/cfdisk.c:324
-msgid "Linux Swap"
-msgstr "Linux Swap"
+#: clock/cmos.c:154
+msgid "Ruffian BCD clock\n"
+msgstr ""
-#: fdisk/cfdisk.c:325 fdisk/cfdisk.c:388
-msgid "Linux"
-msgstr "Linux"
+#: clock/cmos.c:170
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr ""
-#: fdisk/cfdisk.c:326 fdisk/cfdisk.c:383 fdisk/cfdisk.c:1757
-msgid "Free Space"
-msgstr "Spazio Libero"
+#: clock/cmos.c:180
+msgid "funky TOY!\n"
+msgstr ""
-#: fdisk/cfdisk.c:327
-msgid "Extended"
-msgstr "Estesa"
+#: clock/cmos.c:234
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr ""
-#: fdisk/cfdisk.c:328
-msgid "Linux extended"
-msgstr "Estesa linux"
+#: clock/cmos.c:558
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr ""
-#: fdisk/cfdisk.c:329
-msgid "DOS FAT12"
-msgstr "DOS FAT12"
+#: clock/cmos.c:565
+msgid "I failed to get permission because I didnt try.\n"
+msgstr ""
-#: fdisk/cfdisk.c:330
-msgid "XENIX root"
-msgstr "XENIX root"
+#: clock/cmos.c:568
+#, c-format
+msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
+msgstr ""
-#: fdisk/cfdisk.c:331
-msgid "XENIX usr"
-msgstr "XENIX usr"
+#: clock/cmos.c:571
+msgid "Probably you need root privileges.\n"
+msgstr ""
-#: fdisk/cfdisk.c:332
-msgid "DOS FAT16"
-msgstr "DOS FAT16"
+#: clock/hwclock.c:253
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr ""
-#: fdisk/cfdisk.c:333
-msgid "DOS FAT16 (big)"
-msgstr "DOS FAT16 (big)"
+#: clock/hwclock.c:255
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr ""
-#: fdisk/cfdisk.c:334
-msgid "OS/2 HPFS or NTFS"
-msgstr "OS/2 HPFS o NTFS"
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop. The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:278
+msgid "Waiting for clock tick...\n"
+msgstr ""
-#: fdisk/cfdisk.c:335
-msgid "AIX"
-msgstr "AIX"
+#: clock/hwclock.c:282
+msgid "...got clock tick\n"
+msgstr ""
-#: fdisk/cfdisk.c:336
-msgid "AIX bootable"
-msgstr "AIX bootabile"
+#: clock/hwclock.c:334
+#, c-format
+msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
-#: fdisk/cfdisk.c:337
-msgid "OS/2 Boot Manager"
-msgstr "OS/2 Boot Manager"
+#: clock/hwclock.c:343
+#, c-format
+msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
-#: fdisk/cfdisk.c:338
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+#: clock/hwclock.c:369
+#, c-format
+msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgstr ""
-#: fdisk/cfdisk.c:339
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+#: clock/hwclock.c:395
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
-#: fdisk/cfdisk.c:340
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+#: clock/hwclock.c:401
+msgid "Clock not changed - testing only.\n"
+msgstr ""
-#: fdisk/cfdisk.c:341
-msgid "Win95 Extended (LBA)"
-msgstr "Win95 Estesa (LBA)"
+#: clock/hwclock.c:449
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
-#: fdisk/cfdisk.c:342
-msgid "Hidden DOS FAT12"
-msgstr "DOS FAT12 nascosta"
+#: clock/hwclock.c:473
+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 ""
-#: fdisk/cfdisk.c:343
-msgid "Hidden DOS FAT16"
-msgstr "DOS FAT16 nascosta"
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end. We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:485
+#, c-format
+msgid "%s %.6f seconds\n"
+msgstr ""
-#: fdisk/cfdisk.c:344
-msgid "Hidden DOS FAT16 (big)"
-msgstr "DOS FAT16 (big) nascosta"
+#: clock/hwclock.c:519
+msgid "No --date option specified.\n"
+msgstr ""
-#: fdisk/cfdisk.c:345
-msgid "Hidden OS/2 HPFS or NTFS"
-msgstr "OS/2 HPFS o NTFS nascosta"
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:524
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
-#: fdisk/cfdisk.c:346
-msgid "Venix 80286"
-msgstr "Venix 80286"
+#: clock/hwclock.c:530
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr ""
-#: fdisk/cfdisk.c:347
-msgid "PPC PReP boot"
-msgstr "PPC PReP boot"
+#: clock/hwclock.c:534
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
-#: fdisk/cfdisk.c:348
-msgid "Novell?"
-msgstr "Novell?"
+#: clock/hwclock.c:540
+#, c-format
+msgid "response from date command = %s\n"
+msgstr ""
-#: fdisk/cfdisk.c:349
-msgid "Microport"
-msgstr "Microport"
+#: clock/hwclock.c:542
+#, 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 ""
-#: fdisk/cfdisk.c:350
-msgid "GNU HURD"
-msgstr "GNU HURD"
+#: clock/hwclock.c:551
+#, c-format
+msgid ""
+"The date command issued by %s returnedsomething other than an integer where "
+"the convertedtime value was expected.\n"
+"The command was:\n"
+" %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
-#: fdisk/cfdisk.c:351
-msgid "Novell Netware 286"
-msgstr "Novell Netware 286"
+#: clock/hwclock.c:561
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr ""
-#: fdisk/cfdisk.c:352
-msgid "Novell Netware 386"
-msgstr "Novell Netware 386"
+#: clock/hwclock.c:596
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
-#: fdisk/cfdisk.c:353
-msgid "PC/IX"
-msgstr "PC/IX"
+#: clock/hwclock.c:612
+msgid "Calling settimeofday:\n"
+msgstr ""
-#: fdisk/cfdisk.c:354
-msgid "Old MINIX"
-msgstr "Vecchio MINIX"
+#: clock/hwclock.c:613
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr ""
-#: fdisk/cfdisk.c:355
-msgid "Amoeba"
-msgstr "Amoeba"
+#: clock/hwclock.c:615
+#, c-format
+msgid "\ttz.tz_minuteswest = %ld\n"
+msgstr ""
-#: fdisk/cfdisk.c:356
-msgid "Amoeba BBT"
-msgstr "Amoeba BBT"
+#: clock/hwclock.c:618
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
-#: fdisk/cfdisk.c:357
-msgid "BSD/386"
-msgstr "BSD/386"
+#: clock/hwclock.c:630
+msgid "Must be superuser to set system clock.\n"
+msgstr ""
-#: fdisk/cfdisk.c:358
-msgid "OpenBSD"
-msgstr "OpenBSD"
+#: clock/hwclock.c:632
+msgid "settimeofday() failed"
+msgstr ""
-#: fdisk/cfdisk.c:359
-msgid "NEXTSTEP"
-msgstr "NEXTSTEP"
+#: clock/hwclock.c:665
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
-#: fdisk/cfdisk.c:360
-msgid "BSDI fs"
-msgstr "BSDI fs"
+#: clock/hwclock.c:669
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
-#: fdisk/cfdisk.c:361
-msgid "BSDI swap"
-msgstr "BSDI swap"
+#: clock/hwclock.c:678
+#, c-format
+msgid ""
+"Clock drifted %d 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 ""
-#: fdisk/cfdisk.c:362
-msgid "Syrinx"
-msgstr "Syrinx"
+#: clock/hwclock.c:729
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr ""
-#: fdisk/cfdisk.c:363
-msgid "CP/M"
-msgstr "CP/M"
+#: clock/hwclock.c:731
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
-#: fdisk/cfdisk.c:364
-msgid "DOS access"
-msgstr "DOS access"
+#: clock/hwclock.c:759
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr ""
-#: fdisk/cfdisk.c:365
-msgid "DOS R/O"
-msgstr "DOS R/O"
+#: clock/hwclock.c:760
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
-#: fdisk/cfdisk.c:366
-msgid "BeOS fs"
-msgstr "BeOS fs"
+#: clock/hwclock.c:784
+msgid "Drift adjustment parameters not updated.\n"
+msgstr ""
-#: fdisk/cfdisk.c:367
-msgid "DOS secondary"
-msgstr "DOS secondary"
+#: clock/hwclock.c:825
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
-#: fdisk/cfdisk.c:368
-msgid "BBT"
-msgstr "BBT"
+#: clock/hwclock.c:849
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:875
+#, c-format
+msgid "Using %s.\n"
+msgstr ""
+
+#: clock/hwclock.c:877
+msgid "No usable clock interface found.\n"
+msgstr ""
+
+#: clock/hwclock.c:965
+msgid "Unable to set system clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:994
+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 ""
+
+#: clock/hwclock.c:1003
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1005
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr ""
+
+#: clock/hwclock.c:1008
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+
+#: clock/hwclock.c:1011
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:1014
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1094
+#, c-format
+msgid "%s takes no non-option arguments. You supplied %d.\n"
+msgstr ""
+
+#: clock/hwclock.c:1102
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+
+#: clock/hwclock.c:1115
+msgid "No usable set-to time. Cannot set clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1130
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1134
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1150
+msgid ""
+"Cannot access the Hardware Clock via any known method. Use --debug option "
+"to see the details of our search for an access method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1164
+#, c-format
+msgid "%s: %s, errno=%d: %s.\n"
+msgstr ""
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr ""
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr ""
+
+#: clock/kd.c:65 clock/rtc.c:144
+msgid "Timed out waiting for time change.\n"
+msgstr ""
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr ""
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from /dev/tty1"
+msgstr ""
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr ""
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr ""
+
+#: clock/kd.c:161
+msgid "Can't open /dev/tty1"
+msgstr ""
+
+#: clock/rtc.c:98
+msgid "ioctl() to /dev/rtc to read the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:129
+msgid "Waiting in loop for time from /dev/rtc to change\n"
+msgstr ""
+
+#: clock/rtc.c:165 clock/rtc.c:222
+msgid "open() of /dev/rtc failed"
+msgstr ""
+
+#. This rtc device doesn't have interrupt functions. This is typical
+#. on an Alpha, where the Hardware Clock interrupts are used by the
+#. kernel for the system clock, so aren't at the user's disposal.
+#.
+#: clock/rtc.c:182
+msgid "/dev/rtc does not have interrupt functions. "
+msgstr ""
+
+#: clock/rtc.c:191
+msgid "read() to /dev/rtc to wait for clock tick failed"
+msgstr ""
+
+#: clock/rtc.c:199
+msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+msgstr ""
+
+#: clock/rtc.c:202
+msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+msgstr ""
+
+#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
+msgid "Unable to open /dev/rtc"
+msgstr ""
+
+#: clock/rtc.c:268
+msgid "ioctl() to /dev/rtc to set the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:272
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr ""
+
+#: clock/rtc.c:302
+msgid "Open of /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:320 clock/rtc.c:365
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file /dev/rtc. This file does not "
+"exist on this system.\n"
+msgstr ""
+
+#: clock/rtc.c:331
+msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:337
+#, c-format
+msgid "we have read epoch %ld from /dev/rtc 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.
+#: clock/rtc.c:357
+#, c-format
+msgid "The epoch value may not be less than 1900. You requested %ld\n"
+msgstr ""
+
+#: clock/rtc.c:374
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgstr ""
+
+#: clock/rtc.c:379
+msgid ""
+"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
+"ioctl.\n"
+msgstr ""
+
+#: clock/rtc.c:382
+msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+msgstr ""
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr ""
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr ""
+
+#: clock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr ""
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:33
+msgid "Formatting ... "
+msgstr ""
+
+#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#, fuzzy
+msgid "done\n"
+msgstr "Fatto"
+
+#: disk-utils/fdformat.c:62
+msgid "Verifying ... "
+msgstr ""
+
+#: disk-utils/fdformat.c:73
+msgid "Read: "
+msgstr ""
+
+#: disk-utils/fdformat.c:75
+#, c-format
+msgid "Problem reading cylinder %d, expected %d, read %d\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:81
+#, c-format
+msgid ""
+"bad data in cyl %d\n"
+"Continuing ... "
+msgstr ""
+
+#: disk-utils/fdformat.c:96
+#, fuzzy, c-format
+msgid "usage: %s [ -n ] device\n"
+msgstr "\t%s [opzioni] dispositivo\n"
+
+#: disk-utils/fdformat.c:122
+#, fuzzy, c-format
+msgid "%s: not a floppy device\n"
+msgstr "\t%s [opzioni] dispositivo\n"
+
+#: disk-utils/fdformat.c:128
+msgid "Could not determine current format type"
+msgstr ""
+
+#: disk-utils/fdformat.c:129
+#, c-format
+msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:130
+#, fuzzy
+msgid "Double"
+msgstr "Fatto"
+
+#: disk-utils/fdformat.c:130
+msgid "Single"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:198
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:296
+#, c-format
+msgid "%s is mounted.\t "
+msgstr ""
+
+#: disk-utils/fsck.minix.c:298
+#, fuzzy
+msgid "Do you really want to continue"
+msgstr "Premere un tasto per continuare"
+
+#: disk-utils/fsck.minix.c:302
+msgid "check aborted.\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+msgid "Zone nr < FIRSTZONE in file `"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
+msgid "Zone nr >= ZONES in file `"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
+msgid "Remove block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:364
+msgid "Read error: unable to seek to block in file '"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:370
+msgid "Read error: bad block in file '"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:386
+msgid ""
+"Internal error: trying to write bad block\n"
+"Write request ignored\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:394
+msgid "Write error: bad block in file '"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:560
+msgid "unable to read super block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:615
+msgid "Warning: Firstzone != Norm_firstzone\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
+#, fuzzy, c-format
+msgid "%ld inodes\n"
+msgstr "Cilindri"
+
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
+#, c-format
+msgid "%ld blocks\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
+#, c-format
+msgid "Firstdatazone=%ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
+#, c-format
+msgid "Zonesize=%d\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:624
+#, fuzzy, c-format
+msgid "Maxsize=%ld\n"
+msgstr "Massim."
+
+#: disk-utils/fsck.minix.c:625
+#, c-format
+msgid "Filesystem state=%d\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:626
+#, c-format
+msgid ""
+"namelen=%d\n"
+"\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
+#, c-format
+msgid "Inode %d marked not used, but used for file '"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
+msgid "Mark in use"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
+#, c-format
+msgid " has mode %05o\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
+msgid "Warning: inode count too big.\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
+msgid "Block has been used before. Now in file `"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
+msgid "Clear"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#, c-format
+msgid "Block %d in file `"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
+msgid "' is marked not in use."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
+msgid "Correct"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+msgid " contains a bad inode number for file '"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
+msgid " Remove"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
+msgid ": bad directory: '.' isn't first\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
+msgid ": bad directory: '..' isn't second\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1076
+#, fuzzy
+msgid "internal error"
+msgstr "!!! Errore interno !!!"
+
+#: disk-utils/fsck.minix.c:1079
+msgid ": bad directory: size<32"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1098
+msgid ": bad directory: size < 32"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
+#, c-format
+msgid "Inode %d mode not cleared."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
+#, c-format
+msgid "Inode %d not used, marked used in the bitmap."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
+#, c-format
+msgid "Inode %d used, marked unused in the bitmap."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#, c-format
+msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
+msgid "Set i_nlinks to count"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
+#, c-format
+msgid "Zone %d: marked in use, no file uses it."
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
+msgid "Unmark"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
+#, c-format
+msgid "Zone %d: %sin use, counted=%d\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
+msgid "not "
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1190
+#, fuzzy
+msgid "Set"
+msgstr "Settori"
+
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1257
+msgid "bad v2 inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1287
+#, c-format
+msgid "unable to open '%s'"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1304
+#, c-format
+msgid "%s is clean, no check.\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1308
+#, c-format
+msgid "Forcing filesystem check on %s.\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1310
+#, c-format
+msgid "Filesystem on %s is dirty, needs checking.\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1339
+msgid ""
+"\n"
+"%6ld inodes used (%ld%%)\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1344
+msgid "%6ld zones used (%ld%%)\n"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1346
+#, 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 ""
+
+#: disk-utils/fsck.minix.c:1359
+#, fuzzy
+msgid ""
+"----------------------------\n"
+"FILE SYSTEM HAS BEEN CHANGED\n"
+"----------------------------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+
+#: disk-utils/mkfs.c:66
+msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
+msgstr ""
+
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
+#, c-format
+msgid "%s: Out of memory!\n"
+msgstr ""
+
+#: disk-utils/mkfs.c:89
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:186
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:210
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:271
+msgid "seek to boot block failed in write_tables"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:273
+msgid "unable to clear boot sector"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:275
+msgid "seek failed in write_tables"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:279
+msgid "unable to write inode map"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:281
+msgid "unable to write zone map"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:283
+msgid "unable to write inodes"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:292
+msgid "write failed in write_block"
+msgstr ""
+
+#. Could make triple indirect block here
+#: disk-utils/mkfs.minix.c:300 disk-utils/mkfs.minix.c:374
+#: disk-utils/mkfs.minix.c:425
+msgid "too many bad blocks"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:308
+msgid "not enough good blocks"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:517
+msgid "unable to allocate buffers for maps"
+msgstr ""
-#: fdisk/cfdisk.c:381 fdisk/cfdisk.c:1755
+#: disk-utils/mkfs.minix.c:526
+msgid "unable to allocate buffer for inodes"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:532
+#, c-format
+msgid ""
+"Maxsize=%ld\n"
+"\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:546
+msgid "seek failed during testing of blocks"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:554
+msgid "Weird values in do_check: probably bugs\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
+msgid "seek failed in check_blocks"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:594
+msgid "bad blocks before data-area: cannot make fs"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
+#, c-format
+msgid "%d bad blocks\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:602 disk-utils/mkfs.minix.c:624
+msgid "one bad block\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:614
+msgid "can't open file of bad blocks"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:669
+#, c-format
+msgid "%s: not compiled with minix v2 support\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:685
+msgid "strtol error: number of blocks not specified"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:717
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:719
+#, c-format
+msgid "unable to stat %s"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:723
+#, c-format
+msgid "will not try to make filesystem on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:101
+#, c-format
+msgid "Assuming pages of size %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:185
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:208
+msgid "too many bad pages"
+msgstr ""
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1153
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
+msgstr ""
+
+#: disk-utils/mkswap.c:239
+msgid "one bad page\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:241
+#, c-format
+msgid "%d bad pages\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:345
+#, c-format
+msgid "%s: error: Nowhere to set up swap on?\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:354
+#, c-format
+msgid "%s: error: size %ld is larger than device size %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:372
+#, c-format
+msgid "%s: error: unknown version %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:378
+#, c-format
+msgid "%s: error: swap area needs to be at least %ldkB\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:397
+#, c-format
+msgid "%s: warning: truncating swap area to %ldkB\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:424
+#, 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 ""
+
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:449
+#, c-format
+msgid "Setting up swapspace version %d, size = %ld bytes\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:455
+msgid "unable to rewind swap-device"
+msgstr ""
+
+#: disk-utils/mkswap.c:458
+msgid "unable to write signature page"
+msgstr ""
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr ""
+
+#: disk-utils/setfdprm.c:30
+#, c-format
+msgid "Invalid number: %s\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:80
+#, c-format
+msgid "Syntax error: '%s'\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:90
+#, c-format
+msgid "No such parameter set: '%s'\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:100
+#, c-format
+msgid "usage: %s [ -p ] dev name\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:101
+#, c-format
+msgid ""
+" %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:104
+#, c-format
+msgid " %s [ -c | -y | -n | -d ] dev\n"
+msgstr ""
+
+#: disk-utils/setfdprm.c:106
+#, c-format
+msgid " %s [ -c | -y | -n ] dev\n"
+msgstr ""
+
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr "Inutilizzabile"
-#: fdisk/cfdisk.c:386
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
+msgid "Free Space"
+msgstr "Spazio Libero"
+
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr "Linux ext2"
-#: fdisk/cfdisk.c:391
+#. also Solaris
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
+msgid "Linux"
+msgstr "Linux"
+
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:393
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:397
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:408
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr "Il disco č stato modificato.\n"
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:423
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
"Riavviare il sistema per essere sicuri che la tabella delle partizioni sia\n"
"stata aggiornata correttamente.\n"
-#: fdisk/cfdisk.c:412
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -240,588 +1225,7089 @@ msgstr ""
"partizioni del DOS 6.x consultare il manuale di\n"
"cfdisk per ulteriori informazioni.\n"
-#: fdisk/cfdisk.c:848
+#: fdisk/cfdisk.c:521
+msgid "FATAL ERROR"
+msgstr ""
+
+#: fdisk/cfdisk.c:530
+#, fuzzy
+msgid "Press any key to exit cfdisk"
+msgstr "Premere un tasto per continuare"
+
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
+msgid "Cannot seek on disk drive"
+msgstr ""
+
+#: fdisk/cfdisk.c:568
+#, fuzzy
+msgid "Cannot read disk drive"
+msgstr "sull'hard disk."
+
+#: fdisk/cfdisk.c:576
+msgid "Cannot write disk drive"
+msgstr ""
+
+#: fdisk/cfdisk.c:815
+#, fuzzy
+msgid "Too many partitions"
+msgstr "Non crea partizioni"
+
+#: fdisk/cfdisk.c:820
+#, fuzzy
+msgid "Partition begins before sector 0"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/cfdisk.c:825
+#, fuzzy
+msgid "Partition ends before sector 0"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/cfdisk.c:830
+msgid "Partition begins after end-of-disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:835
+msgid "Partition ends after end-of-disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:859
+msgid "logical partitions not in disk order"
+msgstr ""
+
+#: fdisk/cfdisk.c:862
+#, fuzzy
+msgid "logical partitions overlap"
+msgstr "Crea una nuova partizione logica"
+
+#: fdisk/cfdisk.c:864
+#, fuzzy
+msgid "enlarged logical partitions overlap"
+msgstr "Crea una nuova partizione logica"
+
+#: fdisk/cfdisk.c:894
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr ""
-"!!!! Errore interno durante la creazione di un drive logico senza partizione\n"
+"!!!! Errore interno durante la creazione di un drive logico senza "
+"partizione\n"
+"estesa !!!!"
+
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
+#, fuzzy
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"!!!! Errore interno durante la creazione di un drive logico senza "
+"partizione\n"
"estesa !!!!"
-#: fdisk/cfdisk.c:1007
+#: fdisk/cfdisk.c:1067
msgid "Menu item too long. Menu may look odd."
msgstr "Voce del menů troppo lunga. Il menů puň apparire strano."
-#: fdisk/cfdisk.c:1009
-#, c-format
-msgid "[%*s%-*s]"
-msgstr "[%*s%-*s]"
-
-#: fdisk/cfdisk.c:1012
-#, c-format
-msgid "%*s%-*s"
-msgstr "%*s%-*s"
-
-#: fdisk/cfdisk.c:1054
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr "Menů senza direzione. Predefinita l'orizzontale."
-#: fdisk/cfdisk.c:1169
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr "Tasto non valido"
-#: fdisk/cfdisk.c:1192
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Premere un tasto per continuare"
-#: fdisk/cfdisk.c:1236 fdisk/cfdisk.c:1726 fdisk/cfdisk.c:2233
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "Primaria"
-#: fdisk/cfdisk.c:1236
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "Crea una nuova partizione primaria"
-#: fdisk/cfdisk.c:1237 fdisk/cfdisk.c:1726 fdisk/cfdisk.c:2232
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "Logica"
-#: fdisk/cfdisk.c:1237
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "Crea una nuova partizione logica"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291 fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Annulla"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "Non crea partizioni"
-#: fdisk/cfdisk.c:1254
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "!!! Errore interno !!!"
-#: fdisk/cfdisk.c:1256
-#, c-format
-msgid "%.2f"
-msgstr "%.2f"
+#: fdisk/cfdisk.c:1344
+#, fuzzy
+msgid "Size (in MB): "
+msgstr "Dim (MB)"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "Inizio"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "Aggiunge la partizione all'inizio dello spazio libero"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "Fine"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr "Aggiunge la partizione alla fine dello spazio libero"
+#: fdisk/cfdisk.c:1397
+#, fuzzy
+msgid "No room to create the extended partition"
+msgstr "Freccia giů Sposta il cursore alla partizione seguente"
+
+#: fdisk/cfdisk.c:1436
+#, fuzzy
+msgid "Bad signature on partition table"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/cfdisk.c:1474
+msgid "You specified more cylinders than fit on disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:1504
+#, fuzzy
+msgid "Cannot open disk drive"
+msgstr "sull'hard disk."
+
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
+msgid "Opened disk read-only - you have no permission to write"
+msgstr ""
+
+#: fdisk/cfdisk.c:1527
+msgid "Cannot get disk size"
+msgstr ""
+
+#. avoid snprintf - it does not exist on ancient systems
#: fdisk/cfdisk.c:1553
+#, fuzzy
+msgid "Bad primary partition"
+msgstr "Crea una nuova partizione primaria"
+
+#. avoid snprintf
+#: fdisk/cfdisk.c:1584
+#, fuzzy
+msgid "Bad logical partition"
+msgstr "Crea una nuova partizione logica"
+
+#: fdisk/cfdisk.c:1699
+msgid "Warning!! This may destroy data on your disk!"
+msgstr ""
+
+#: fdisk/cfdisk.c:1703
msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "Sicuro di volere scrivere sul disco la tabella delle part.? (yes o no): "
+msgstr ""
+"Sicuro di volere scrivere sul disco la tabella delle part.? (yes o no): "
+
+#: fdisk/cfdisk.c:1709
+msgid "no"
+msgstr ""
+
+#: fdisk/cfdisk.c:1710
+#, fuzzy
+msgid "Did not write partition table to disk"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/cfdisk.c:1712
+msgid "yes"
+msgstr ""
+
+#: fdisk/cfdisk.c:1715
+msgid "Please enter `yes' or `no'"
+msgstr ""
-#: fdisk/cfdisk.c:1669 fdisk/cfdisk.c:1787 fdisk/cfdisk.c:1879
+#: fdisk/cfdisk.c:1719
+#, fuzzy
+msgid "Writing partition table to disk..."
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
+#, fuzzy
+msgid "Wrote partition table to disk"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/cfdisk.c:1746
+msgid ""
+"Wrote partition table, but re-read table failed. Reboot to update table."
+msgstr ""
+
+#: fdisk/cfdisk.c:1756
+msgid ""
+"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
+msgstr ""
+
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Inserire il nome del file o premere INVIO per mostrarlo sullo schermo: "
+msgstr ""
+"Inserire il nome del file o premere INVIO per mostrarlo sullo schermo: "
-#: fdisk/cfdisk.c:1688
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr ""
+
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Disk Drive: %s\n"
-#: fdisk/cfdisk.c:1690
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr "Settore 0:\n"
-#: fdisk/cfdisk.c:1697
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr "Settore %d:\n"
-#: fdisk/cfdisk.c:1717
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr " Nessuno "
-#: fdisk/cfdisk.c:1719
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr " Pri/Log"
-#: fdisk/cfdisk.c:1721
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr " Primaria"
-#: fdisk/cfdisk.c:1723
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr " Logica"
-#: fdisk/cfdisk.c:1761
+#. odd flag on end
+#. type id
+#. type name
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "Sconosciuta"
-#: fdisk/cfdisk.c:1767
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr "Boot (%02X)"
-#: fdisk/cfdisk.c:1769 fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr "Sconosciuta (%02X)"
-#: fdisk/cfdisk.c:1771
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr "No (%02X)"
-#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1898
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr "Tabella delle partizioni per %s\n"
-#: fdisk/cfdisk.c:1807 fdisk/cfdisk.c:1899
-msgid "\n"
-msgstr "\n"
-
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr " Primo Ultimo\n"
-#: fdisk/cfdisk.c:1809
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
-msgstr " # Tipo Settore Settore Offset Lunghezza Tipo filesystem (ID) Flag\n"
+msgstr ""
+" # Tipo Settore Settore Offset Lunghezza Tipo filesystem (ID) Flag\n"
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
-msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr ""
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
-#: fdisk/cfdisk.c:1900
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr " ---Iniziale--- ----Finale---- Settore Numero di\n"
-#: fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:2038
msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
msgstr " # Flag Head Sect Cyl ID Head Sect Cyl Iniziale Settori\n"
-#: fdisk/cfdisk.c:1902
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-#: fdisk/cfdisk.c:1935
+#: fdisk/cfdisk.c:2072
msgid "Raw"
msgstr "Raw"
-#: fdisk/cfdisk.c:1935
+#: fdisk/cfdisk.c:2072
msgid "Print the table using raw data format"
msgstr "Stampa la tabella in formato grezzo"
-#: fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2041
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr "Settori"
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr "Stampa la tabella ordinata secondo i settori"
-#: fdisk/cfdisk.c:1937
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr "Tabella"
-#: fdisk/cfdisk.c:1937
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr "Stampa solo la tabella delle partizioni"
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr "Non stampa la tabella"
-#: fdisk/cfdisk.c:1967
-msgid "Help Screen for cfdisk 0.8l"
+#: fdisk/cfdisk.c:2103
+#, fuzzy
+msgid "Help Screen for cfdisk"
msgstr "Schermo di aiuto di cfdisk 0.8l"
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:2105
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr "Questo č cfdisk, un programma di partizionamento del disco basato su"
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:2106
msgid "allows you to create, delete and modify partitions on your hard"
msgstr "curses che permette di creare, cancellare e modificare le partizioni"
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr "sull'hard disk."
-#: fdisk/cfdisk.c:1973
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
+#: fdisk/cfdisk.c:2109
+#, fuzzy
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-#: fdisk/cfdisk.c:1975
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr "Comando Significato"
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
msgstr "------- -----------"
-#: fdisk/cfdisk.c:1977
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
msgstr " b Cambia il flag di bootabilitŕ dalla partizione corrente"
-#: fdisk/cfdisk.c:1978
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
msgstr " d Cancella la partizione corrente"
-#: fdisk/cfdisk.c:1979
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
-msgstr " g Cambia i parametri di cilindri, testine e settori per traccia"
+msgstr ""
+" g Cambia i parametri di cilindri, testine e settori per traccia"
-#: fdisk/cfdisk.c:1980
+#: fdisk/cfdisk.c:2116
msgid " WARNING: This option should only be used by people who"
msgstr " ATTENZIONE: Questa opzione dovrebbe essere usata solo da"
-#: fdisk/cfdisk.c:1981
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr " persone che sanno cosa stanno facendo."
-#: fdisk/cfdisk.c:1982
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
msgstr " h Stampa questa schermata"
-#: fdisk/cfdisk.c:1983
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
-msgstr " m Massimizza l'uso del disco da parte della partizione corrente"
+msgstr ""
+" m Massimizza l'uso del disco da parte della partizione corrente"
-#: fdisk/cfdisk.c:1984
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr " Nota: Questo puň rendere la partizione incompatibile con"
-#: fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr " DOS, OS/2, ..."
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
msgstr " n Crea una nuova partizione dallo spazio libero"
-#: fdisk/cfdisk.c:1987
+#: fdisk/cfdisk.c:2123
msgid " p Print partition table to the screen or to a file"
-msgstr " p Stampa la tabella delle partizioni sullo schermo o su un file"
+msgstr ""
+" p Stampa la tabella delle partizioni sullo schermo o su un file"
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:2124
msgid " There are several different formats for the partition"
msgstr " Ci sono diversi formati di visualizzazione"
-#: fdisk/cfdisk.c:1989
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr " tra cui scegliere:"
-#: fdisk/cfdisk.c:1990
+#: fdisk/cfdisk.c:2126
msgid " r - Raw data (exactly what would be written to disk)"
msgstr " r - Dati grezzi (quello che sarebbe scritto sul disco)"
-#: fdisk/cfdisk.c:1991
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr " s - Tabella ordinata per settori"
-#: fdisk/cfdisk.c:1992
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr " t - Tabella in formato grezzo"
-#: fdisk/cfdisk.c:1993
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr " q Abbandona il programma senza scrivere la tabella"
-#: fdisk/cfdisk.c:1994
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
msgstr " t Cambia il tipo di filesystem"
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
msgstr " u Cambia l'unitŕ di dimensione usata"
-#: fdisk/cfdisk.c:1996
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " Rotates through MB, sectors and cylinders"
msgstr " Cambia tra Mb, settori e cilindri"
-#: fdisk/cfdisk.c:1997
+#: fdisk/cfdisk.c:2133
msgid " W Write partition table to disk (must enter upper case W)"
-msgstr " W Scrive la tabella sul disco (deve essere usata una W maiuscola)"
+msgstr ""
+" W Scrive la tabella sul disco (deve essere usata una W maiuscola)"
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:2134
msgid " Since this might destroy data on the disk, you must"
msgstr " Poichč questo puň distruggere i dati sul disco bisogna"
-#: fdisk/cfdisk.c:1999
+#: fdisk/cfdisk.c:2135
msgid " either confirm or deny the write by entering `yes' or"
msgstr " confermare o annullare la scrittura digitando `yes' o"
-#: fdisk/cfdisk.c:2000
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr " `no'"
-#: fdisk/cfdisk.c:2001
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
msgstr "Freccia su Sposta il cursore alla partizione precedente"
-#: fdisk/cfdisk.c:2002
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
msgstr "Freccia giů Sposta il cursore alla partizione seguente"
-#: fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr "CTRL-L Ridisegna lo schermo"
-#: fdisk/cfdisk.c:2004
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
msgstr " ? Stampa questa schermata"
-#: fdisk/cfdisk.c:2006
+#: fdisk/cfdisk.c:2142
msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Nota: tutti i comandi (tranne Write) possono essere immessi sia in lettere"
+msgstr ""
+"Nota: tutti i comandi (tranne Write) possono essere immessi sia in lettere"
-#: fdisk/cfdisk.c:2007
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr "maiuscole che minuscole"
-#: fdisk/cfdisk.c:2039 fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
+#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr "Cilindri"
-#: fdisk/cfdisk.c:2039
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
msgstr "Cambia la geometria del cilindro"
-#: fdisk/cfdisk.c:2040
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "Testine"
-#: fdisk/cfdisk.c:2040
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
msgstr "Cambia la geometria della testina"
-#: fdisk/cfdisk.c:2041
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
msgstr "Cambia la geometria del settore"
-#: fdisk/cfdisk.c:2042
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr "Fatto"
-#: fdisk/cfdisk.c:2042
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr "Basta cambiamenti di geometria"
-#: fdisk/cfdisk.c:2055
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr "Inserire il numero di cilindri: "
-#: fdisk/cfdisk.c:2068
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
+msgid "Illegal cylinders value"
+msgstr ""
+
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr "Inserire il numero di testine: "
-#: fdisk/cfdisk.c:2081
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
+#, fuzzy
+msgid "Illegal heads value"
+msgstr "Tasto non valido"
+
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr "Inserire il numero di settori per traccia: "
-#: fdisk/cfdisk.c:2168
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
+msgid "Illegal sectors value"
+msgstr ""
+
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr "Inserire il tipo di filesystem: "
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2348
+msgid "Cannot change FS Type to empty"
+msgstr ""
+
+#: fdisk/cfdisk.c:2350
+msgid "Cannot change FS Type to extended"
+msgstr ""
+
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "Boot"
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
msgstr "Scon(%02X)"
-#: fdisk/cfdisk.c:2215 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
msgstr ", NC"
-#: fdisk/cfdisk.c:2223 fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
msgstr "NC"
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr "Pri/Log"
-#: fdisk/cfdisk.c:2306
-#, c-format
-msgid "cfdisk %s"
-msgstr "cfdisk %s"
-
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "Disk Drive: %s"
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr ""
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "Testine: %d Settori per traccia: %d Cilindri: %d"
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "Nome"
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "Flag"
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "Tipo Part"
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "Tipo FS"
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr "[Etichetta]"
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr "Settori"
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "Dim (MB)"
-#: fdisk/cfdisk.c:2379
+#: fdisk/cfdisk.c:2494
+#, fuzzy
+msgid "Size (GB)"
+msgstr "Dim (MB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "Bootable"
-#: fdisk/cfdisk.c:2379
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
msgstr "Cambia il flag di bootabilitŕ dalla partizione corrente"
-#: fdisk/cfdisk.c:2380
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr "Delete"
-#: fdisk/cfdisk.c:2380
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
msgstr "Cancella la partizione corrente"
-#: fdisk/cfdisk.c:2381
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr "Geometria"
-#: fdisk/cfdisk.c:2381
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
msgstr "Cambia la geometria del disco (solo per esperti)"
-#: fdisk/cfdisk.c:2382
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr "Help"
-#: fdisk/cfdisk.c:2382
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
msgstr "Stampa la schermata di aiuto"
-#: fdisk/cfdisk.c:2383
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr "Massim."
-#: fdisk/cfdisk.c:2383
+#: fdisk/cfdisk.c:2553
msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "Massimizza lo spazio usato dalla partizione corrente (solo per esperti)"
+msgstr ""
+"Massimizza lo spazio usato dalla partizione corrente (solo per esperti)"
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr "Nuova"
-#: fdisk/cfdisk.c:2384
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr "Crea una nuova partizione dallo spazio libero"
-#: fdisk/cfdisk.c:2385
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr "Print"
-#: fdisk/cfdisk.c:2385
+#: fdisk/cfdisk.c:2555
msgid "Print partition table to the screen or to a file"
msgstr "Stampa la tabella delle partizioni sullo schermo o su un file"
-#: fdisk/cfdisk.c:2386
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr "Quit"
-#: fdisk/cfdisk.c:2386
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr "Abbandona il programma senza scrivere la tabella delle partizioni"
-#: fdisk/cfdisk.c:2387
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr "Tipo"
-#: fdisk/cfdisk.c:2387
+#: fdisk/cfdisk.c:2557
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr "Cambia il tipo di filesystem (DOS, Linux, OS/2 ecc...)"
-#: fdisk/cfdisk.c:2388
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr "Unitŕ"
-#: fdisk/cfdisk.c:2388
+#: fdisk/cfdisk.c:2558
msgid "Change units of the partition size display (MB, sect, cyl)"
msgstr "Cambia l'unitŕ di misura usata per le dimensioni (MB, sett, cil)"
-#: fdisk/cfdisk.c:2389
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr "Write"
-#: fdisk/cfdisk.c:2389
+#: fdisk/cfdisk.c:2559
msgid "Write partition table to disk (this might destroy data)"
msgstr "Scrive la tabella delle partizioni sul disco (puň distruggere dati)"
-#: fdisk/cfdisk.c:2542
-msgid "Copyright (C) 1994-1997 Kevin E. Martin & aeb\n"
+#: fdisk/cfdisk.c:2605
+#, fuzzy
+msgid "Cannot make this partition bootable"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/cfdisk.c:2615
+#, fuzzy
+msgid "Cannot delete an empty partition"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
+#, fuzzy
+msgid "Cannot maximize this partition"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/cfdisk.c:2645
+#, fuzzy
+msgid "This partition is unusable"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/cfdisk.c:2647
+msgid "This partition is already in use"
+msgstr ""
+
+#: fdisk/cfdisk.c:2664
+msgid "Cannot change the type of an empty partition"
+msgstr ""
+
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
+#, fuzzy
+msgid "No more partitions"
+msgstr "Non crea partizioni"
+
+#: fdisk/cfdisk.c:2704
+#, fuzzy
+msgid "Illegal command"
+msgstr "Tasto non valido"
+
+#: fdisk/cfdisk.c:2714
+#, fuzzy
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
msgstr "Copyright (C) 1994-1997 Kevin E. Martin & aeb\n"
-#: fdisk/cfdisk.c:2547
+#. Unfortunately, xgettext does not handle multi-line strings
+#. so, let's use explicit \n's instead
+#: fdisk/cfdisk.c:2721
+#, c-format
msgid ""
"\n"
"Usage:\n"
-msgstr "\nUso:\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 ""
-#: fdisk/cfdisk.c:2548
-msgid "Print version:\n"
-msgstr "Stampa la versione:\n"
+#: fdisk/fdisk.c:247
+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 drives) use 2048-byte sectors\n"
+msgstr ""
-#: fdisk/cfdisk.c:2549
+#: fdisk/fdisk.c:259
+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 ""
+
+#: fdisk/fdisk.c:267
#, c-format
-msgid "\t%s -v\n"
-msgstr "\t%s -v\n"
+msgid "Unable to open %s\n"
+msgstr ""
-#: fdisk/cfdisk.c:2550
-msgid "Print partition table:\n"
+#: fdisk/fdisk.c:270
+#, c-format
+msgid "Unable to read %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:273
+#, c-format
+msgid "Unable to seek on %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:276
+#, c-format
+msgid "Unable to write %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:279
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:283
+msgid "Unable to allocate any more memory\n"
+msgstr ""
+
+#: fdisk/fdisk.c:285
+msgid "Fatal error\n"
+msgstr ""
+
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
+#, fuzzy
+msgid "Command action"
+msgstr "Comando Significato"
+
+#: fdisk/fdisk.c:297
+msgid " a toggle a read only flag"
+msgstr ""
+
+#. sun
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
+msgid " b edit bsd disklabel"
+msgstr ""
+
+#: fdisk/fdisk.c:299
+msgid " c toggle the mountable flag"
+msgstr ""
+
+#. sun
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#, fuzzy
+msgid " d delete a partition"
+msgstr " d Cancella la partizione corrente"
+
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
+msgid " l list known partition types"
+msgstr ""
+
+#. sun
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
+#, fuzzy
+msgid " m print this menu"
+msgstr " h Stampa questa schermata"
+
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
+#, fuzzy
+msgid " n add a new partition"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
+#, fuzzy
+msgid " o create a new empty DOS partition table"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
+#, fuzzy
+msgid " p print the partition table"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
+msgid " q quit without saving changes"
+msgstr ""
+
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
+msgid " s create a new empty Sun disklabel"
+msgstr ""
+
+#. sun
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+msgid " t change a partition's system id"
+msgstr ""
+
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
+msgid " u change display/entry units"
+msgstr ""
+
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
+#, fuzzy
+msgid " v verify the partition table"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
+msgid " w write table to disk and exit"
+msgstr ""
+
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
+msgid " x extra functionality (experts only)"
+msgstr ""
+
+#: fdisk/fdisk.c:316
+#, fuzzy
+msgid " a select bootable partition"
+msgstr " d Cancella la partizione corrente"
+
+#. sgi flavour
+#: fdisk/fdisk.c:317
+msgid " b edit bootfile entry"
+msgstr ""
+
+#. sgi
+#: fdisk/fdisk.c:318
+#, fuzzy
+msgid " c select sgi swap partition"
+msgstr " d Cancella la partizione corrente"
+
+#: fdisk/fdisk.c:341
+msgid " a toggle a bootable flag"
+msgstr ""
+
+#: fdisk/fdisk.c:343
+msgid " c toggle the dos compatibility flag"
+msgstr ""
+
+#: fdisk/fdisk.c:364
+#, fuzzy
+msgid " a change number of alternate cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#. sun
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#, fuzzy
+msgid " c change number of cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
+#, fuzzy
+msgid " d print the raw data in the partition table"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/fdisk.c:367
+#, fuzzy
+msgid " e change number of extra sectors per cylinder"
+msgstr "Inserire il numero di settori per traccia: "
+
+#. sun
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
+#, fuzzy
+msgid " h change number of heads"
+msgstr "Inserire il numero di testine: "
+
+#: fdisk/fdisk.c:369
+msgid " i change interleave factor"
+msgstr ""
+
+#. sun
+#: fdisk/fdisk.c:370
+msgid " o change rotation speed (rpm)"
+msgstr ""
+
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
+msgid " r return to main menu"
+msgstr ""
+
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+#, fuzzy
+msgid " s change number of sectors/track"
+msgstr "Inserire il numero di settori per traccia: "
+
+#: fdisk/fdisk.c:378
+#, fuzzy
+msgid " y change number of physical cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/fdisk.c:382
+msgid " b move beginning of data in a partition"
+msgstr ""
+
+#: fdisk/fdisk.c:385
+#, fuzzy
+msgid " e list extended partitions"
+msgstr " d Cancella la partizione corrente"
+
+#. !sun
+#: fdisk/fdisk.c:386
+#, fuzzy
+msgid " g create an IRIX partition table"
+msgstr "Non crea partizioni"
+
+#: fdisk/fdisk.c:482
+msgid "You must set"
+msgstr ""
+
+#: fdisk/fdisk.c:496
+#, fuzzy
+msgid "heads"
+msgstr "Testine"
+
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
+#, fuzzy
+msgid "sectors"
+msgstr "Settori"
+
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:441
+#: fdisk/sfdisk.c:842
+#, fuzzy
+msgid "cylinders"
+msgstr "Cilindri"
+
+#: fdisk/fdisk.c:504
+#, c-format
+msgid ""
+"%s%s.\n"
+"You can do this from the extra functions menu.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:505
+msgid " and "
+msgstr ""
+
+#: fdisk/fdisk.c:539
+#, fuzzy
+msgid "Bad offset in primary extended partition\n"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/fdisk.c:546
+#, c-format
+msgid "Warning: deleting partitions after %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:567
+#, c-format
+msgid "Warning: extra link pointer in partition table %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:575
+#, c-format
+msgid "Warning: ignoring extra data in partition table %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:601
+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 ""
+
+#: fdisk/fdisk.c:637
+#, fuzzy
+msgid "You will not be able to write the partition table.\n"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/fdisk.c:646
+#, c-format
+msgid "Note: sector size is %d (not %d)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:694
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"disklabel\n"
+msgstr ""
+
+#: fdisk/fdisk.c:710
+#, fuzzy
+msgid "Internal error\n"
+msgstr "!!! Errore interno !!!"
+
+#: fdisk/fdisk.c:720
+#, c-format
+msgid "Ignoring extra extended partition %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:727
+#, c-format
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
+"w(rite)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:748
+msgid ""
+"\n"
+"got EOF thrice - exiting..\n"
+msgstr ""
+
+#: fdisk/fdisk.c:785
+msgid "Hex code (type L to list codes): "
+msgstr ""
+
+#: fdisk/fdisk.c:824
+#, c-format
+msgid "%s (%d-%d, default %d): "
+msgstr ""
+
+#: fdisk/fdisk.c:878
+#, c-format
+msgid "Using default value %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:882
+msgid "Value out of range.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:889
+#, fuzzy
+msgid "Partition number"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/fdisk.c:897
+#, c-format
+msgid "Warning: partition %d has empty type\n"
+msgstr ""
+
+#: fdisk/fdisk.c:904
+#, fuzzy
+msgid "cylinder"
+msgstr "Cilindri"
+
+#: fdisk/fdisk.c:904
+#, fuzzy
+msgid "sector"
+msgstr "Settori"
+
+#: fdisk/fdisk.c:913
+#, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:923
+#, c-format
+msgid "WARNING: Partition %d is an extended partition\n"
+msgstr ""
+
+#: fdisk/fdisk.c:936
+msgid "DOS Compatibility flag is set\n"
+msgstr ""
+
+#: fdisk/fdisk.c:940
+msgid "DOS Compatibility flag is not set\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1026
+#, c-format
+msgid "Partition %d does not exist yet!\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1031
+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 ""
+
+#: fdisk/fdisk.c:1040
+msgid ""
+"You cannot change a partition into an extended one or vice versa\n"
+"Delete it first.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1049
+msgid ""
+"Consider leaving partition 3 as Whole disk (5),\n"
+"as SunOS/Solaris expects it and even Linux likes it.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1055
+msgid ""
+"Consider leaving partition 9 as volume header (0),\n"
+"and partition 11 as entire volume (6)as IRIX expects it.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1069
+#, c-format
+msgid "Changed system type of partition %d to %x (%s)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1122
+#, c-format
+msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
+#, c-format
+msgid " phys=(%d, %d, %d) "
+msgstr ""
+
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
+#, c-format
+msgid "logical=(%d, %d, %d)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1130
+#, c-format
+msgid "Partition %d has different physical/logical endings:\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1139
+#, c-format
+msgid "Partition %i does not start on cylinder boundary:\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1142
+#, c-format
+msgid "should be (%d, %d, 1)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1148
+#, c-format
+msgid "Partition %i does not end on cylinder boundary:\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1151
+#, c-format
+msgid "should be (%d, %d, %d)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1158
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+
+#. FIXME! let's see how this shows up with other languagues
+#. acme@conectiva.com.br
+#: fdisk/fdisk.c:1195
+#, c-format
+msgid "%*s Boot Start End Blocks Id System\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+msgid "Device"
+msgstr ""
+
+#: fdisk/fdisk.c:1236
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1238
+#, fuzzy
+msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
+msgstr " # Flag Head Sect Cyl ID Head Sect Cyl Iniziale Settori\n"
+
+#: fdisk/fdisk.c:1277
+#, c-format
+msgid "Warning: partition %d contains sector 0\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1280
+#, c-format
+msgid "Partition %d: head %d greater than maximum %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1283
+#, c-format
+msgid "Partition %d: sector %d greater than maximum %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1286
+#, c-format
+msgid "Partitions %d: cylinder %d greater than maximum %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1290
+#, c-format
+msgid "Partition %d: previous sectors %d disagrees with total %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1320
+#, c-format
+msgid "Warning: bad start-of-data in partition %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1328
+#, c-format
+msgid "Warning: partition %d overlaps partition %d.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1346
+#, c-format
+msgid "Warning: partition %d is empty\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1351
+#, c-format
+msgid "Logical partition %d not entirely in partition %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1357
+#, c-format
+msgid "Total allocated sectors %d greater than the maximum %d\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1360
+#, c-format
+msgid "%d unallocated sectors\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#, c-format
+msgid "Partition %d is already defined. Delete it before re-adding it.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisksunlabel.c:494
+#, c-format
+msgid "First %s"
+msgstr ""
+
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
+#, c-format
+msgid "Sector %d is already allocated\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1440
+msgid "No free sectors available\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr ""
+
+#: fdisk/fdisk.c:1480
+#, c-format
+msgid "Warning: partition %d has an odd number of sectors.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:590
+msgid "The maximum number of partitions has been created\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1527
+msgid "You must delete some partition and add an extended partition first\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1531
+#, c-format
+msgid ""
+"Command action\n"
+" %s\n"
+" p primary partition (1-4)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1533
+msgid "l logical (5 or over)"
+msgstr ""
+
+#: fdisk/fdisk.c:1533
+#, fuzzy
+msgid "e extended"
+msgstr "Estesa"
+
+#: fdisk/fdisk.c:1550
+#, c-format
+msgid "Invalid partition number for type `%c'\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1582
+msgid ""
+"The partition table has been altered!\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1584
+msgid "Calling ioctl() to re-read partition table.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1601
+msgid "Syncing disks.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1606
+#, fuzzy, c-format
+msgid ""
+"Re-read table failed with error %d: %s.\n"
+"Reboot your system to ensure the partition table is updated.\n"
+msgstr ""
+"Riavviare il sistema per essere sicuri che la tabella delle partizioni sia\n"
+"stata aggiornata correttamente.\n"
+
+#: fdisk/fdisk.c:1612
+#, fuzzy
+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"
+"ATTENZIONE: Se sono state create o modificate\n"
+"partizioni del DOS 6.x consultare il manuale di\n"
+"cfdisk per ulteriori informazioni.\n"
+
+#: fdisk/fdisk.c:1643
+#, fuzzy, c-format
+msgid "Device: %s\n"
+msgstr "Disk Drive: %s\n"
+
+#: fdisk/fdisk.c:1658
+#, c-format
+msgid "Partition %d has no data area\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1664
+msgid "New beginning of data"
+msgstr ""
+
+#: fdisk/fdisk.c:1678
+msgid "Expert command (m for help): "
+msgstr ""
+
+#: fdisk/fdisk.c:1689
+#, fuzzy
+msgid "Number of cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/fdisk.c:1710
+#, fuzzy
+msgid "Number of heads"
+msgstr "Inserire il numero di testine: "
+
+#: fdisk/fdisk.c:1735
+#, fuzzy
+msgid "Number of sectors"
+msgstr "Settori"
+
+#: fdisk/fdisk.c:1738
+msgid "Warning: setting sector offset for DOS compatiblity\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1800
+#, c-format
+msgid "Disk %s doesn't contain a valid partition table\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1814
+#, c-format
+msgid "Cannot open %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1879
+msgid "This kernel finds the sector size itself - -b option ignored\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1882
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1940
+msgid "Command (m for help): "
+msgstr ""
+
+#: fdisk/fdisk.c:1954
+#, c-format
+msgid ""
+"\n"
+"The current boot file is: %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1956
+msgid "Please enter the name of the new boot file: "
+msgstr ""
+
+#: fdisk/fdisk.c:1958
+msgid "Boot file unchanged\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2018
+msgid ""
+"\n"
+"\tSorry, no experts menu for SGI partition tables available.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdiskaixlabel.c:29
+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 ""
+
+#: fdisk/fdiskbsdlabel.c:97
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:106
+#, fuzzy
+msgid " d delete a BSD partition"
+msgstr " d Cancella la partizione corrente"
+
+#: fdisk/fdiskbsdlabel.c:107
+msgid " e edit drive data"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:108
+msgid " i install bootstrap"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:109
+#, fuzzy
+msgid " l list known filesystem types"
+msgstr " t Cambia il tipo di filesystem"
+
+#: fdisk/fdiskbsdlabel.c:111
+#, fuzzy
+msgid " n add a new BSD partition"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/fdiskbsdlabel.c:112
+#, fuzzy
+msgid " p print BSD partition table"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/fdiskbsdlabel.c:117
+msgid " s show complete disklabel"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:118
+#, fuzzy
+msgid " t change a partition's filesystem id"
+msgstr " t Cambia il tipo di filesystem"
+
+#: fdisk/fdiskbsdlabel.c:119
+msgid " w write disklabel to disk"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:121
+msgid " x link BSD partition to non-BSD partition"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:146
+#, c-format
+msgid "Partition %s%d has invalid starting sector 0.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:150
+#, c-format
+msgid "Reading disklabel of %s%d at sector %d.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:159
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:174
+msgid "BSD disklabel command (m for help): "
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:286
+#, c-format
+msgid "type: %s\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:288
+#, c-format
+msgid "type: %d\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:289
+#, fuzzy, c-format
+msgid "disk: %.*s\n"
+msgstr "cfdisk %s"
+
+#: fdisk/fdiskbsdlabel.c:290
+#, c-format
+msgid "label: %.*s\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:291
+#, fuzzy
+msgid "flags:"
+msgstr "Flag"
+
+#: fdisk/fdiskbsdlabel.c:293
+msgid " removable"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:295
+msgid " ecc"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:297
+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:301
+#, fuzzy, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "Settore %d:\n"
+
+#: fdisk/fdiskbsdlabel.c:302
+#, fuzzy, c-format
+msgid "sectors/track: %ld\n"
+msgstr "Settore %d:\n"
+
+#: fdisk/fdiskbsdlabel.c:303
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:304
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:305
+#, fuzzy, c-format
+msgid "cylinders: %ld\n"
+msgstr "Cilindri"
+
+#: fdisk/fdiskbsdlabel.c:306
+#, c-format
+msgid "rpm: %d\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:307
+#, c-format
+msgid "interleave: %d\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:308
+#, c-format
+msgid "trackskew: %d\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:309
+#, fuzzy, c-format
+msgid "cylinderskew: %d\n"
+msgstr "Cilindri"
+
+#: fdisk/fdiskbsdlabel.c:310
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:311
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:312
+msgid "drivedata: "
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:321
+#, fuzzy, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
msgstr "Stampa la tabella delle partizioni:\n"
-#: fdisk/cfdisk.c:2551
+#: fdisk/fdiskbsdlabel.c:322
+msgid "# size offset fstype [fsize bsize cpg]\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:378
+#, fuzzy, c-format
+msgid "Writing disklabel to %s%d.\n"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/fdiskbsdlabel.c:381
+#, fuzzy, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/fdiskbsdlabel.c:392
#, c-format
-msgid "\t%s -P {r|s|t} [options] device\n"
-msgstr "\t%s -P {r|s|t} [opzioni] dispositivo\n"
+msgid "%s%d contains no disklabel.\n"
+msgstr ""
-#: fdisk/cfdisk.c:2552
-msgid "Interactive use:\n"
-msgstr "Uso interattivo:\n"
+#: fdisk/fdiskbsdlabel.c:395
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr ""
-#: fdisk/cfdisk.c:2553
+#: fdisk/fdiskbsdlabel.c:399
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:438
+msgid "bytes/sector"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:439
+#, fuzzy
+msgid "sectors/track"
+msgstr "Settori"
+
+#: fdisk/fdiskbsdlabel.c:440
+msgid "tracks/cylinder"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:448
+msgid "sectors/cylinder"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:452
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:454
+msgid "rpm"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:455
+msgid "interleave"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:456
+msgid "trackskew"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:457
+#, fuzzy
+msgid "cylinderskew"
+msgstr "Cilindri"
+
+#: fdisk/fdiskbsdlabel.c:458
+msgid "headswitch"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:459
+msgid "track-to-track seek"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:500
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:526
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:547
+#, c-format
+msgid "Bootstrap installed on %s%d.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:549
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:570
+#, c-format
+msgid "Partition (a-%c): "
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:601
+msgid "This partition already exists.\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:723
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:769
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:56
+msgid "SGI volhdr"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:57
+msgid "SGI trkrepl"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:58
+msgid "SGI secrepl"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:59
+msgid "SGI raw"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:60
+msgid "SGI bsd"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:61
+msgid "SGI sysv"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:62
+msgid "SGI volume"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:63
+#, fuzzy
+msgid "SGI efs"
+msgstr "BSDI fs"
+
+#: fdisk/fdisksgilabel.c:64
+msgid "SGI lvol"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:65
+msgid "SGI rlvol"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:66
+#, fuzzy
+msgid "SGI xfs"
+msgstr "BSDI fs"
+
+#: fdisk/fdisksgilabel.c:67
+msgid "SGI xlvol"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:68
+msgid "SGI rxlvol"
+msgstr ""
+
+#. Minix 1.4b and later
+#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#, fuzzy
+msgid "Linux swap"
+msgstr "Linux Swap"
+
+#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#, fuzzy
+msgid "Linux native"
+msgstr "Linux Swap"
+
+#: fdisk/fdisksgilabel.c:143
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:162
+msgid "Detected sgi disklabel with wrong checksum.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:186
+#, 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 * 512 bytes\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:199
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:205
+#, c-format
+msgid ""
+"----- partitions -----\n"
+"%*s Info Start End Sectors Id System\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:227
+#, c-format
+msgid ""
+"----- bootinfo -----\n"
+"Bootfile: %s\n"
+"----- directory entries -----\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:237
#, c-format
-msgid "\t%s [options] device\n"
+msgid "%2d: %-10s sector%5u size%8u\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:298
+msgid ""
+"\n"
+"Invalid Bootfile!\n"
+"\tThe bootfile must be an absolute non-zero pathname,\n"
+"\te.g. \"/unix\" or \"/unix.save\".\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:305
+msgid ""
+"\n"
+"\tName of Bootfile too long: 16 bytes maximum.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:310
+msgid ""
+"\n"
+"\tBootfile must have a fully qualified pathname.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:315
+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 ""
+
+#: fdisk/fdisksgilabel.c:343
+#, c-format
+msgid ""
+"\n"
+"\tBootfile is changed to \"%s\".\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:448
+msgid "More than one entire disk entry present.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#, fuzzy
+msgid "No partitions defined\n"
msgstr "\t%s [opzioni] dispositivo\n"
+
+#: fdisk/fdisksgilabel.c:463
+msgid "IRIX likes when Partition 11 covers the entire disk.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:465
+#, c-format
+msgid ""
+"The entire disk partition should start at block 0,\n"
+"not at diskblock %d.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:469
+#, c-format
+msgid ""
+"The entire disk partition is only %d diskblock large,\n"
+"but the disk is %d diskblocks long.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:476
+msgid "One Partition (#11) should cover the entire disk.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:488
+#, c-format
+msgid "Partition %d does not start on cylinder boundary.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:495
+#, c-format
+msgid "Partition %d does not end on cylinder boundary.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:503
+#, c-format
+msgid "The Partition %d and %d overlap by %d sectors.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#, c-format
+msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:545
+msgid ""
+"\n"
+"The boot partition does not exist.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:549
+msgid ""
+"\n"
+"The swap partition does not exist.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:554
+msgid ""
+"\n"
+"The swap partition has no swap type.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:558
+msgid "\tYou have chosen an unusual boot file name.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:569
+msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:576
+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 ""
+
+#. rebuild freelist
+#: fdisk/fdisksgilabel.c:621
+msgid "Do You know, You got a partition overlap on the disk?\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:691
+msgid "Attempting to generate entire disk entry automatically.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:698
+msgid "The entire disk is already covered with partitions.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:703
+msgid "You got a partition overlap on the disk. Fix it first!\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+msgid ""
+"It is highly recommended that eleventh partition\n"
+"covers the entire disk and is of type `SGI volume'\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:728
+msgid "You will get a partition overlap on the disk. Fix it first!\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:733
+#, c-format
+msgid " Last %s"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:756
+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 unrecoverable lost.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:784
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr ""
+
+#: fdisk/fdisksgilabel.c:786
+#, c-format
+msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
+msgid "Empty"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:45
+msgid "SunOS root"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:46
+#, fuzzy
+msgid "SunOS swap"
+msgstr "BSDI swap"
+
+#: fdisk/fdisksunlabel.c:47
+msgid "SunOS usr"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:48
+msgid "Whole disk"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:49
+msgid "SunOS stand"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:50
+msgid "SunOS var"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:51
+msgid "SunOS home"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:122
+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 ""
+
+#: fdisk/fdisksunlabel.c:215
+#, c-format
+msgid "Autoconfigure found a %s%s%s\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:242
+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 ""
+
+#: fdisk/fdisksunlabel.c:253
+msgid ""
+"Drive type\n"
+" ? auto configure\n"
+" 0 custom (with hardware detected defaults)"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:263
+msgid "Select type (? for auto, 0 for custom): "
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:275
+msgid "Autoconfigure failed.\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:303
+#, fuzzy
+msgid "Sectors/track"
+msgstr "Settori"
+
+#: fdisk/fdisksunlabel.c:310
+#, fuzzy
+msgid "Alternate cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/fdisksunlabel.c:313
+msgid "Physical cylinders"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+msgid "Rotation speed (rpm)"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+msgid "Interleave factor"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+msgid "Extra sectors per cylinder"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:334
+msgid "You may change all the disk params from the x menu"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:337
+msgid "3,5\" floppy"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:337
+#, fuzzy
+msgid "Linux custom"
+msgstr "Linux ext2"
+
+#: fdisk/fdisksunlabel.c:418
+#, c-format
+msgid "Partition %d doesn't end on cylinder boundary\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:438
+#, c-format
+msgid "Partition %d overlaps with others in sectors %d-%d\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:460
+#, c-format
+msgid "Unused gap - sectors 0-%d\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#, c-format
+msgid "Unused gap - sectors %d-%d\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:489
+msgid ""
+"Other partitions already cover the whole disk.\n"
+"Delete some/shrink them before retry.\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:547
+#, 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 ""
+
+#: fdisk/fdisksunlabel.c:567
+#, 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:580
+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 ""
+
+#: fdisk/fdisksunlabel.c:611
+#, 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 ""
+
+#: fdisk/fdisksunlabel.c:625
+#, 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 ""
+
+#: fdisk/fdisksunlabel.c:630
+#, c-format
+msgid "%*s Flag Start End Blocks Id System\n"
+msgstr ""
+
+#: fdisk/fdisksunlabel.c:655
+#, fuzzy
+msgid "Number of alternate cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/fdisksunlabel.c:688
+#, fuzzy
+msgid "Number of physical cylinders"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/i386_sys_types.c:7
+#, fuzzy
+msgid "FAT12"
+msgstr "DOS 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 ""
+
+#: fdisk/i386_sys_types.c:11
+msgid "Extended"
+msgstr "Estesa"
+
+#. DOS 3.3+ extended partition
+#: fdisk/i386_sys_types.c:12
+#, fuzzy
+msgid "FAT16"
+msgstr "DOS FAT16"
+
+#. DOS 16-bit >=32M
+#: fdisk/i386_sys_types.c:13
+#, fuzzy
+msgid "HPFS/NTFS"
+msgstr "OS/2 HPFS o 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 bootabile"
+
+#. 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 "Win95 FAT32"
+msgstr "Win95 FAT32"
+
+#: fdisk/i386_sys_types.c:18
+msgid "Win95 FAT32 (LBA)"
+msgstr "Win95 FAT32 (LBA)"
+
+#. LBA really is `Extended Int 13h'
+#: fdisk/i386_sys_types.c:19
+msgid "Win95 FAT16 (LBA)"
+msgstr "Win95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:20
+#, fuzzy
+msgid "Win95 Ext'd (LBA)"
+msgstr "Win95 Estesa (LBA)"
+
+#: fdisk/i386_sys_types.c:21
+msgid "OPUS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:22
+#, fuzzy
+msgid "Hidden FAT12"
+msgstr "DOS FAT12 nascosta"
+
+#: fdisk/i386_sys_types.c:23
+msgid "Compaq diagnostics"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:24
+#, fuzzy
+msgid "Hidden FAT16 <32M"
+msgstr "DOS FAT12 nascosta"
+
+#: fdisk/i386_sys_types.c:25
+#, fuzzy
+msgid "Hidden FAT16"
+msgstr "DOS FAT16 nascosta"
+
+#: fdisk/i386_sys_types.c:26
+#, fuzzy
+msgid "Hidden HPFS/NTFS"
+msgstr "OS/2 HPFS o NTFS nascosta"
+
+#: fdisk/i386_sys_types.c:27
+msgid "AST Windows swapfile"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:28
+#, fuzzy
+msgid "Hidden Win95 FAT32"
+msgstr "Win95 FAT32"
+
+#: fdisk/i386_sys_types.c:29
+#, fuzzy
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr "Win95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+#, fuzzy
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr "Win95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:32
+msgid "PartitionMagic recovery"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
+msgid "Venix 80286"
+msgstr "Venix 80286"
+
+#: fdisk/i386_sys_types.c:34
+#, fuzzy
+msgid "PPC PReP Boot"
+msgstr "PPC PReP boot"
+
+#: fdisk/i386_sys_types.c:35
+msgid "SFS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:36
+msgid "QNX4.x"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:37
+msgid "QNX4.x 2nd part"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:38
+msgid "QNX4.x 3rd part"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:39
+msgid "OnTrack DM"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:40
+msgid "OnTrack DM6 Aux1"
+msgstr ""
+
+#. (or Novell)
+#: fdisk/i386_sys_types.c:41
+msgid "CP/M"
+msgstr "CP/M"
+
+#. CP/M or Microport SysV/AT
+#: fdisk/i386_sys_types.c:42
+msgid "OnTrack DM6 Aux3"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:43
+msgid "OnTrackDM6"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:44
+msgid "EZ-Drive"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:45
+msgid "Golden Bow"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:46
+msgid "Priam Edisk"
+msgstr ""
+
+#. DOS R/O or SpeedStor
+#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#, fuzzy
+msgid "SpeedStor"
+msgstr "Settori"
+
+#: fdisk/i386_sys_types.c:48
+#, fuzzy
+msgid "GNU HURD or SysV"
+msgstr "GNU HURD"
+
+#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
+#: fdisk/i386_sys_types.c:49
+msgid "Novell Netware 286"
+msgstr "Novell Netware 286"
+
+#: fdisk/i386_sys_types.c:50
+msgid "Novell Netware 386"
+msgstr "Novell Netware 386"
+
+#: fdisk/i386_sys_types.c:51
+msgid "DiskSecure Multi-Boot"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:52
+msgid "PC/IX"
+msgstr "PC/IX"
+
+#: fdisk/i386_sys_types.c:53
+msgid "Old Minix"
+msgstr ""
+
+#. Minix 1.4a and earlier
+#: fdisk/i386_sys_types.c:54
+msgid "Minix / old Linux"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:57
+msgid "OS/2 hidden C: drive"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:58
+msgid "Linux extended"
+msgstr "Estesa linux"
+
+#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+msgid "NTFS volume set"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:61
+msgid "Amoeba"
+msgstr "Amoeba"
+
+#: fdisk/i386_sys_types.c:62
+msgid "Amoeba BBT"
+msgstr "Amoeba BBT"
+
+#. (bad block table)
+#: fdisk/i386_sys_types.c:63
+msgid "IBM Thinkpad hibernation"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:64
+msgid "BSD/386"
+msgstr "BSD/386"
+
+#: fdisk/i386_sys_types.c:65
+msgid "OpenBSD"
+msgstr "OpenBSD"
+
+#: fdisk/i386_sys_types.c:66
+#, fuzzy
+msgid "NeXTSTEP"
+msgstr "NEXTSTEP"
+
+#: fdisk/i386_sys_types.c:67
+msgid "BSDI fs"
+msgstr "BSDI fs"
+
+#: fdisk/i386_sys_types.c:68
+msgid "BSDI swap"
+msgstr "BSDI swap"
+
+#: fdisk/i386_sys_types.c:69
+#, fuzzy
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DOS FAT12"
+
+#: fdisk/i386_sys_types.c:70
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:71
+#, fuzzy
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DOS FAT16"
+
+#: fdisk/i386_sys_types.c:72
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:73
+msgid "CP/M / CTOS / ..."
+msgstr ""
+
+#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:74
+msgid "DOS access"
+msgstr "DOS access"
+
+#. DOS access or SpeedStor 12-bit FAT extended partition
+#: fdisk/i386_sys_types.c:75
+msgid "DOS R/O"
+msgstr "DOS R/O"
+
+#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:77
+msgid "BeOS fs"
+msgstr "BeOS fs"
+
+#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:80
+msgid "DOS secondary"
+msgstr "DOS secondary"
+
+#. DOS 3.3+ secondary
+#: fdisk/i386_sys_types.c:81
+msgid "Linux raid autodetect"
+msgstr ""
+
+#. New (2.2.x) raid partition with autodetect
+#. using persistent superblock
+#: fdisk/i386_sys_types.c:83
+msgid "LANstep"
+msgstr ""
+
+#. SpeedStor >1024 cyl. or LANstep
+#: fdisk/i386_sys_types.c:84
+msgid "BBT"
+msgstr "BBT"
+
+#: fdisk/sfdisk.c:147
+#, c-format
+msgid "seek error on %s - cannot seek to %lu\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:152
+#, c-format
+msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:198
+msgid "out of memory - giving up\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#, c-format
+msgid "read error on %s - cannot read sector %lu\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:218
+#, c-format
+msgid "ERROR: sector %lu does not have an msdos signature\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:235
+#, c-format
+msgid "write error on %s - cannot write sector %lu\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:273
+#, c-format
+msgid "cannot open partition sector save file (%s)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:291
+#, c-format
+msgid "write error on %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:309
+#, c-format
+msgid "cannot stat partition restore file (%s)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:314
+msgid "partition restore file has wrong size - not restoring\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:318
+msgid "out of memory?\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:324
+#, c-format
+msgid "cannot open partition restore file (%s)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:330
+#, c-format
+msgid "error reading %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:337
+#, c-format
+msgid "cannot open device %s for writing\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:349
+#, c-format
+msgid "error writing sector %lu on %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:415
+#, c-format
+msgid ""
+"Warning: start=%d - 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 ""
+
+#: fdisk/sfdisk.c:421
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:424
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:427
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:431
+#, fuzzy, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Basta cambiamenti di geometria"
+
+#: fdisk/sfdisk.c:433
+#, c-format
+msgid ""
+"Warning: unlikely number of sectors (%d) - usually at most 63\n"
+"This will give problems with all software that uses C/H/S addressing.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:437
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:517
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:522
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:527
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for cylinders: %d (should be in "
+"0-%d)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:566
+msgid ""
+"Id Name\n"
+"\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:719
+#, fuzzy
+msgid "Re-reading the partition table ...\n"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/sfdisk.c:725
+msgid ""
+"The command to re-read the partition table failed\n"
+"Reboot your system now, before using mkfs\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:730
+#, c-format
+msgid "Error closing %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:768
+#, c-format
+msgid "%s: no such partition\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:791
+msgid "unrecognized format - using sectors\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:830
+#, fuzzy, c-format
+msgid "# partition table of %s\n"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/sfdisk.c:841
+#, c-format
+msgid "unimplemented format - using %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:845
+#, c-format
+msgid ""
+"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:848
+msgid " Device Boot Start End #cyls #blocks Id System\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:853
+#, c-format
+msgid ""
+"Units = sectors of 512 bytes, counting from %d\n"
+"\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:855
+msgid " Device Boot Start End #sectors Id System\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:858
+#, c-format
+msgid ""
+"Units = blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:860
+msgid " Device Boot Start End #blocks Id System\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:863
+#, c-format
+msgid ""
+"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:865
+msgid " Device Boot Start End MB #blocks Id System\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:997
+#, c-format
+msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1004
+#, c-format
+msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1007
+#, c-format
+msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1018
+msgid "No partitions found\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1025
+#, c-format
+msgid ""
+"Warning: The first partition 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 ""
+
+#: fdisk/sfdisk.c:1075
+#, fuzzy
+msgid "no partition table present.\n"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/sfdisk.c:1077
+#, c-format
+msgid "strange, only %d partitions defined.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1086
+#, c-format
+msgid "Warning: partition %s has size 0 but is not marked Empty\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1089
+#, c-format
+msgid "Warning: partition %s has size 0 and is bootable\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1092
+#, c-format
+msgid "Warning: partition %s has size 0 and nonzero start\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1103
+#, fuzzy, c-format
+msgid "Warning: partition %s "
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/sfdisk.c:1104
+#, c-format
+msgid "is not contained in partition %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1115
+#, fuzzy, c-format
+msgid "Warning: partitions %s "
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/sfdisk.c:1116
+#, c-format
+msgid "and %s overlap\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1127
+#, c-format
+msgid "Warning: partition %s contains part of "
+msgstr ""
+
+#: fdisk/sfdisk.c:1128
+#, fuzzy, c-format
+msgid "the partition table (sector %lu),\n"
+msgstr "Tabella delle partizioni per %s\n"
+
+#: fdisk/sfdisk.c:1129
+msgid "and will destroy it when filled\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1138
+#, c-format
+msgid "Warning: partition %s starts at sector 0\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1142
+#, c-format
+msgid "Warning: partition %s extends past end of disk\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1156
+msgid "Among the primary partitions, at most one can be extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1157
+msgid " (although this is not a problem under Linux)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1174
+#, c-format
+msgid "Warning: partition %s does not start at a cylinder boundary\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1180
+#, c-format
+msgid "Warning: partition %s does not end at a cylinder boundary\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1198
+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:1205
+msgid ""
+"Warning: usually one can boot from primary partitions only\n"
+"LILO disregards the `bootable' flag.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1211
+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:1228
+#, c-format
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1237
+#, c-format
+msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1240
+#, c-format
+msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#, c-format
+msgid "too many partitions - ignoring those past nr (%d)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1288
+#, fuzzy
+msgid "tree of partitions?\n"
+msgstr "Non crea partizioni"
+
+#: fdisk/sfdisk.c:1392
+msgid "detected Disk Manager - unable to handle that\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1399
+msgid "DM6 signature found - giving up\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1419
+msgid "strange..., an extended partition of size 0?\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1426
+msgid "strange..., a BSD partition of size 0?\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1458
+#, c-format
+msgid " %s: unrecognized partition\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1470
+msgid "-n flag was given: Nothing changed\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1483
+msgid "Failed saving the old sectors - aborting\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1488
+#, c-format
+msgid "Failed writing the partition on %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1565
+msgid "long or incomplete input line - quitting\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1601
+#, c-format
+msgid "input error: `=' expected after %s field\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1608
+#, c-format
+msgid "input error: unexpected character %c after %s field\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1614
+#, c-format
+msgid "unrecognized input: %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1646
+msgid "number too big\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1650
+msgid "trailing junk after number\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1766
+msgid "no room for partition descriptor\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1799
+msgid "cannot build surrounding extended partition\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1850
+msgid "too many input fields\n"
+msgstr ""
+
+#. no free blocks left - don't read any further
+#: fdisk/sfdisk.c:1884
+msgid "No room for more\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1903
+#, fuzzy
+msgid "Illegal type\n"
+msgstr "Tasto non valido"
+
+#: fdisk/sfdisk.c:1935
+#, c-format
+msgid "Warning: exceeds max allowable size (%lu)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1940
+#, fuzzy
+msgid "Warning: empty partition\n"
+msgstr "Stampa la tabella delle partizioni:\n"
+
+#: fdisk/sfdisk.c:1954
+#, c-format
+msgid "Warning: bad partition start (earliest %lu)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1967
+msgid "unrecognized bootable flag - choose - or *\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+msgid "partial c,h,s specification?\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2008
+#, fuzzy
+msgid "Extended partition not where expected\n"
+msgstr "Crea una nuova partizione dallo spazio libero"
+
+#: fdisk/sfdisk.c:2040
+msgid "bad input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2062
+#, fuzzy
+msgid "too many partitions\n"
+msgstr "Crea una nuova partizione primaria"
+
+#: fdisk/sfdisk.c:2095
+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:2115
+#, fuzzy
+msgid "version"
+msgstr "Stampa la versione:\n"
+
+#: fdisk/sfdisk.c:2121
+#, fuzzy, c-format
+msgid "Usage: %s [options] device ...\n"
+msgstr "\t%s [opzioni] dispositivo\n"
+
+#: fdisk/sfdisk.c:2122
+msgid "device: something like /dev/hda or /dev/sda"
+msgstr ""
+
+#: fdisk/sfdisk.c:2123
+msgid "useful options:"
+msgstr ""
+
+#: fdisk/sfdisk.c:2124
+msgid " -s [or --show-size]: list size of a partition"
+msgstr ""
+
+#: fdisk/sfdisk.c:2125
+msgid " -c [or --id]: print or change partition Id"
+msgstr ""
+
+#: fdisk/sfdisk.c:2126
+msgid " -l [or --list]: list partitions of each device"
+msgstr ""
+
+#: fdisk/sfdisk.c:2127
+msgid " -d [or --dump]: idem, but in a format suitable for later input"
+msgstr ""
+
+#: fdisk/sfdisk.c:2128
+msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
+msgstr ""
+
+#: fdisk/sfdisk.c:2129
+msgid ""
+" -uS, -uB, -uC, -uM: accept/report in units of "
+"sectors/blocks/cylinders/MB"
+msgstr ""
+
+#: fdisk/sfdisk.c:2130
+msgid " -T [or --list-types]:list the known partition types"
+msgstr ""
+
+#: fdisk/sfdisk.c:2131
+msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
+msgstr ""
+
+#: fdisk/sfdisk.c:2132
+msgid " -R [or --re-read]: make kernel reread partition table"
+msgstr ""
+
+#: fdisk/sfdisk.c:2133
+#, fuzzy
+msgid " -N# : change only the partition with number #"
+msgstr " u Cambia l'unitŕ di dimensione usata"
+
+#: fdisk/sfdisk.c:2134
+#, fuzzy
+msgid " -n : do not actually write to disk"
+msgstr " r - Dati grezzi (quello che sarebbe scritto sul disco)"
+
+#: fdisk/sfdisk.c:2135
+#, fuzzy
+msgid ""
+" -O file : save the sectors that will be overwritten to file"
+msgstr " r - Dati grezzi (quello che sarebbe scritto sul disco)"
+
+#: fdisk/sfdisk.c:2136
+#, fuzzy
+msgid " -I file : restore these sectors again"
+msgstr " s - Tabella ordinata per settori"
+
+#: fdisk/sfdisk.c:2137
+msgid " -v [or --version]: print version"
+msgstr ""
+
+#: fdisk/sfdisk.c:2138
+#, fuzzy
+msgid " -? [or --help]: print this message"
+msgstr " h Stampa questa schermata"
+
+#: fdisk/sfdisk.c:2139
+msgid "dangerous options:"
+msgstr ""
+
+#: fdisk/sfdisk.c:2140
+msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
+msgstr ""
+
+#: fdisk/sfdisk.c:2141
+msgid ""
+" -x [or --show-extended]: also list extended partitions on output\n"
+" or expect descriptors for them on input"
+msgstr ""
+
+#: fdisk/sfdisk.c:2143
+msgid ""
+" -L [or --Linux]: do not complain about things irrelevant for Linux"
+msgstr ""
+
+#: fdisk/sfdisk.c:2144
+msgid " -q [or --quiet]: suppress warning messages"
+msgstr ""
+
+#: fdisk/sfdisk.c:2145
+msgid " You can override the detected geometry using:"
+msgstr ""
+
+#: fdisk/sfdisk.c:2146
+#, fuzzy
+msgid " -C# [or --cylinders #]:set the number of cylinders to use"
+msgstr "Inserire il numero di cilindri: "
+
+#: fdisk/sfdisk.c:2147
+msgid " -H# [or --heads #]: set the number of heads to use"
+msgstr ""
+
+#: fdisk/sfdisk.c:2148
+msgid " -S# [or --sectors #]: set the number of sectors to use"
+msgstr ""
+
+#: fdisk/sfdisk.c:2149
+msgid "You can disable all consistency checking with:"
+msgstr ""
+
+#: fdisk/sfdisk.c:2150
+msgid " -f [or --force]: do what I say, even if it is stupid"
+msgstr ""
+
+#: fdisk/sfdisk.c:2156
+#, fuzzy
+msgid "Usage:"
+msgstr ""
+"\n"
+"Uso:\n"
+
+#: fdisk/sfdisk.c:2157
+#, c-format
+msgid "%s device\t\t list active partitions on device\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2158
+#, c-format
+msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2159
+#, c-format
+msgid "%s -An device\t activate partition n, inactivate the other ones\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2278
+msgid "no command?\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2401
+#, c-format
+msgid "total: %d blocks\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2438
+msgid "usage: sfdisk --print-id device partition-number\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2440
+msgid "usage: sfdisk --change-id device partition-number Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2442
+msgid "usage: sfdisk --id device partition-number [Id]\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2449
+msgid "can specify only one device (except with -l or -s)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2474
+#, c-format
+msgid "cannot open %s %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2474
+msgid "read-write"
+msgstr ""
+
+#: fdisk/sfdisk.c:2474
+msgid "for reading"
+msgstr ""
+
+#: fdisk/sfdisk.c:2499
+#, c-format
+msgid "%s: OK\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2516
+#, c-format
+msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2519
+#, c-format
+msgid "%s: unknown geometry\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2535
+#, c-format
+msgid "BLKGETSIZE ioctl failed for %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2612
+#, c-format
+msgid "bad active byte: 0x%x instead of 0x80\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#, fuzzy
+msgid ""
+"Done\n"
+"\n"
+msgstr "Fatto"
+
+#: fdisk/sfdisk.c:2638
+#, 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:2652
+#, c-format
+msgid "partition %s has id %x and is not hidden\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2708
+#, c-format
+msgid "Bad Id %x\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2723
+msgid "This disk is currently in use.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2740
+#, c-format
+msgid "Fatal error: cannot find %s\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2743
+#, c-format
+msgid "Warning: %s is not a block device\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2749
+msgid "Checking that no-one is using this disk right now ...\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2751
+msgid ""
+"\n"
+"This disk is currently in use - repartitioning is probably a bad idea.Umount "
+"all file systems, and swapoff all swap partitions on this disk.Use the "
+"--no-reread flag to suppress this check.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2755
+msgid "Use the --force flag to overrule all checks.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2759
+msgid "OK"
+msgstr ""
+
+#: fdisk/sfdisk.c:2768
+msgid "Old situation:\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2772
+#, c-format
+msgid "Partition %d does not exist, cannot change it\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2780
+msgid "New situation:\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2785
+msgid ""
+"I don't like these partitions - nothing changed.\n"
+"(If you really want this, use the --force option.)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2788
+msgid "I don't like this - probably you should answer No\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2793
+msgid "Are you satisfied with this? [ynq] "
+msgstr ""
+
+#: fdisk/sfdisk.c:2795
+msgid "Do you want to write this to disk? [ynq] "
+msgstr ""
+
+#: fdisk/sfdisk.c:2800
+msgid ""
+"\n"
+"sfdisk: premature end of input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2802
+msgid "Quitting - nothing changed\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2808
+msgid "Please answer one of y,n,q\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2816
+#, fuzzy
+msgid ""
+"Successfully wrote the new partition table\n"
+"\n"
+msgstr "Stampa solo la tabella delle partizioni"
+
+#: fdisk/sfdisk.c:2822
+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 ""
+
+#: games/banner.c:1048
+msgid "usage: banner [-w width]\n"
+msgstr ""
+
+#: games/banner.c:1068
+msgid "Message: "
+msgstr ""
+
+#: games/banner.c:1102
+#, c-format
+msgid "The character '%c' is not in my character set"
+msgstr ""
+
+#: games/banner.c:1110
+#, c-format
+msgid "Message '%s' is OK\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:229
+msgid "Try `getopt --help' for more information.\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:295
+msgid "empty long option after -l or --long argument"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:315
+msgid "unknown shell after -s or --shell argument"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:320
+msgid "Usage: getopt optstring parameters\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:321
+msgid " getopt [options] [--] optstring parameters\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:322
+msgid " getopt [options] -o|--options optstring [options] [--]\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:323
+#, fuzzy
+msgid " parameters\n"
+msgstr " Primo Ultimo\n"
+
+#: getopt-1.0.3b/getopt.c:324
+msgid ""
+" -a, --alternative Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:325
+msgid " -h, --help This small usage guide\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:326
+msgid " -l, --longoptions=longopts Long options to be recognized\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:327
+msgid ""
+" -n, --name=progname The name under which errors are reported\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:328
+msgid " -o, --options=optstring Short options to be recognized\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:329
+#, fuzzy
+msgid " -q, --quiet Disable error reporting by getopt(3)\n"
+msgstr " s - Tabella ordinata per settori"
+
+#: getopt-1.0.3b/getopt.c:330
+msgid " -Q, --quiet-output No normal output\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:331
+msgid " -s, --shell=shell Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:332
+msgid " -T, --test Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:333
+msgid " -V, --version Output version information\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+msgid "missing optstring argument"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:433
+msgid "getopt (enhanced) 1.0.3\n"
+msgstr ""
+
+#: getopt-1.0.3b/getopt.c:439
+msgid "internal error, contact the author."
+msgstr ""
+
+#: login-utils/agetty.c:303
+msgid "calling open_tty\n"
+msgstr ""
+
+#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
+#: login-utils/agetty.c:316
+msgid "calling termio_init\n"
+msgstr ""
+
+#: login-utils/agetty.c:321
+msgid "writing init string\n"
+msgstr ""
+
+#. Optionally detect the baud rate from the modem status message.
+#: login-utils/agetty.c:331
+msgid "before autobaud\n"
+msgstr ""
+
+#: login-utils/agetty.c:343
+msgid "waiting for cr-lf\n"
+msgstr ""
+
+#: login-utils/agetty.c:347
+#, c-format
+msgid "read %c\n"
+msgstr ""
+
+#. Read the login name.
+#: login-utils/agetty.c:356
+msgid "reading login name\n"
+msgstr ""
+
+#: login-utils/agetty.c:377
+#, c-format
+msgid "%s: can't exec %s: %m"
+msgstr ""
+
+#: login-utils/agetty.c:397
+msgid "can't malloc initstring"
+msgstr ""
+
+#: login-utils/agetty.c:459
+#, c-format
+msgid "bad timeout value: %s"
+msgstr ""
+
+#: login-utils/agetty.c:468
+msgid "after getopt loop\n"
+msgstr ""
+
+#: login-utils/agetty.c:486
+msgid "exiting parseargs\n"
+msgstr ""
+
+#: login-utils/agetty.c:499
+msgid "entered parse_speeds\n"
+msgstr ""
+
+#: login-utils/agetty.c:502
+#, c-format
+msgid "bad speed: %s"
+msgstr ""
+
+#: login-utils/agetty.c:504
+msgid "too many alternate speeds"
+msgstr ""
+
+#: login-utils/agetty.c:506
+msgid "exiting parsespeeds\n"
+msgstr ""
+
+#: login-utils/agetty.c:579
+#, c-format
+msgid "%s: open for update: %m"
+msgstr ""
+
+#: login-utils/agetty.c:595
+#, c-format
+msgid "%s: no utmp entry"
+msgstr ""
+
+#: login-utils/agetty.c:624
+#, c-format
+msgid "/dev: chdir() failed: %m"
+msgstr ""
+
+#: login-utils/agetty.c:628
+#, c-format
+msgid "/dev/%s: not a character device"
+msgstr ""
+
+#. ignore close(2) errors
+#: login-utils/agetty.c:635
+msgid "open(2)\n"
+msgstr ""
+
+#: login-utils/agetty.c:637
+#, c-format
+msgid "/dev/%s: cannot open as standard input: %m"
+msgstr ""
+
+#: login-utils/agetty.c:647
+#, c-format
+msgid "%s: not open for read/write"
+msgstr ""
+
+#. Set up standard output and standard error file descriptors.
+#: login-utils/agetty.c:651
+msgid "duping\n"
+msgstr ""
+
+#. set up stdout and stderr
+#: login-utils/agetty.c:653
+#, c-format
+msgid "%s: dup problem: %m"
+msgstr ""
+
+#: login-utils/agetty.c:723
+msgid "term_io 2\n"
+msgstr ""
+
+#: login-utils/agetty.c:905
+msgid "user"
+msgstr ""
+
+#: login-utils/agetty.c:905
+msgid "users"
+msgstr ""
+
+#: login-utils/agetty.c:993
+#, c-format
+msgid "%s: read: %m"
+msgstr ""
+
+#: login-utils/agetty.c:1039
+#, c-format
+msgid "%s: input overrun"
+msgstr ""
+
+#: login-utils/agetty.c:1163
+#, c-format
+msgid ""
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
+"baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] line "
+"baud_rate,... [termtype]\n"
+msgstr ""
+
+#: login-utils/checktty.c:46
+#, c-format
+msgid "badlogin: %s\n"
+msgstr ""
+
+#: login-utils/checktty.c:52
+#, c-format
+msgid "sleepexit %d\n"
+msgstr ""
+
+#: login-utils/checktty.c:108 login-utils/checktty.c:130
+msgid "login: memory low, login may fail\n"
+msgstr ""
+
+#: login-utils/checktty.c:109
+msgid "can't malloc for ttyclass"
+msgstr ""
+
+#: login-utils/checktty.c:131
+msgid "can't malloc for grplist"
+msgstr ""
+
+#. there was a default rule, but user didn't match, reject!
+#: login-utils/checktty.c:431
+#, 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:442
+#, c-format
+msgid "Login on %s from %s denied.\n"
+msgstr ""
+
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
+#, c-format
+msgid "%s: you (user %d) don't exist.\n"
+msgstr ""
+
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
+#, c-format
+msgid "%s: user \"%s\" does not exist.\n"
+msgstr ""
+
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
+#, c-format
+msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr ""
+
+#: login-utils/chfn.c:159
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr ""
+
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chsh.c:165 login-utils/chsh.c:169
+msgid "Password error."
+msgstr ""
+
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:678
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
+#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
+msgid "Password: "
+msgstr ""
+
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
+msgid "Incorrect password."
+msgstr ""
+
+#: login-utils/chfn.c:203
+msgid "Finger information not changed.\n"
+msgstr ""
+
+#: login-utils/chfn.c:306
+#, c-format
+msgid "Usage: %s [ -f full-name ] [ -o office ] "
+msgstr ""
+
+#: login-utils/chfn.c:307
+msgid ""
+"[ -p office-phone ]\n"
+"\t[ -h home-phone ] "
+msgstr ""
+
+#: login-utils/chfn.c:308
+msgid "[ --help ] [ --version ]\n"
+msgstr ""
+
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
+msgid ""
+"\n"
+"Aborted.\n"
+msgstr ""
+
+#: login-utils/chfn.c:410
+msgid "field is too long.\n"
+msgstr ""
+
+#: login-utils/chfn.c:418
+#, c-format
+msgid "'%c' is not allowed.\n"
+msgstr ""
+
+#: login-utils/chfn.c:423
+msgid "Control characters are not allowed.\n"
+msgstr ""
+
+#: login-utils/chfn.c:488
+msgid "Finger information *NOT* changed. Try again later.\n"
+msgstr ""
+
+#: login-utils/chfn.c:491
+msgid "Finger information changed.\n"
+msgstr ""
+
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
+msgid "malloc failed"
+msgstr ""
+
+#: login-utils/chsh.c:141
+#, c-format
+msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:148
+#, c-format
+msgid "Changing shell for %s.\n"
+msgstr ""
+
+#: login-utils/chsh.c:189
+msgid "New shell"
+msgstr ""
+
+#: login-utils/chsh.c:196
+#, fuzzy
+msgid "Shell not changed.\n"
+msgstr "Il disco č stato modificato.\n"
+
+#: login-utils/chsh.c:203
+msgid "Shell *NOT* changed. Try again later.\n"
+msgstr ""
+
+#: login-utils/chsh.c:206
+#, fuzzy
+msgid "Shell changed.\n"
+msgstr "Il disco č stato modificato.\n"
+
+#: login-utils/chsh.c:274
+#, c-format
+msgid "Usage: %s [ -s shell ] "
+msgstr ""
+
+#: login-utils/chsh.c:275
+msgid "[ --list-shells ] [ --help ] [ --version ]\n"
+msgstr ""
+
+#: login-utils/chsh.c:276
+msgid " [ username ]\n"
+msgstr ""
+
+#: login-utils/chsh.c:320
+#, c-format
+msgid "%s: shell must be a full path name.\n"
+msgstr ""
+
+#: login-utils/chsh.c:324
+#, c-format
+msgid "%s: \"%s\" does not exist.\n"
+msgstr ""
+
+#: login-utils/chsh.c:328
+#, c-format
+msgid "%s: \"%s\" is not executable.\n"
+msgstr ""
+
+#: login-utils/chsh.c:335
+#, c-format
+msgid "%s: '%c' is not allowed.\n"
+msgstr ""
+
+#: login-utils/chsh.c:339
+#, c-format
+msgid "%s: Control characters are not allowed.\n"
+msgstr ""
+
+#: login-utils/chsh.c:346
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells\n"
+msgstr ""
+
+#: login-utils/chsh.c:348
+#, c-format
+msgid "%s: \"%s\" is not listed in /etc/shells.\n"
+msgstr ""
+
+#: login-utils/chsh.c:350
+#, c-format
+msgid "%s: use -l option to see list\n"
+msgstr ""
+
+#: login-utils/chsh.c:356
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
+msgstr ""
+
+#: login-utils/chsh.c:357
+#, c-format
+msgid "Use %s -l to see list.\n"
+msgstr ""
+
+#: login-utils/chsh.c:378
+msgid "No known shells.\n"
+msgstr ""
+
+#: login-utils/cryptocard.c:70
+msgid "couldn't open /dev/urandom"
+msgstr ""
+
+#: login-utils/cryptocard.c:75
+msgid "couldn't read random data from /dev/urandom"
+msgstr ""
+
+#: login-utils/cryptocard.c:98
+#, c-format
+msgid "can't open %s for reading"
+msgstr ""
+
+#: login-utils/cryptocard.c:102
+#, c-format
+msgid "can't stat(%s)"
+msgstr ""
+
+#: login-utils/cryptocard.c:108
+#, c-format
+msgid "%s doesn't have the correct filemodes"
+msgstr ""
+
+#: login-utils/cryptocard.c:113
+#, c-format
+msgid "can't read data from %s"
+msgstr ""
+
+#: login-utils/islocal.c:36
+#, c-format
+msgid "Can't read %s, exiting."
+msgstr ""
+
+#: login-utils/last.c:143
+msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
+msgstr ""
+
+#: login-utils/last.c:283
+msgid " still logged in"
+msgstr ""
+
+#: login-utils/last.c:305
+#, c-format
+msgid ""
+"\n"
+"wtmp begins %s"
+msgstr ""
+
+#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
+msgid "last: malloc failure.\n"
+msgstr ""
+
+#: login-utils/last.c:416
+msgid "last: gethostname"
+msgstr ""
+
+#: login-utils/last.c:469
+#, c-format
+msgid ""
+"\n"
+"interrupted %10.10s %5.5s \n"
+msgstr ""
+
+#: login-utils/login.c:377
+msgid "login: -h for super-user only.\n"
+msgstr ""
+
+#: login-utils/login.c:402
+msgid "usage: login [-fp] [username]\n"
+msgstr ""
+
+#: login-utils/login.c:504
+#, c-format
+msgid "login: PAM Failure, aborting: %s\n"
+msgstr ""
+
+#: login-utils/login.c:506
+#, c-format
+msgid "Couldn't initialize PAM: %s"
+msgstr ""
+
+#: login-utils/login.c:546
+#, c-format
+msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
+msgstr ""
+
+#: login-utils/login.c:548
+msgid ""
+"Login incorrect\n"
+"\n"
+msgstr ""
+
+#: login-utils/login.c:557
+#, c-format
+msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
+msgstr ""
+
+#: login-utils/login.c:561
+#, c-format
+msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
+msgstr ""
+
+#: login-utils/login.c:564
+msgid ""
+"\n"
+"Login incorrect\n"
+msgstr ""
+
+#: login-utils/login.c:613
+#, fuzzy
+msgid "Illegal username"
+msgstr "Tasto non valido"
+
+#: login-utils/login.c:656
+#, c-format
+msgid "%s login refused on this terminal.\n"
+msgstr ""
+
+#: login-utils/login.c:661
+#, c-format
+msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
+msgstr ""
+
+#: login-utils/login.c:665
+#, c-format
+msgid "LOGIN %s REFUSED ON TTY %s"
+msgstr ""
+
+#: login-utils/login.c:717
+msgid "Login incorrect\n"
+msgstr ""
+
+#: login-utils/login.c:739
+msgid ""
+"Too many users logged on already.\n"
+"Try again later.\n"
+msgstr ""
+
+#: login-utils/login.c:743
+msgid "You have too many processes running.\n"
+msgstr ""
+
+#: login-utils/login.c:789
+msgid "Warning: no Kerberos tickets issued\n"
+msgstr ""
+
+#: login-utils/login.c:801
+msgid "Sorry -- your password has expired.\n"
+msgstr ""
+
+#: login-utils/login.c:807
+#, c-format
+msgid "Warning: your password expires on %s %d, %d\n"
+msgstr ""
+
+#: login-utils/login.c:815
+msgid "Sorry -- your account has expired.\n"
+msgstr ""
+
+#: login-utils/login.c:821
+#, c-format
+msgid "Warning: your account expires on %s %d, %d\n"
+msgstr ""
+
+#: login-utils/login.c:1055
+#, c-format
+msgid "DIALUP AT %s BY %s"
+msgstr ""
+
+#: login-utils/login.c:1062
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr ""
+
+#: login-utils/login.c:1065
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr ""
+
+#: login-utils/login.c:1068
+#, c-format
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr ""
+
+#: login-utils/login.c:1071
+#, c-format
+msgid "LOGIN ON %s BY %s"
+msgstr ""
+
+#: login-utils/login.c:1083
+#, c-format
+msgid "You have %smail.\n"
+msgstr ""
+
+#: login-utils/login.c:1084
+msgid "new "
+msgstr ""
+
+#. error in fork()
+#: login-utils/login.c:1102
+#, c-format
+msgid "login: failure forking: %s"
+msgstr ""
+
+#: login-utils/login.c:1117
+msgid "setuid() failed"
+msgstr ""
+
+#: login-utils/login.c:1123
+#, c-format
+msgid "No directory %s!\n"
+msgstr ""
+
+#: login-utils/login.c:1127
+msgid "Logging in with home = \"/\".\n"
+msgstr ""
+
+#: login-utils/login.c:1135
+msgid "login: no memory for shell script.\n"
+msgstr ""
+
+#: login-utils/login.c:1163
+#, c-format
+msgid "login: couldn't exec shell script: %s.\n"
+msgstr ""
+
+#: login-utils/login.c:1166
+#, c-format
+msgid "login: no shell: %s.\n"
+msgstr ""
+
+#: login-utils/login.c:1182
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+
+#: login-utils/login.c:1193
+msgid "login name much too long.\n"
+msgstr ""
+
+#: login-utils/login.c:1194
+msgid "NAME too long"
+msgstr ""
+
+#: login-utils/login.c:1201
+msgid "login names may not start with '-'.\n"
+msgstr ""
+
+#: login-utils/login.c:1211
+msgid "too many bare linefeeds.\n"
+msgstr ""
+
+#: login-utils/login.c:1212
+msgid "EXCESSIVE linefeeds"
+msgstr ""
+
+#: login-utils/login.c:1223
+#, c-format
+msgid "Login timed out after %d seconds\n"
+msgstr ""
+
+#: login-utils/login.c:1323
+#, c-format
+msgid "Last login: %.*s "
+msgstr ""
+
+#: login-utils/login.c:1327
+#, c-format
+msgid "from %.*s\n"
+msgstr ""
+
+#: login-utils/login.c:1330
+#, c-format
+msgid "on %.*s\n"
+msgstr ""
+
+#: login-utils/login.c:1353
+#, c-format
+msgid "LOGIN FAILURE FROM %s, %s"
+msgstr ""
+
+#: login-utils/login.c:1356
+#, c-format
+msgid "LOGIN FAILURE ON %s, %s"
+msgstr ""
+
+#: login-utils/login.c:1360
+#, c-format
+msgid "%d LOGIN FAILURES FROM %s, %s"
+msgstr ""
+
+#: login-utils/login.c:1363
+#, c-format
+msgid "%d LOGIN FAILURES ON %s, %s"
+msgstr ""
+
+#: login-utils/mesg.c:89
+msgid "is y\n"
+msgstr ""
+
+#: login-utils/mesg.c:92
+msgid "is n\n"
+msgstr ""
+
+#: login-utils/mesg.c:112
+msgid "usage: mesg [y | n]\n"
+msgstr ""
+
+#: login-utils/newgrp.c:67
+msgid "newgrp: Who are you?"
+msgstr ""
+
+#: login-utils/newgrp.c:75 login-utils/newgrp.c:85
+msgid "newgrp: setgid"
+msgstr ""
+
+#: login-utils/newgrp.c:80
+msgid "newgrp: No such group."
+msgstr ""
+
+#: login-utils/newgrp.c:89
+msgid "newgrp: Permission denied"
+msgstr ""
+
+#: login-utils/newgrp.c:96
+msgid "newgrp: setuid"
+msgstr ""
+
+#: login-utils/newgrp.c:102
+#, fuzzy
+msgid "No shell"
+msgstr "Novell?"
+
+#: login-utils/passwd.c:163
+msgid "The password must have at least 6 characters, try again.\n"
+msgstr ""
+
+#: login-utils/passwd.c:176
+msgid "The password must contain characters out of two of the following\n"
+msgstr ""
+
+#: login-utils/passwd.c:177
+msgid "classes: upper and lower case letters, digits and non alphanumeric\n"
+msgstr ""
+
+#: login-utils/passwd.c:178
+msgid "characters. See passwd(1) for more information.\n"
+msgstr ""
+
+#: login-utils/passwd.c:183
+msgid "You cannot reuse the old password.\n"
+msgstr ""
+
+#: login-utils/passwd.c:188
+msgid "Please don't use something like your username as password!\n"
+msgstr ""
+
+#: login-utils/passwd.c:199 login-utils/passwd.c:206
+msgid "Please don't use something like your realname as password!\n"
+msgstr ""
+
+#: login-utils/passwd.c:223
+msgid "Usage: passwd [username [password]]\n"
+msgstr ""
+
+#: login-utils/passwd.c:224
+msgid "Only root may use the one and two argument forms.\n"
+msgstr ""
+
+#: login-utils/passwd.c:280
+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
+msgid "Only root can change the password for others.\n"
+msgstr ""
+
+#: login-utils/passwd.c:334
+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:384
+msgid "Re-type new password: "
+msgstr ""
+
+#: login-utils/passwd.c:387
+msgid "You misspelled it. Password not changed."
+msgstr ""
+
+#: login-utils/passwd.c:402
+#, c-format
+msgid "password changed, user %s"
+msgstr ""
+
+#: login-utils/passwd.c:405
+msgid "ROOT PASSWORD CHANGED"
+msgstr ""
+
+#: login-utils/passwd.c:407
+#, c-format
+msgid "password changed by root, user %s"
+msgstr ""
+
+#: login-utils/passwd.c:414
+msgid "calling setpwnam to set password.\n"
+msgstr ""
+
+#: login-utils/passwd.c:418
+msgid "Password *NOT* changed. Try again later.\n"
+msgstr ""
+
+#: login-utils/passwd.c:424
+msgid "Password changed.\n"
+msgstr ""
+
+#: login-utils/shutdown.c:85
+msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr ""
+
+#: login-utils/shutdown.c:103
+msgid "Shutdown process aborted"
+msgstr ""
+
+#: login-utils/shutdown.c:125
+#, c-format
+msgid "%s: Only root can shut a system down.\n"
+msgstr ""
+
+#: login-utils/shutdown.c:219
+msgid "That must be tomorrow, can't you wait till then?\n"
+msgstr ""
+
+#: login-utils/shutdown.c:271
+msgid "for maintenance; bounce, bounce"
+msgstr ""
+
+#: login-utils/shutdown.c:275
+#, c-format
+msgid "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr ""
+
+#: login-utils/shutdown.c:300
+msgid "The system is being shut down within 5 minutes"
+msgstr ""
+
+#: login-utils/shutdown.c:304
+msgid "Login is therefore prohibited."
+msgstr ""
+
+#: login-utils/shutdown.c:325
+#, c-format
+msgid "%s by %s: %s"
+msgstr ""
+
+#: login-utils/shutdown.c:326
+msgid "rebooted"
+msgstr ""
+
+#: login-utils/shutdown.c:326
+msgid "halted"
+msgstr ""
+
+#. RB_AUTOBOOT
+#: login-utils/shutdown.c:377
+msgid ""
+"\n"
+"Why am I still alive after reboot?"
+msgstr ""
+
+#: login-utils/shutdown.c:379
+msgid ""
+"\n"
+"Now you can turn off the power..."
+msgstr ""
+
+#: login-utils/shutdown.c:394
+msgid "Calling kernel power-off facility...\n"
+msgstr ""
+
+#: login-utils/shutdown.c:397
+#, c-format
+msgid "Error powering off\t%s\n"
+msgstr ""
+
+#: login-utils/shutdown.c:405
+#, c-format
+msgid "Executing the program \"%s\" ...\n"
+msgstr ""
+
+#: login-utils/shutdown.c:408
+#, c-format
+msgid "Error executing\t%s\n"
+msgstr ""
+
+#: login-utils/shutdown.c:431
+#, c-format
+msgid "URGENT: broadcast message from %s:"
+msgstr ""
+
+#: login-utils/shutdown.c:437
+msgid "System going down IMMEDIATELY!\n"
+msgstr ""
+
+#: login-utils/shutdown.c:440
+#, c-format
+msgid "System going down in %d hour%s %d minutes"
+msgstr ""
+
+#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+msgid "s"
+msgstr ""
+
+#: login-utils/shutdown.c:443
+#, c-format
+msgid "System going down in %d minute%s\n"
+msgstr ""
+
+#: login-utils/shutdown.c:449
+#, c-format
+msgid "\t... %s ...\n"
+msgstr ""
+
+#: login-utils/shutdown.c:506
+msgid "Cannot fork for swapoff. Shrug!"
+msgstr ""
+
+#: login-utils/shutdown.c:514
+msgid "Cannot exec swapoff, hoping umount will do the trick."
+msgstr ""
+
+#: login-utils/shutdown.c:533
+msgid "Cannot fork for umount, trying manually."
+msgstr ""
+
+#: login-utils/shutdown.c:542
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
+msgstr ""
+
+#: login-utils/shutdown.c:546
+msgid "Cannot exec umount, giving up on umount."
+msgstr ""
+
+#: login-utils/shutdown.c:551
+msgid "Unmounting any remaining filesystems..."
+msgstr ""
+
+#: login-utils/shutdown.c:587
+#, c-format
+msgid "shutdown: Couldn't umount %s\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:79
+msgid "Booting to single user mode.\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:83
+msgid "exec of single user shell failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:87
+msgid "fork of single user shell failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:226
+msgid ""
+"\n"
+"Wrong password.\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:252
+msgid "exec rc failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:255
+msgid "open of rc file failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:261
+msgid "fork of rc shell failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:273
+msgid "fork failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+msgid "exec failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:324
+msgid "cannot open inittab\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:362
+msgid "no TERM or cannot stat tty\n"
+msgstr ""
+
+#: login-utils/ttymsg.c:81
+msgid "too many iov's (change code in wall/ttymsg.c)"
+msgstr ""
+
+#: login-utils/ttymsg.c:91
+msgid "excessively long line arg"
+msgstr ""
+
+#: login-utils/ttymsg.c:145
+msgid "cannot fork"
+msgstr ""
+
+#: login-utils/ttymsg.c:149
+#, c-format
+msgid "fork: %s"
+msgstr ""
+
+#: login-utils/ttymsg.c:177
+#, c-format
+msgid "%s: BAD ERROR"
+msgstr ""
+
+#: login-utils/vipw.c:149
+#, c-format
+msgid "%s: the %s file is busy.\n"
+msgstr ""
+
+#: login-utils/vipw.c:165
+#, c-format
+msgid "%s: the %s file is busy (%s present)\n"
+msgstr ""
+
+#: login-utils/vipw.c:171
+#, c-format
+msgid "%s: can't link %s: %s\n"
+msgstr ""
+
+#: login-utils/vipw.c:193
+#, c-format
+msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
+msgstr ""
+
+#: login-utils/vipw.c:217
+#, c-format
+msgid "%s: Cannot fork\n"
+msgstr ""
+
+#: login-utils/vipw.c:257
+#, fuzzy, c-format
+msgid "%s: %s unchanged\n"
+msgstr "Il disco č stato modificato.\n"
+
+#: login-utils/vipw.c:300
+#, c-format
+msgid "%s: no changes made\n"
+msgstr ""
+
+#: login-utils/wall.c:103
+#, c-format
+msgid "usage: %s [file]\n"
+msgstr ""
+
+#: login-utils/wall.c:151
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr ""
+
+#: login-utils/wall.c:178
+#, c-format
+msgid "Broadcast Message from %s@%s"
+msgstr ""
+
+#: login-utils/wall.c:188
+#, c-format
+msgid "%s: can't read %s.\n"
+msgstr ""
+
+#: login-utils/wall.c:213
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr ""
+
+#: login-utils/wall.c:222
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr ""
+
+#: misc-utils/cal.c:184
+msgid "illegal month value: use 1-12"
+msgstr ""
+
+#: misc-utils/cal.c:188
+msgid "illegal year value: use 1-9999"
+msgstr ""
+
+#: misc-utils/cal.c:484
+msgid "usage: cal [-mjy] [[month] year]\n"
+msgstr ""
+
+#: misc-utils/ddate.c:184
+#, c-format
+msgid "usage: %s [+format] [day month year]\n"
+msgstr ""
+
+#. handle St. Tib's Day
+#: misc-utils/ddate.c:230
+msgid "St. Tib's Day"
+msgstr ""
+
+#: misc-utils/kill.c:199
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr ""
+
+#: misc-utils/kill.c:261
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr ""
+
+#: misc-utils/kill.c:303
+#, c-format
+msgid "%s: unknown signal %s; valid signals:\n"
+msgstr ""
+
+#: misc-utils/kill.c:343
+#, c-format
+msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr ""
+
+#: misc-utils/kill.c:344
+#, c-format
+msgid " %s -l [ signal ]\n"
+msgstr ""
+
+#: misc-utils/logger.c:144
+#, c-format
+msgid "logger: %s: %s.\n"
+msgstr ""
+
+#: misc-utils/logger.c:241
+#, c-format
+msgid "logger: unknown facility name: %s.\n"
+msgstr ""
+
+#: misc-utils/logger.c:253
+#, c-format
+msgid "logger: unknown priority name: %s.\n"
+msgstr ""
+
+#: misc-utils/logger.c:280
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+
+#: misc-utils/look.c:340
+msgid "usage: look [-dfa] [-t char] string [file]\n"
+msgstr ""
+
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, c-format
+msgid "Could not open %s\n"
+msgstr ""
+
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
+#, c-format
+msgid "Got %d bytes from %s\n"
+msgstr ""
+
+#: misc-utils/namei.c:107
+#, c-format
+msgid "namei: unable to get current directory - %s\n"
+msgstr ""
+
+#: misc-utils/namei.c:118
+#, c-format
+msgid "namei: unable to chdir to %s - %s (%d)\n"
+msgstr ""
+
+#: misc-utils/namei.c:128
+msgid "usage: namei [-mx] pathname [pathname ...]\n"
+msgstr ""
+
+#: misc-utils/namei.c:157
+msgid "namei: could not chdir to root!\n"
+msgstr ""
+
+#: misc-utils/namei.c:164
+msgid "namei: could not stat root!\n"
+msgstr ""
+
+#: misc-utils/namei.c:219
+#, c-format
+msgid " ? could not chdir into %s - %s (%d)\n"
+msgstr ""
+
+#: misc-utils/namei.c:248
+#, c-format
+msgid " ? problems reading symlink %s - %s (%d)\n"
+msgstr ""
+
+#: misc-utils/namei.c:258
+msgid " *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"
+msgstr ""
+
+#: misc-utils/namei.c:294
+#, c-format
+msgid "namei: unknown file type 0%06o on file %s\n"
+msgstr ""
+
+#: misc-utils/script.c:109
+msgid "usage: script [-a] [file]\n"
+msgstr ""
+
+#: misc-utils/script.c:129
+#, c-format
+msgid "Script started, file is %s\n"
+msgstr ""
+
+#: misc-utils/script.c:198
+#, c-format
+msgid "Script started on %s"
+msgstr ""
+
+#: misc-utils/script.c:264
+#, c-format
+msgid ""
+"\n"
+"Script done on %s"
+msgstr ""
+
+#: misc-utils/script.c:269
+#, c-format
+msgid "Script done, file is %s\n"
+msgstr ""
+
+#: misc-utils/script.c:281
+msgid "openpty failed\n"
+msgstr ""
+
+#: misc-utils/script.c:315
+msgid "Out of pty's\n"
+msgstr ""
+
+#. Print error message about arguments, and the command's syntax.
+#: misc-utils/setterm.c:745
+#, c-format
+msgid "%s: Argument error, usage\n"
+msgstr ""
+
+#: misc-utils/setterm.c:748
+msgid " [ -term terminal_name ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:749
+msgid " [ -reset ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:750
+msgid " [ -initialize ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:751
+msgid " [ -cursor [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:753
+msgid " [ -snow [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:754
+msgid " [ -softscroll [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:755
+msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:757
+msgid " [ -repeat [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:758
+msgid " [ -appcursorkeys [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:759
+msgid " [ -linewrap [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:760
+msgid " [ -default ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:761
+msgid " [ -foreground black|blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+msgid "|red|magenta|yellow|white|default ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:763
+msgid " [ -background black|blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:765
+msgid " [ -ulcolor black|grey|blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
+#: misc-utils/setterm.c:772
+msgid "|red|magenta|yellow|white ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:767
+msgid " [ -ulcolor bright blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:769
+msgid " [ -hbcolor black|grey|blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:771
+msgid " [ -hbcolor bright blue|green|cyan"
+msgstr ""
+
+#: misc-utils/setterm.c:774
+msgid " [ -standout [ attr ] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:776
+msgid " [ -inversescreen [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:777
+msgid " [ -bold [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:778
+msgid " [ -half-bright [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:779
+msgid " [ -blink [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:780
+msgid " [ -reverse [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:781
+msgid " [ -underline [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:782
+msgid " [ -store ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:783
+msgid " [ -clear [all|rest] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:784
+msgid " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
+msgstr ""
+
+#: misc-utils/setterm.c:785
+msgid " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
+msgstr ""
+
+#: misc-utils/setterm.c:786
+msgid " [ -regtabs [1-160] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:787
+msgid " [ -blank [0-60] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:788
+msgid " [ -dump [1-NR_CONSOLES] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:789
+msgid " [ -append [1-NR_CONSOLES] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:790
+msgid " [ -file dumpfilename ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:791
+msgid " [ -msg [on|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:792
+msgid " [ -msglevel [0-8] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:793
+msgid " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:794
+msgid " [ -powerdown [0-60] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:795
+msgid " [ -blength [0-2000] ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:796
+msgid " [ -bfreq freqnumber ]\n"
+msgstr ""
+
+#: misc-utils/setterm.c:841
+msgid "keyboard.pc"
+msgstr ""
+
+#: misc-utils/setterm.c:844
+msgid "keyboard.olivetti"
+msgstr ""
+
+#: misc-utils/setterm.c:847
+msgid "keyboard.dutch"
+msgstr ""
+
+#: misc-utils/setterm.c:850
+msgid "keyboard.extended"
+msgstr ""
+
+#: misc-utils/setterm.c:884
+msgid "snow.on"
+msgstr ""
+
+#: misc-utils/setterm.c:886
+msgid "snow.off"
+msgstr ""
+
+#: misc-utils/setterm.c:892
+msgid "softscroll.on"
+msgstr ""
+
+#: misc-utils/setterm.c:894
+msgid "softscroll.off"
+msgstr ""
+
+#: misc-utils/setterm.c:1069
+msgid "cannot (un)set powersave mode\n"
+msgstr ""
+
+#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
+#, c-format
+msgid "klogctl error: %s\n"
+msgstr ""
+
+#: misc-utils/setterm.c:1157
+#, c-format
+msgid "Error reading %s\n"
+msgstr ""
+
+#: misc-utils/setterm.c:1172
+msgid "Error writing screendump\n"
+msgstr ""
+
+#: misc-utils/setterm.c:1186
+#, c-format
+msgid "couldn't read %s, and cannot ioctl dump\n"
+msgstr ""
+
+#: misc-utils/setterm.c:1251
+#, c-format
+msgid "%s: $TERM is not defined.\n"
+msgstr ""
+
+#: misc-utils/tsort.c:119
+msgid "usage: tsort [ inputfile ]\n"
+msgstr ""
+
+#: misc-utils/tsort.c:156
+msgid "tsort: odd data count.\n"
+msgstr ""
+
+#: misc-utils/tsort.c:321
+msgid "tsort: cycle in data.\n"
+msgstr ""
+
+#: misc-utils/tsort.c:334
+msgid "tsort: internal error -- could not find cycle.\n"
+msgstr ""
+
+#: misc-utils/whereis.c:158
+msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
+msgstr ""
+
+#: misc-utils/write.c:99
+msgid "write: can't find your tty's name\n"
+msgstr ""
+
+#: misc-utils/write.c:110
+msgid "write: you have write permission turned off.\n"
+msgstr ""
+
+#: misc-utils/write.c:131
+#, c-format
+msgid "write: %s is not logged in on %s.\n"
+msgstr ""
+
+#: misc-utils/write.c:139
+#, c-format
+msgid "write: %s has messages disabled on %s\n"
+msgstr ""
+
+#: misc-utils/write.c:146
+msgid "usage: write user [tty]\n"
+msgstr ""
+
+#: misc-utils/write.c:245
+#, c-format
+msgid "write: %s is not logged in\n"
+msgstr ""
+
+#: misc-utils/write.c:254
+#, c-format
+msgid "write: %s has messages disabled\n"
+msgstr ""
+
+#: misc-utils/write.c:258
+#, c-format
+msgid "write: %s is logged in more than once; writing to %s\n"
+msgstr ""
+
+#: misc-utils/write.c:325
+#, c-format
+msgid "Message from %s@%s on %s at %s ..."
+msgstr ""
+
+#: mount/fstab.c:116
+#, c-format
+msgid "warning: error reading %s: %s"
+msgstr ""
+
+#: mount/fstab.c:143 mount/fstab.c:166
+#, c-format
+msgid "warning: can't open %s: %s"
+msgstr ""
+
+#: mount/fstab.c:147
+#, c-format
+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:375
+#, c-format
+msgid "can't create lock file %s: %s (use -n flag to override)"
+msgstr ""
+
+#: mount/fstab.c:387
+#, c-format
+msgid "can't link lock file %s: %s (use -n flag to override)"
+msgstr ""
+
+#: mount/fstab.c:399
+#, c-format
+msgid "can't open lock file %s: %s (use -n flag to override)"
+msgstr ""
+
+#: mount/fstab.c:414
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr ""
+
+#: mount/fstab.c:425
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr ""
+
+#: mount/fstab.c:427
+msgid "timed out"
+msgstr ""
+
+#: mount/fstab.c:472 mount/fstab.c:480
+#, c-format
+msgid "cannot open %s (%s) - mtab not updated"
+msgstr ""
+
+#: mount/fstab.c:505
+msgid "mount: warning: cannot change mounted device with a remount\n"
+msgstr ""
+
+#: mount/fstab.c:510
+msgid "mount: warning: cannot change filesystem type with a remount\n"
+msgstr ""
+
+#: mount/fstab.c:518 mount/fstab.c:524
+#, c-format
+msgid "error writing %s: %s"
+msgstr ""
+
+#: mount/fstab.c:531
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr ""
+
+#: mount/fstab.c:538
+#, c-format
+msgid "can't rename %s to %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:78
+#, c-format
+msgid "loop: can't open device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:84
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:89 mount/losetup.c:74
+#, c-format
+msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+msgstr ""
+
+#: mount/lomount.c:143
+msgid "mount: could not find any device /dev/loop#"
+msgstr ""
+
+#: mount/lomount.c:147
+msgid ""
+"mount: Could not find any loop device.\n"
+" Maybe /dev/loop# has a wrong major number?"
+msgstr ""
+
+#: mount/lomount.c:151
+#, c-format
+msgid ""
+"mount: Could not find any loop device, and, according to %s,\n"
+" this kernel does not know about the loop device.\n"
+" (If so, then recompile or `insmod loop.o'.)"
+msgstr ""
+
+#: mount/lomount.c:156
+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/lomount.c:160
+msgid "mount: could not find any free loop device"
+msgstr ""
+
+#: mount/lomount.c:191 mount/losetup.c:106
+#, c-format
+msgid "Unsupported encryption type %s\n"
+msgstr ""
+
+#: mount/lomount.c:210 mount/losetup.c:125
+msgid "Init (up to 16 hex digits): "
+msgstr ""
+
+#: mount/lomount.c:217 mount/losetup.c:132
+#, c-format
+msgid "Non-hex digit '%c'.\n"
+msgstr ""
+
+#: mount/lomount.c:223 mount/losetup.c:138
+#, c-format
+msgid "Don't know how to get key for encryption system %d\n"
+msgstr ""
+
+#: mount/lomount.c:239
+#, c-format
+msgid "set_loop(%s,%s,%d): success\n"
+msgstr ""
+
+#: mount/lomount.c:250
+#, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:260
+#, c-format
+msgid "del_loop(%s): success\n"
+msgstr ""
+
+#: mount/lomount.c:268
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+
+#: mount/losetup.c:70
+msgid "Cannot get loop info"
+msgstr ""
+
+#: mount/losetup.c:174
+#, c-format
+msgid ""
+"usage:\n"
+" %s loop_device # give info\n"
+" %s -d loop_device # delete\n"
+" %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+msgstr ""
+
+#: mount/losetup.c:231
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr ""
+
+#: mount/mntent.c:165
+#, c-format
+msgid "[mntent]: warning: no final newline at the end of %s\n"
+msgstr ""
+
+#: mount/mntent.c:216
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr ""
+
+#: mount/mntent.c:219
+msgid "; rest of file ignored"
+msgstr ""
+
+#: mount/mount.c:333
+#, c-format
+msgid "mount: according to mtab, %s is already mounted on %s"
+msgstr ""
+
+#: mount/mount.c:336
+#, c-format
+msgid "mount: according to mtab, %s is mounted on %s"
+msgstr ""
+
+#: mount/mount.c:357
+#, c-format
+msgid "mount: can't open %s for writing: %s"
+msgstr ""
+
+#: mount/mount.c:372 mount/mount.c:644
+#, c-format
+msgid "mount: error writing %s: %s"
+msgstr ""
+
+#: mount/mount.c:379
+#, c-format
+msgid "mount: error changing mode of %s: %s"
+msgstr ""
+
+#: mount/mount.c:473
+msgid "mount failed"
+msgstr ""
+
+#: mount/mount.c:475
+#, c-format
+msgid "mount: only root can mount %s on %s"
+msgstr ""
+
+#: mount/mount.c:503
+msgid "mount: loop device specified twice"
+msgstr ""
+
+#: mount/mount.c:509
+msgid "mount: type specified twice"
+msgstr ""
+
+#: mount/mount.c:521
+msgid "mount: skipping the setup of a loop device\n"
+msgstr ""
+
+#: mount/mount.c:530
+#, c-format
+msgid "mount: going to use the loop device %s\n"
+msgstr ""
+
+#: mount/mount.c:534
+msgid "mount: failed setting up loop device\n"
+msgstr ""
+
+#: mount/mount.c:538
+msgid "mount: setup loop device successfully\n"
+msgstr ""
+
+#: mount/mount.c:551
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr ""
+
+#: mount/mount.c:601 mount/mount.c:1026
+#, c-format
+msgid "mount: cannot fork: %s"
+msgstr ""
+
+#: mount/mount.c:639
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr ""
+
+#: mount/mount.c:667
+#, fuzzy
+msgid "mount: you must specify the filesystem type"
+msgstr " t Cambia il tipo di filesystem"
+
+#: mount/mount.c:674 mount/mount.c:709
+#, c-format
+msgid "mount: mount point %s is not a directory"
+msgstr ""
+
+#: mount/mount.c:676
+msgid "mount: permission denied"
+msgstr ""
+
+#: mount/mount.c:678
+msgid "mount: must be superuser to use mount"
+msgstr ""
+
+#. heuristic: if /proc/version exists, then probably proc is mounted
+#. proc mounted?
+#: mount/mount.c:682 mount/mount.c:686
+#, c-format
+msgid "mount: %s is busy"
+msgstr ""
+
+#. no
+#. yes, don't mention it
+#: mount/mount.c:688
+msgid "mount: proc already mounted"
+msgstr ""
+
+#: mount/mount.c:690
+#, c-format
+msgid "mount: %s already mounted or %s busy"
+msgstr ""
+
+#: mount/mount.c:696
+#, c-format
+msgid "mount: mount point %s does not exist"
+msgstr ""
+
+#: mount/mount.c:698
+#, c-format
+msgid "mount: mount point %s is a symbolic link to nowhere"
+msgstr ""
+
+#: mount/mount.c:701
+#, c-format
+msgid "mount: special device %s does not exist"
+msgstr ""
+
+#: mount/mount.c:711
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+" (a path prefix is not a directory)\n"
+msgstr ""
+
+#: mount/mount.c:723
+#, c-format
+msgid "mount: %s not mounted already, or bad option"
+msgstr ""
+
+#: mount/mount.c:725
+#, c-format
+msgid ""
+"mount: wrong fs type, bad option, bad superblock on %s,\n"
+" or too many mounted file systems"
+msgstr ""
+
+#: mount/mount.c:740
+msgid "mount table full"
+msgstr ""
+
+#: mount/mount.c:742
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr ""
+
+#: mount/mount.c:745
+#, c-format
+msgid "mount: %s has wrong major or minor number"
+msgstr ""
+
+#: mount/mount.c:750
+#, c-format
+msgid "mount: fs type %s not supported by kernel"
+msgstr ""
+
+#: mount/mount.c:762
+#, c-format
+msgid "mount: probably you meant %s"
+msgstr ""
+
+#: mount/mount.c:764
+msgid "mount: maybe you meant iso9660 ?"
+msgstr ""
+
+#: mount/mount.c:767
+#, c-format
+msgid "mount: %s has wrong device number or fs type %s not supported"
+msgstr ""
+
+#. strange ...
+#: mount/mount.c:772
+#, c-format
+msgid "mount: %s is not a block device, and stat fails?"
+msgstr ""
+
+#: mount/mount.c:774
+#, c-format
+msgid ""
+"mount: the kernel does not recognize %s as a block device\n"
+" (maybe `insmod driver'?)"
+msgstr ""
+
+#: mount/mount.c:777
+#, c-format
+msgid "mount: %s is not a block device (maybe try `-o loop'?)"
+msgstr ""
+
+#: mount/mount.c:780
+#, c-format
+msgid "mount: %s is not a block device"
+msgstr ""
+
+#: mount/mount.c:783
+#, c-format
+msgid "mount: %s is not a valid block device"
+msgstr ""
+
+#: mount/mount.c:787
+#, c-format
+msgid "mount: block device %s is not permitted on its filesystem"
+msgstr ""
+
+#: mount/mount.c:803
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
+msgstr ""
+
+#: mount/mount.c:804
+msgid "block device "
+msgstr ""
+
+#: mount/mount.c:890
+#, c-format
+msgid "mount: consider mounting %s by %s\n"
+msgstr ""
+
+#: mount/mount.c:891
+msgid "UUID"
+msgstr ""
+
+#: mount/mount.c:891
+#, fuzzy
+msgid "label"
+msgstr "[Etichetta]"
+
+#: mount/mount.c:893 mount/mount.c:1209
+msgid "mount: no such partition found"
+msgstr ""
+
+#: mount/mount.c:901
+msgid "mount: no type was given - I'll assume nfs because of the colon\n"
+msgstr ""
+
+#.
+#. * Retry in the background.
+#.
+#: mount/mount.c:917
+#, c-format
+msgid "mount: backgrounding \"%s\"\n"
+msgstr ""
+
+#: mount/mount.c:928
+#, c-format
+msgid "mount: giving up \"%s\"\n"
+msgstr ""
+
+#: mount/mount.c:977
+#, c-format
+msgid "mount: %s already mounted on %s\n"
+msgstr ""
+
+#: mount/mount.c:1088
+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"
+msgstr ""
+
+#: mount/mount.c:1194
+msgid "mount: only root can do that"
+msgstr ""
+
+#: mount/mount.c:1199
+#, c-format
+msgid "mount: no %s found - creating it..\n"
+msgstr ""
+
+#: mount/mount.c:1211
+#, c-format
+msgid "mount: mounting %s\n"
+msgstr ""
+
+#: mount/mount.c:1220
+msgid "not mounted anything"
+msgstr ""
+
+#: mount/mount.c:1233
+#, c-format
+msgid "mount: cannot find %s in %s"
+msgstr ""
+
+#: mount/mount.c:1247
+#, c-format
+msgid "mount: can't find %s in %s or %s"
+msgstr ""
+
+#: mount/mount_by_label.c:141
+msgid "mount: bad UUID"
+msgstr ""
+
+#: mount/mount_guess_fstype.c:195
+#, c-format
+msgid "mount: you didn't specify a filesystem type for %s\n"
+msgstr ""
+
+#: mount/mount_guess_fstype.c:198
+#, c-format
+msgid " I will try type %s\n"
+msgstr ""
+
+#: mount/mount_guess_fstype.c:200
+#, c-format
+msgid " I will try all types mentioned in %s or %s\n"
+msgstr ""
+
+#: mount/nfsmount.c:157
+msgid "mount: excessively long host:dir argument\n"
+msgstr ""
+
+#: mount/nfsmount.c:170
+msgid "mount: warning: multiple hostnames not supported\n"
+msgstr ""
+
+#: mount/nfsmount.c:174
+msgid "mount: directory to mount not in host:dir format\n"
+msgstr ""
+
+#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#, c-format
+msgid "mount: can't get address for %s\n"
+msgstr ""
+
+#: mount/nfsmount.c:191
+msgid "mount: got bad hp->h_length\n"
+msgstr ""
+
+#: mount/nfsmount.c:208
+msgid "mount: excessively long option argument\n"
+msgstr ""
+
+#: mount/nfsmount.c:299
+msgid "Warning: Unrecognized proto= option.\n"
+msgstr ""
+
+#: mount/nfsmount.c:306
+msgid "Warning: Option namlen is not supported.\n"
+msgstr ""
+
+#: mount/nfsmount.c:310
+#, c-format
+msgid "unknown nfs mount parameter: %s=%d\n"
+msgstr ""
+
+#: mount/nfsmount.c:345
+msgid "Warning: option nolock is not supported.\n"
+msgstr ""
+
+#: mount/nfsmount.c:348
+#, c-format
+msgid "unknown nfs mount option: %s%s\n"
+msgstr ""
+
+#: mount/nfsmount.c:426
+msgid "mount: got bad hp->h_length?\n"
+msgstr ""
+
+#: mount/nfsmount.c:528
+#, c-format
+msgid "mount: %s:%s failed, reason given by server: %s\n"
+msgstr ""
+
+#: mount/nfsmount.c:539
+msgid "NFS over TCP is not supported.\n"
+msgstr ""
+
+#: mount/nfsmount.c:546
+msgid "nfs socket"
+msgstr ""
+
+#: mount/nfsmount.c:550
+msgid "nfs bindresvport"
+msgstr ""
+
+#: mount/nfsmount.c:561
+msgid "used portmapper to find NFS port\n"
+msgstr ""
+
+#: mount/nfsmount.c:565
+#, c-format
+msgid "using port %d for nfs deamon\n"
+msgstr ""
+
+#: mount/nfsmount.c:576
+msgid "nfs connect"
+msgstr ""
+
+#: mount/nfsmount.c:665
+#, c-format
+msgid "unknown nfs status return value: %d"
+msgstr ""
+
+#: mount/sundries.c:40 mount/sundries.c:55
+msgid "not enough memory"
+msgstr ""
+
+#: mount/sundries.c:65
+msgid "bug in xstrndup call"
+msgstr ""
+
+#: mount/swapon.c:51
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p priority] special ...\n"
+" %s [-s]\n"
+msgstr ""
+
+#: mount/swapon.c:88
+#, c-format
+msgid "%s on %s\n"
+msgstr ""
+
+#: mount/swapon.c:93
+#, c-format
+msgid "swapon: cannot stat %s: %s\n"
+msgstr ""
+
+#: mount/swapon.c:100
+#, c-format
+msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
+msgstr ""
+
+#: mount/swapon.c:108
+#, c-format
+msgid "swapon: Skipping file %s - it appears to have holes.\n"
+msgstr ""
+
+#: mount/swapon.c:213
+#, c-format
+msgid "%s: cannot open %s: %s\n"
+msgstr ""
+
+#: mount/umount.c:65
+msgid "umount: compiled without support for -f\n"
+msgstr ""
+
+#: mount/umount.c:115
+#, c-format
+msgid "host: %s, directory: %s\n"
+msgstr ""
+
+#: mount/umount.c:132
+#, c-format
+msgid "umount: can't get address for %s\n"
+msgstr ""
+
+#: mount/umount.c:137
+msgid "umount: got bad hostp->h_length\n"
+msgstr ""
+
+#: mount/umount.c:175
+#, c-format
+msgid "umount: %s: invalid block device"
+msgstr ""
+
+#: mount/umount.c:177
+#, c-format
+msgid "umount: %s: not mounted"
+msgstr ""
+
+#: mount/umount.c:179
+#, 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:183
+#, c-format
+msgid "umount: %s: device is busy"
+msgstr ""
+
+#: mount/umount.c:185
+#, c-format
+msgid "umount: %s: not found"
+msgstr ""
+
+#: mount/umount.c:187
+#, c-format
+msgid "umount: %s: must be superuser to umount"
+msgstr ""
+
+#: mount/umount.c:189
+#, c-format
+msgid "umount: %s: block devices not permitted on fs"
+msgstr ""
+
+#: mount/umount.c:191
+#, c-format
+msgid "umount: %s: %s"
+msgstr ""
+
+#: mount/umount.c:235
+msgid "no umount2, trying umount...\n"
+msgstr ""
+
+#: mount/umount.c:248
+#, c-format
+msgid "could not umount %s - trying %s instead\n"
+msgstr ""
+
+#: mount/umount.c:264
+#, c-format
+msgid "umount: %s busy - remounted read-only\n"
+msgstr ""
+
+#: mount/umount.c:272
+#, c-format
+msgid "umount: could not remount %s read-only\n"
+msgstr ""
+
+#: mount/umount.c:280
+#, c-format
+msgid "%s umounted\n"
+msgstr ""
+
+#: mount/umount.c:363
+msgid "umount: cannot find list of filesystems to unmount"
+msgstr ""
+
+#: mount/umount.c:392
+msgid ""
+"Usage: umount [-hV]\n"
+" umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
+" umount [-f] [-r] [-n] [-v] special | node...\n"
+msgstr ""
+
+#: mount/umount.c:453
+msgid "umount: only root can do that"
+msgstr ""
+
+#: mount/umount.c:468
+#, c-format
+msgid "Trying to umount %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, c-format
+msgid "Could not find %s in mtab\n"
+msgstr ""
+
+#: mount/umount.c:476
+#, c-format
+msgid "umount: %s is not mounted (according to mtab)"
+msgstr ""
+
+#: mount/umount.c:478
+#, c-format
+msgid "umount: it seems %s is mounted multiple times"
+msgstr ""
+
+#: mount/umount.c:490
+#, c-format
+msgid "umount: %s is not in the fstab (and you are not root)"
+msgstr ""
+
+#: mount/umount.c:493
+#, c-format
+msgid "umount: %s mount disagrees with the fstab"
+msgstr ""
+
+#: mount/umount.c:514
+#, c-format
+msgid "umount: only root can unmount %s from %s"
+msgstr ""
+
+#: mount/umount.c:525
+#, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr ""
+
+#: sys-utils/ctrlaltdel.c:26
+msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
+msgstr ""
+
+#: sys-utils/ctrlaltdel.c:41
+msgid "Usage: ctrlaltdel hard|soft\n"
+msgstr ""
+
+#: sys-utils/cytune.c:118
+#, 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 ""
+
+#: sys-utils/cytune.c:129
+#, 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 ""
+
+#: sys-utils/cytune.c:196
+#, c-format
+msgid "Invalid interval value: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:204
+#, c-format
+msgid "Invalid set value: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:212
+#, c-format
+msgid "Invalid default value: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:220
+#, c-format
+msgid "Invalid set time value: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:228
+#, c-format
+msgid "Invalid default time value: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:245
+#, c-format
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+
+#: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
+#: sys-utils/cytune.c:342
+#, c-format
+msgid "Can't open %s: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:264
+#, c-format
+msgid "Can't set %s to threshold %d: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:282
+#, c-format
+msgid "Can't set %s to time threshold %d: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:299 sys-utils/cytune.c:354 sys-utils/cytune.c:385
+#, c-format
+msgid "Can't get threshold for %s: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:305 sys-utils/cytune.c:360 sys-utils/cytune.c:391
+#, c-format
+msgid "Can't get timeout for %s: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:309
+#, c-format
+msgid "%s: %ld %s threshold and %ld %s timeout\n"
+msgstr ""
+
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
+msgid "current"
+msgstr ""
+
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
+msgid "default"
+msgstr ""
+
+#: sys-utils/cytune.c:330
+msgid "Can't set signal handler"
+msgstr ""
+
+#: sys-utils/cytune.c:334 sys-utils/cytune.c:369
+msgid "gettimeofday failed"
+msgstr ""
+
+#: sys-utils/cytune.c:347 sys-utils/cytune.c:379
+#, c-format
+msgid "Can't issue CYGETMON on %s: %s\n"
+msgstr ""
+
+#: sys-utils/cytune.c:421
+#, c-format
+msgid "%s: %lu ints, %lu/%lu chars; "
+msgstr ""
+
+#: sys-utils/cytune.c:422
+#, c-format
+msgid "fifo: %lu thresh, %lu tmout, "
+msgstr ""
+
+#: sys-utils/cytune.c:423
+#, c-format
+msgid "%lu max, %lu now\n"
+msgstr ""
+
+#: sys-utils/cytune.c:428
+#, c-format
+msgid " %f int/sec; %f rec, %f send (char/sec)\n"
+msgstr ""
+
+#: sys-utils/cytune.c:433
+#, c-format
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+
+#: sys-utils/cytune.c:438
+#, c-format
+msgid " %f int/sec; %f rec (char/sec)\n"
+msgstr ""
+
+#: sys-utils/dmesg.c:38
+#, c-format
+msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
+msgstr ""
+
+#: sys-utils/ipcrm.c:46
+#, c-format
+msgid "usage: %s [shm | msg | sem] id\n"
+msgstr ""
+
+#: sys-utils/ipcrm.c:70
+#, c-format
+msgid "usage: %s [-shm | -msg | -sem] id\n"
+msgstr ""
+
+#: sys-utils/ipcrm.c:73
+msgid "resource deleted\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:91
+#, c-format
+msgid "usage : %s -asmq -tclup \n"
+msgstr ""
+
+#: sys-utils/ipcs.c:92
+#, c-format
+msgid "\t%s [-s -m -q] -i id\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:93
+#, c-format
+msgid "\t%s -h for help.\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:99
+#, c-format
+msgid "%s provides information on ipc facilities for"
+msgstr ""
+
+#: sys-utils/ipcs.c:100
+msgid " which you have read access.\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:101
+msgid ""
+"Resource Specification:\n"
+"\t-m : shared_mem\n"
+"\t-q : messages\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:102
+msgid ""
+"\t-s : semaphores\n"
+"\t-a : all (default)\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:103
+msgid ""
+"Output Format:\n"
+"\t-t : time\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:104
+msgid ""
+"\t-l : limits\n"
+"\t-u : summary\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:105
+msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:237 sys-utils/ipcs.c:439
+msgid "kernel not configured for shared memory\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:243
+msgid "------ Shared Memory Limits --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:246
+#, c-format
+msgid "max number of segments = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:247
+#, c-format
+msgid "max seg size (kbytes) = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:248
+#, c-format
+msgid "max total shared memory (kbytes) = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:249
+#, c-format
+msgid "min seg size (bytes) = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:253
+msgid "------ Shared Memory Status --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:254
+#, c-format
+msgid "segments allocated %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:255
+#, c-format
+msgid "pages allocated %ld\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:256
+#, c-format
+msgid "pages resident %ld\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:257
+#, c-format
+msgid "pages swapped %ld\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:258
+#, c-format
+msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:263
+msgid "------ Shared Memory Segment Creators/Owners --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:264 sys-utils/ipcs.c:370 sys-utils/ipcs.c:462
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:271 sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:377
+msgid "shmid"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:282 sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:386 sys-utils/ipcs.c:463 sys-utils/ipcs.c:480
+msgid "perms"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+msgid "cuid"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+msgid "cgid"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+msgid "uid"
+msgstr ""
+
+#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:463
+msgid "gid"
+msgstr ""
+
+#: sys-utils/ipcs.c:269
+msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:270
+#, c-format
+msgid "%-10s%-10s %-20s%-20s%-20s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:276 sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:377 sys-utils/ipcs.c:386 sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:474 sys-utils/ipcs.c:480
+#, fuzzy
+msgid "owner"
+msgstr "Fatto"
+
+#: sys-utils/ipcs.c:271
+msgid "attached"
+msgstr ""
+
+#: sys-utils/ipcs.c:271
+msgid "detached"
+msgstr ""
+
+#: sys-utils/ipcs.c:271
+msgid "changed"
+msgstr ""
+
+#: sys-utils/ipcs.c:275
+msgid "------ Shared Memory Creator/Last-op --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:276 sys-utils/ipcs.c:474
+#, c-format
+msgid "%-10s%-10s%-10s%-10s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:276
+msgid "cpid"
+msgstr ""
+
+#: sys-utils/ipcs.c:276
+msgid "lpid"
+msgstr ""
+
+#: sys-utils/ipcs.c:280
+msgid "------ Shared Memory Segments --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:281
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:386 sys-utils/ipcs.c:479
+msgid "key"
+msgstr ""
+
+#: sys-utils/ipcs.c:282
+msgid "bytes"
+msgstr ""
+
+#: sys-utils/ipcs.c:282
+msgid "nattch"
+msgstr ""
+
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:386
+msgid "status"
+msgstr ""
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:303 sys-utils/ipcs.c:304
+#: sys-utils/ipcs.c:407 sys-utils/ipcs.c:408 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:501 sys-utils/ipcs.c:502
+msgid "Not set"
+msgstr ""
+
+#: sys-utils/ipcs.c:324
+msgid "dest"
+msgstr ""
+
+#: sys-utils/ipcs.c:325
+msgid "locked"
+msgstr ""
+
+#: sys-utils/ipcs.c:345
+msgid "kernel not configured for semaphores\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:351
+#, fuzzy
+msgid "------ Semaphore Limits --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:355
+#, c-format
+msgid "max number of arrays = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:356
+#, c-format
+msgid "max semaphores per array = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:357
+#, c-format
+msgid "max semaphores system wide = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:358
+#, c-format
+msgid "max ops per semop call = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:359
+#, c-format
+msgid "semaphore max value = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:363
+#, fuzzy
+msgid "------ Semaphore Status --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:364
+#, c-format
+msgid "used arrays = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:365
+#, c-format
+msgid "allocated semaphores = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:369
+msgid "------ Semaphore Arrays Creators/Owners --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:371 sys-utils/ipcs.c:386
+msgid "semid"
+msgstr ""
+
+#: sys-utils/ipcs.c:375
+msgid "------ Shared Memory Operation/Change Times --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:376
+#, c-format
+msgid "%-8s%-10s %-26.24s %-26.24s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:377
+msgid "last-op"
+msgstr ""
+
+#: sys-utils/ipcs.c:377
+msgid "last-changed"
+msgstr ""
+
+#: sys-utils/ipcs.c:384
+#, fuzzy
+msgid "------ Semaphore Arrays --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:385
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:386
+msgid "nsems"
+msgstr ""
+
+#: sys-utils/ipcs.c:447
+#, fuzzy
+msgid "------ Messages: Limits --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:448
+#, c-format
+msgid "max queues system wide = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:449
+#, c-format
+msgid "max size of message (bytes) = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:450
+#, c-format
+msgid "default max size of queue (bytes) = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:454
+#, fuzzy
+msgid "------ Messages: Status --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:455
+#, c-format
+msgid "allocated queues = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:456
+#, c-format
+msgid "used headers = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:457
+#, c-format
+msgid "used space = %d bytes\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:461
+msgid "------ Message Queues: Creators/Owners --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:463 sys-utils/ipcs.c:469 sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
+msgid "msqid"
+msgstr ""
+
+#: sys-utils/ipcs.c:467
+msgid "------ Message Queues Send/Recv/Change Times --------\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:468
+#, c-format
+msgid "%-8s%-10s %-20s%-20s%-20s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:469
+msgid "send"
+msgstr ""
+
+#: sys-utils/ipcs.c:469
+msgid "recv"
+msgstr ""
+
+#: sys-utils/ipcs.c:469
+msgid "change"
+msgstr ""
+
+#: sys-utils/ipcs.c:473
+#, fuzzy
+msgid "------ Message Queues PIDs --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:474
+msgid "lspid"
+msgstr ""
+
+#: sys-utils/ipcs.c:474
+msgid "lrpid"
+msgstr ""
+
+#: sys-utils/ipcs.c:478
+#, fuzzy
+msgid "------ Message Queues --------\n"
+msgstr "------- -----------"
+
+#: sys-utils/ipcs.c:479
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:480
+msgid "used-bytes"
+msgstr ""
+
+#: sys-utils/ipcs.c:480
+msgid "messages"
+msgstr ""
+
+#: sys-utils/ipcs.c:539
+#, c-format
+msgid ""
+"\n"
+"Shared memory Segment shmid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:540
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:542
+#, c-format
+msgid "mode=%#o\taccess_perms=%#o\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:543
+#, c-format
+msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:546
+#, c-format
+msgid "att_time=%s"
+msgstr ""
+
+#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:598
+msgid "Not set\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:548
+#, c-format
+msgid "det_time=%s"
+msgstr ""
+
+#: sys-utils/ipcs.c:550
+#, c-format
+msgid "change_time=%s"
+msgstr ""
+
+#: sys-utils/ipcs.c:566
+#, c-format
+msgid ""
+"\n"
+"Message Queue msqid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:567
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:569
+#, c-format
+msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:572
+#, c-format
+msgid "send_time=%srcv_time=%schange_time=%s"
+msgstr ""
+
+#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:574 sys-utils/ipcs.c:575
+msgid "Not Set\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:592
+#, c-format
+msgid ""
+"\n"
+"Semaphore Array semid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:593
+#, c-format
+msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:595
+#, c-format
+msgid "mode=%#o, access_perms=%#o\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:596
+#, c-format
+msgid "nsems = %d\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:597
+#, c-format
+msgid "otime = %s"
+msgstr ""
+
+#: sys-utils/ipcs.c:599
+#, c-format
+msgid "ctime = %s"
+msgstr ""
+
+#: sys-utils/ipcs.c:601
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s\n"
+msgstr ""
+
+#: sys-utils/ipcs.c:601
+msgid "semnum"
+msgstr ""
+
+#: sys-utils/ipcs.c:601
+#, fuzzy
+msgid "value"
+msgstr "Tabella"
+
+#: sys-utils/ipcs.c:601
+msgid "ncount"
+msgstr ""
+
+#: sys-utils/ipcs.c:602
+msgid "zcount"
+msgstr ""
+
+#: sys-utils/ipcs.c:602
+msgid "pid"
+msgstr ""
+
+#: sys-utils/rdev.c:68
+msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr ""
+
+#: sys-utils/rdev.c:69
+msgid ""
+" rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+
+#: sys-utils/rdev.c:70
+msgid " rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2"
+msgstr ""
+
+#: sys-utils/rdev.c:71
+msgid " rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)"
+msgstr ""
+
+#: sys-utils/rdev.c:72
+msgid " rdev -s /dev/fd0 /dev/hda2 set the SWAP device"
+msgstr ""
+
+#: sys-utils/rdev.c:73
+msgid " rdev -r /dev/fd0 627 set the RAMDISK size"
+msgstr ""
+
+#: sys-utils/rdev.c:74
+msgid " rdev -v /dev/fd0 1 set the bootup VIDEOMODE"
+msgstr ""
+
+#: sys-utils/rdev.c:75
+msgid " rdev -o N ... use the byte offset N"
+msgstr ""
+
+#: sys-utils/rdev.c:76
+msgid " rootflags ... same as rdev -R"
+msgstr ""
+
+#: sys-utils/rdev.c:77
+msgid " swapdev ... same as rdev -s"
+msgstr ""
+
+#: sys-utils/rdev.c:78
+msgid " ramsize ... same as rdev -r"
+msgstr ""
+
+#: sys-utils/rdev.c:79
+msgid " vidmode ... same as rdev -v"
+msgstr ""
+
+#: sys-utils/rdev.c:80
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+
+#: sys-utils/rdev.c:81
+msgid " use -R 1 to mount root readonly, -R 0 for read/write."
+msgstr ""
+
+#: sys-utils/readprofile.c:52
+#, c-format
+msgid ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile> (default = \"%s\")\n"
+"\t -p <pro-file> (default = \"%s\")\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 -r reset all the counters (root only)\n"
+"\t -V print version and exit\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:116
+#, c-format
+msgid "%s Version %s\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:128
+msgid "anything\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:157
+#, c-format
+msgid "Sampling_step: %i\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
+#, c-format
+msgid "%s: %s(%i): wrong map line\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:183
+#, c-format
+msgid "%s: can't find \"_stext\" in %s\n"
+msgstr ""
+
+#: sys-utils/readprofile.c:226
+#, fuzzy
+msgid "total"
+msgstr "Bootable"
+
+#: sys-utils/renice.c:67
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+
+#: sys-utils/renice.c:94
+#, c-format
+msgid "renice: %s: unknown user\n"
+msgstr ""
+
+#: sys-utils/renice.c:102
+#, c-format
+msgid "renice: %s: bad value\n"
+msgstr ""
+
+#: sys-utils/renice.c:121
+msgid "getpriority"
+msgstr ""
+
+#: sys-utils/renice.c:126
+msgid "setpriority"
+msgstr ""
+
+#: sys-utils/renice.c:129
+#, c-format
+msgid "%d: old priority %d, new priority %d\n"
+msgstr ""
+
+#: sys-utils/setsid.c:23
+#, c-format
+msgid "usage: %s program [arg ...]\n"
+msgstr ""
+
+#: sys-utils/tunelp.c:74
+#, 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 ""
+
+#: sys-utils/tunelp.c:90
+msgid "malloc error"
+msgstr ""
+
+#: sys-utils/tunelp.c:101
+msgid "sscanf error"
+msgstr ""
+
+#: sys-utils/tunelp.c:239
+#, fuzzy, c-format
+msgid "%s: %s not an lp device.\n"
+msgstr "\t%s [opzioni] dispositivo\n"
+
+#: sys-utils/tunelp.c:260
+#, c-format
+msgid "%s status is %d"
+msgstr ""
+
+#: sys-utils/tunelp.c:261
+msgid ", busy"
+msgstr ""
+
+#: sys-utils/tunelp.c:262
+msgid ", ready"
+msgstr ""
+
+#: sys-utils/tunelp.c:263
+msgid ", out of paper"
+msgstr ""
+
+#: sys-utils/tunelp.c:264
+msgid ", on-line"
+msgstr ""
+
+#: sys-utils/tunelp.c:265
+msgid ", error"
+msgstr ""
+
+#: sys-utils/tunelp.c:282
+msgid "LPGETIRQ error"
+msgstr ""
+
+#: sys-utils/tunelp.c:288
+#, c-format
+msgid "%s using IRQ %d\n"
+msgstr ""
+
+#: sys-utils/tunelp.c:290
+#, c-format
+msgid "%s using polling\n"
+msgstr ""
+
+#: text-utils/col.c:153
+#, c-format
+msgid "col: bad -l argument %s.\n"
+msgstr ""
+
+#: text-utils/col.c:516
+msgid "usage: col [-bfx] [-l nline]\n"
+msgstr ""
+
+#: text-utils/col.c:522
+msgid "col: write error.\n"
+msgstr ""
+
+#: text-utils/col.c:529
+#, c-format
+msgid "col: warning: can't back up %s.\n"
+msgstr ""
+
+#: text-utils/col.c:530
+msgid "past first line"
+msgstr ""
+
+#: text-utils/col.c:530
+msgid "-- line already flushed"
+msgstr ""
+
+#: text-utils/colcrt.c:98
+#, c-format
+msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr ""
+
+#: text-utils/column.c:302
+msgid "line too long"
+msgstr ""
+
+#: text-utils/column.c:379
+msgid "usage: column [-tx] [-c columns] [file ...]\n"
+msgstr ""
+
+#: text-utils/hexsyntax.c:80
+msgid "hexdump: bad length value.\n"
+msgstr ""
+
+#: text-utils/hexsyntax.c:91
+msgid "hexdump: bad skip value.\n"
+msgstr ""
+
+#: text-utils/hexsyntax.c:129
+msgid ""
+"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+
+#: text-utils/more.c:329
+#, c-format
+msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr ""
+
+#: text-utils/more.c:504
+#, c-format
+msgid ""
+"\n"
+"*** %s: directory ***\n"
+"\n"
+msgstr ""
+
+#. simple ELF detection
+#: text-utils/more.c:543
+#, c-format
+msgid ""
+"\n"
+"******** %s: Not a text file ********\n"
+"\n"
+msgstr ""
+
+#: text-utils/more.c:647
+msgid "[Use q or Q to quit]"
+msgstr ""
+
+#: text-utils/more.c:833
+msgid "--More--"
+msgstr ""
+
+#: text-utils/more.c:835
+#, c-format
+msgid "(Next file: %s)"
+msgstr ""
+
+#: text-utils/more.c:841
+#, fuzzy
+msgid "[Press space to continue, 'q' to quit.]"
+msgstr "Premere un tasto per continuare"
+
+#: text-utils/more.c:1139
+#, c-format
+msgid "...back %d page"
+msgstr ""
+
+#: text-utils/more.c:1185
+#, c-format
+msgid "...skipping %d line"
+msgstr ""
+
+#: text-utils/more.c:1226
+msgid ""
+"\n"
+"***Back***\n"
+"\n"
+msgstr ""
+
+#: text-utils/more.c:1264
+msgid "Can't open help file"
+msgstr ""
+
+#: text-utils/more.c:1285 text-utils/more.c:1289
+msgid "[Press 'h' for instructions.]"
+msgstr ""
+
+#: text-utils/more.c:1324
+#, c-format
+msgid "\"%s\" line %d"
+msgstr ""
+
+#: text-utils/more.c:1326
+#, c-format
+msgid "[Not a file] line %d"
+msgstr ""
+
+#: text-utils/more.c:1410
+msgid " Overflow\n"
+msgstr ""
+
+#: text-utils/more.c:1457
+msgid "...skipping\n"
+msgstr ""
+
+#: text-utils/more.c:1487
+msgid "Regular expression botch"
+msgstr ""
+
+#: text-utils/more.c:1499
+msgid ""
+"\n"
+"Pattern not found\n"
+msgstr ""
+
+#: text-utils/more.c:1502
+msgid "Pattern not found"
+msgstr ""
+
+#: text-utils/more.c:1563
+msgid "can't fork\n"
+msgstr ""
+
+#: text-utils/more.c:1602
+msgid ""
+"\n"
+"...Skipping "
+msgstr ""
+
+#: text-utils/more.c:1606
+msgid "...Skipping "
+msgstr ""
+
+#: text-utils/more.c:1607
+msgid "to file "
+msgstr ""
+
+#: text-utils/more.c:1607
+msgid "back to file "
+msgstr ""
+
+#: text-utils/more.c:1846
+msgid "Line too long"
+msgstr ""
+
+#: text-utils/more.c:1890
+msgid "No previous command to substitute for"
+msgstr ""
+
+#: text-utils/odsyntax.c:133
+msgid "od: od(1) has been deprecated for hexdump(1).\n"
+msgstr ""
+
+#: text-utils/odsyntax.c:136
+#, c-format
+msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
+msgstr ""
+
+#: text-utils/odsyntax.c:137
+msgid "; see strings(1)."
+msgstr ""
+
+#: text-utils/parse.c:63
+#, c-format
+msgid "hexdump: can't read %s.\n"
+msgstr ""
+
+#: text-utils/parse.c:68
+msgid "hexdump: line too long.\n"
+msgstr ""
+
+#: text-utils/parse.c:406
+msgid "hexdump: byte count with multiple conversion characters.\n"
+msgstr ""
+
+#: text-utils/parse.c:490
+#, c-format
+msgid "hexdump: bad byte count for conversion character %s.\n"
+msgstr ""
+
+#: text-utils/parse.c:497
+msgid "hexdump: %%s requires a precision or a byte count.\n"
+msgstr ""
+
+#: text-utils/parse.c:503
+#, c-format
+msgid "hexdump: bad format {%s}\n"
+msgstr ""
+
+#: text-utils/parse.c:509
+msgid "hexdump: bad conversion character %%%s.\n"
+msgstr ""
+
+#: text-utils/rev.c:114
+msgid "Unable to allocate bufferspace\n"
+msgstr ""
+
+#: text-utils/rev.c:173
+msgid "usage: rev [file ...]\n"
+msgstr ""
+
+#: text-utils/ul.c:141
+#, c-format
+msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
+msgstr ""
+
+#: text-utils/ul.c:152
+msgid "trouble reading terminfo"
+msgstr ""
+
+#: text-utils/ul.c:241
+#, c-format
+msgid "Unknown escape sequence in input: %o, %o\n"
+msgstr ""
+
+#: text-utils/ul.c:398
+msgid "Unable to allocate buffer.\n"
+msgstr ""
+
+#: text-utils/ul.c:555
+msgid "Input line too long.\n"
+msgstr ""
+
+#: text-utils/ul.c:568
+msgid "Out of memory when growing buffer.\n"
+msgstr ""
+
+#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+msgstr ""
+
+#: kbd/kbdrate.c:247
+msgid "Cannot open /dev/port"
+msgstr ""
+
+#~ msgid "Linux/MINIX"
+#~ msgstr "Linux/MINIX"
+
+#~ msgid "DOS FAT16 (big)"
+#~ msgstr "DOS FAT16 (big)"
+
+#~ msgid "Hidden DOS FAT16 (big)"
+#~ msgstr "DOS FAT16 (big) nascosta"
+
+#~ msgid "Microport"
+#~ msgstr "Microport"
+
+#~ msgid "Old MINIX"
+#~ msgstr "Vecchio MINIX"
+
+#~ msgid "[%*s%-*s]"
+#~ msgstr "[%*s%-*s]"
+
+#~ msgid "%*s%-*s"
+#~ msgstr "%*s%-*s"
+
+#~ msgid "%.2f"
+#~ msgstr "%.2f"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "\t%s -v\n"
+#~ msgstr "\t%s -v\n"
+
+#~ msgid "\t%s -P {r|s|t} [options] device\n"
+#~ msgstr "\t%s -P {r|s|t} [opzioni] dispositivo\n"
+
+#~ msgid "Interactive use:\n"
+#~ msgstr "Uso interattivo:\n"
diff --git a/po/ja.po b/po/ja.po
index 86f795a79..a34e99693 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,13 +1,14 @@
-# util-linux 2.9t
+# Japanese messages for util-linux 2.10
+#
# Copyright (C) 1999 Free Software Foundation, Inc.
# Daisuke Yamashita <yamad@mb.infoweb.ne.jp>, 1999.
-# contains cfdisk translation by
+# includes cfdisk translation by
# Hidenobu NABETANI <nabetani@kern.phys.sci.osaka-u.ac.jp>
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.9t\n"
-"POT-Creation-Date: 1999-07-08 01:31+0900\n"
-"PO-Revision-Date: 1999-07-08 01:31+09:00\n"
+"Project-Id-Version: util-linux 2.10\n"
+"POT-Creation-Date: 1999-11-03 12:58+0900\n"
+"PO-Revision-Date: 1999-11-03 13:25+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: japanese <japo@flatout.org>\n"
"MIME-Version: 1.0\n"
@@ -54,16 +55,47 @@ msgstr "%s ¤Ď I/O ĄÝˇĽĄČĄ˘ĄŻĄ»Ąą¤¬¤Ç¤­¤Ţ¤»¤ó: iopl(3) ĄłˇĽĄë¤ËĽşÇÔˇŁ\n"
msgid "Probably you need root privileges.\n"
msgstr "¶˛¤é¤ŻĄëˇĽĄČ¸˘¸Â¤¬É¬ÍפǤąˇŁ\n"
-#: clock/hwclock.c:253
+#: clock/hwclock.c:213
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤¬%s»ţąď¤ňĘÝ»ý¤·¤Ć¤¤¤ë¤Č¤ß¤Ę¤·¤Ţ¤ą\n"
+
+#: clock/hwclock.c:214 clock/hwclock.c:303
+msgid "UTC"
+msgstr " UTC "
+
+#: clock/hwclock.c:214 clock/hwclock.c:302
+msgid "local"
+msgstr "ĄíˇĽĄ«Ąë"
+
+#: clock/hwclock.c:286
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr "%s: ·Ůąđ: adjtime ĄŐĄˇĄ¤Ąë¤Î»°ąÔĚܤňǧ¤á¤é¤ě¤Ţ¤»¤ó¤Ç¤·¤ż\n"
+
+#: clock/hwclock.c:288
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(´üÂÔ¤·¤ż¤Î¤Ď: `UTC', `LOCAL' ¤˘¤ë¤¤¤Ď˛ż¤â¤Ę¤¤¤«¤Ç¤ąˇŁ)\n"
+
+#: clock/hwclock.c:297
#, c-format
msgid "Last drift adjustment done at %d seconds after 1969\n"
msgstr "¤ş¤ě¤ÎşÇ˝Ş˝¤Ŕµ¤Ď 1969 ÇŻ°Ęąß %d ÉĂ»ţĹŔ¤ÇąÔ¤Ę¤ď¤ě¤Ţ¤·¤ż\n"
-#: clock/hwclock.c:255
+#: clock/hwclock.c:299
#, c-format
msgid "Last calibration done at %d seconds after 1969\n"
msgstr "şÇ˝ŞÄ´Ŕ°¤Ď 1969 ÇŻ°Ęąß %d ÉĂ»ţĹŔ¤ÇąÔ¤Ę¤ď¤ě¤Ţ¤·¤ż\n"
+#: clock/hwclock.c:301
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤Ď%s»ţąď¤Ç¤ą\n"
+
+#: clock/hwclock.c:303
+msgid "unknown"
+msgstr "ÉÔĚŔ¤Ę"
+
#. -----------------------------------------------------------------------------
#. Wait until the falling edge of the Hardware Clock's update flag so
#. that any time that is read from the clock immediately after we
@@ -78,39 +110,39 @@ msgstr "şÇ˝ŞÄ´Ŕ°¤Ď 1969 ÇŻ°Ęąß %d ÉĂ»ţĹŔ¤ÇąÔ¤Ę¤ď¤ě¤Ţ¤·¤ż\n"
#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
#.
#. -----------------------------------------------------------------------------
-#: clock/hwclock.c:278
+#: clock/hwclock.c:325
msgid "Waiting for clock tick...\n"
msgstr "ĄŻĄíĄĂĄŻĄÁĄĂĄŻ¤ňÂԤäƤ¤¤Ţ¤ą...\n"
-#: clock/hwclock.c:282
+#: clock/hwclock.c:329
msgid "...got clock tick\n"
msgstr "ĄŻĄíĄĂĄŻĄÁĄĂĄŻ¤ňĽčĆŔ¤·¤Ţ¤·¤ż\n"
-#: clock/hwclock.c:334
+#: clock/hwclock.c:381
#, c-format
msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤ËÉÔŔµ¤ĘĂÍ: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: clock/hwclock.c:343
+#: clock/hwclock.c:390
#, c-format
msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ»ţąď : %.2d:%.2d:%.2d = 1969 ÇŻ°ĘÍč %d ÉĂ\n"
-#: clock/hwclock.c:369
+#: clock/hwclock.c:416
#, c-format
msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤«¤éĆÉąţ¤ó¤Ŕ»ţąď: %02d:%02d:%02d\n"
-#: clock/hwclock.c:395
+#: clock/hwclock.c:442
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
msgstr "ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤ň %.2d:%.2d:%.2d ¤ËŔßÄę = 1969 ÇŻ°ĘÍč %d ÉĂ\n"
-#: clock/hwclock.c:401
+#: clock/hwclock.c:448
msgid "Clock not changed - testing only.\n"
msgstr "ĄŻĄíĄĂĄŻ¤ňĘŃąą¤·¤Ţ¤»¤ó¤Ç¤·¤ż -- ĄĆĄąĄČ¤Ŕ¤±¤Ç¤ąˇŁ\n"
-#: clock/hwclock.c:449
+#: clock/hwclock.c:496
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -119,7 +151,7 @@ msgstr ""
"»ţąď¤ň»˛ľČ¤·¤ż»ţĹŔ¤«¤é %.6f É÷вᡣ\n"
"Ľˇ¤Î´°Á´¤ĘÉäޤÇĂ٤餻¤Ţ¤ąˇŁ\n"
-#: clock/hwclock.c:473
+#: clock/hwclock.c:520
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"
@@ -133,18 +165,18 @@ msgstr ""
#.
#. Compute display value for time
#. Cut off trailing newline
-#: clock/hwclock.c:485
+#: clock/hwclock.c:532
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f ÉĂ\n"
-#: clock/hwclock.c:519
+#: clock/hwclock.c:566
msgid "No --date option specified.\n"
msgstr "--date ĄŞĄ×Ą·ĄçĄó¤¬»ŘÄꤵ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
#. Quotation marks in date_opt would ruin the date command we construct.
#.
-#: clock/hwclock.c:524
+#: clock/hwclock.c:571
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -152,23 +184,23 @@ msgstr ""
"--date ĄŞĄ×Ą·ĄçĄó¤ÎĂͤ¬Ŕµ¤·¤¤ĆüÉդǤϤ˘¤ę¤Ţ¤»¤óˇŁ\n"
"Ćäˡ˘ĄŻĄ©ˇĽĄĆˇĽĄ·ĄçĄóĄŢˇĽĄŻ¤¬´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤ąˇŁ\n"
-#: clock/hwclock.c:530
+#: clock/hwclock.c:577
#, c-format
msgid "Issuing date command: %s\n"
msgstr "date ĄłĄŢĄóĄÉ¤ňČŻąÔ¤·¤Ţ¤ą: %s\n"
-#: clock/hwclock.c:534
+#: clock/hwclock.c:581
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"/bin/sh Ą·Ą§ĄëĄ×ĄíĄ°ĄéĄŕ¤Ç 'date' ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
"popen() ¤¬ĽşÇÔ¤·¤Ţ¤·¤żˇŁ"
-#: clock/hwclock.c:540
+#: clock/hwclock.c:587
#, c-format
msgid "response from date command = %s\n"
msgstr "date ĄłĄŢĄóĄÉ¤«¤é¤ÎĘÖĹú = %s\n"
-#: clock/hwclock.c:542
+#: clock/hwclock.c:589
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -183,7 +215,7 @@ msgstr ""
"¤˝¤ÎĘÖĹú¤Ď:\n"
" %s\n"
-#: clock/hwclock.c:551
+#: clock/hwclock.c:598
#, c-format
msgid ""
"The date command issued by %s returnedsomething other than an integer where "
@@ -200,12 +232,12 @@ msgstr ""
"¤˝¤ÎĘÖĹú¤Ď:\n"
" %s\n"
-#: clock/hwclock.c:561
+#: clock/hwclock.c:608
#, c-format
msgid "date string %s equates to %d seconds since 1969.\n"
msgstr "date ʸ»úÎó %s ¤ň 1969 ÇŻ°ĘÍč %d Éäȸ«¤Ę¤·¤Ţ¤ąˇŁ\n"
-#: clock/hwclock.c:596
+#: clock/hwclock.c:643
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -213,46 +245,46 @@ msgstr ""
"ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤Ďˇ˘Ŕµ¤·¤¤»ţąď¤ň´Ţ¤ó¤Ç¤¤¤Ę¤¤¤Î¤Çˇ˘¤ł¤ł¤«¤éĆŔ¤é¤ě¤żĂͤň\n"
"Ą·ĄąĄĆĄŕ»ţąď¤ËŔßÄę¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:612
+#: clock/hwclock.c:659
msgid "Calling settimeofday:\n"
msgstr "settimeofday ¤ňĄłˇĽĄë¤·¤Ţ¤ą:\n"
-#: clock/hwclock.c:613
+#: clock/hwclock.c:660
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: clock/hwclock.c:615
+#: clock/hwclock.c:662
#, c-format
msgid "\ttz.tz_minuteswest = %ld\n"
msgstr "\ttz.tz_minuteswest = %ld\n"
-#: clock/hwclock.c:618
+#: clock/hwclock.c:665
msgid "Not setting system clock because running in test mode.\n"
msgstr "ĄĆĄąĄČĄâˇĽĄÉ¤ÇĆ°şî¤·¤Ć¤¤¤ë¤ż¤áˇ˘Ą·ĄąĄĆĄŕĄŻĄíĄĂĄŻ¤ňŔßÄꤷ¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:630
+#: clock/hwclock.c:677
msgid "Must be superuser to set system clock.\n"
msgstr "Ą·ĄąĄĆĄŕĄŻĄíĄĂĄŻ¤ňŔßÄꤹ¤ë¤Ë¤Ďˇ˘ĄąˇĽĄŃˇĽĄćˇĽĄ¶¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:632
+#: clock/hwclock.c:679
msgid "settimeofday() failed"
msgstr "settimeofday() ĄłˇĽĄë¤ËĽşÇÔ"
-#: clock/hwclock.c:665
+#: clock/hwclock.c:712
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
msgstr ""
"ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤Ë°ĘÁ°¤ÎĄ´Ąß¤¬´Ţ¤Ţ¤ě¤Ć¤Ş¤ęˇ˘¤ş¤ě¤ň˝¤Ŕµ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:669
+#: clock/hwclock.c:716
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
msgstr "Á°˛ó¤ÎÄ´Ŕ°°ĘÍ衢ľŻ¤Ę¤Ż¤Č¤â°ěĆü·Đ˛á¤·¤Ę¤¤¤Čˇ˘¤ş¤ě¤ň˝¤Ŕµ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:678
+#: clock/hwclock.c:725
#, c-format
msgid ""
"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -263,21 +295,21 @@ msgstr ""
"ÉĂ\n"
"¤ş¤ě¤Ţ¤·¤żˇŁ°ěĆü¤˘¤ż¤ę %4$f É交ě¤ň˝¤Ŕµ¤·¤Ţ¤ą\n"
-#: clock/hwclock.c:729
+#: clock/hwclock.c:776
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "şÇ˝Ş˝¤Ŕµ»ţąď¤«¤é %d ÉäǤą\n"
-#: clock/hwclock.c:731
+#: clock/hwclock.c:778
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "%d ÉäÎÁŢĆţ¤Čˇ˘%.6f ÉĂÁ°¤Î»ţąď¤Î»˛ľČ¤¬É¬ÍפǤą\n"
-#: clock/hwclock.c:759
+#: clock/hwclock.c:807
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "ĄĆĄąĄČĄâˇĽĄÉ¤ÇĆ°şî¤·¤Ć¤¤¤ë¤ż¤á adjtime ĄŐĄˇĄ¤Ąë¤ňąąż·¤·¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:760
+#: clock/hwclock.c:808
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -286,35 +318,35 @@ msgstr ""
"ËÜÍč¤Ę¤é¤Đ %s ¤Ë°Ę˛Ľ¤Î¤č¤¦¤Ë˝ń¤­ąţ¤Ţ¤ě¤ë¤Ď¤ş¤Ç¤·¤ż:\n"
"%s"
-#: clock/hwclock.c:784
+#: clock/hwclock.c:832
msgid "Drift adjustment parameters not updated.\n"
msgstr "¤ş¤ě¤Î˝¤ŔµĂͤϹąż·¤µ¤ě¤Ţ¤»¤ó¤Ç¤·¤żˇŁ\n"
-#: clock/hwclock.c:825
+#: clock/hwclock.c:873
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤Ďˇ˘Ŕµľď¤Ę»ţąď¤ň´Ţ¤ó¤Ç¤¤¤Ę¤¤¤Î¤Çˇ˘¤ł¤ě¤ň˝¤Ŕµ¤Ç¤­¤Ţ¤»¤óˇŁ"
"\n"
-#: clock/hwclock.c:849
+#: clock/hwclock.c:897
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "ɬÍפʽ¤Ŕµ¤¬°ěÉĂ̤Ëţ¤Ę¤Î¤Çˇ˘ĄŻĄíĄĂĄŻ¤ňŔßÄꤷ¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:875
+#: clock/hwclock.c:923
#, c-format
msgid "Using %s.\n"
msgstr "%s ¤ň»Č¤¤¤Ţ¤ąˇŁ\n"
-#: clock/hwclock.c:877
+#: clock/hwclock.c:925
msgid "No usable clock interface found.\n"
msgstr "ÍřÍѲÄÇ˝¤ĘĄŻĄíĄĂĄŻĄ¤ĄóĄżˇĽĄŐĄ§Ą¤Ąą¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:965
+#: clock/hwclock.c:1020
msgid "Unable to set system clock.\n"
msgstr "Ą·ĄąĄĆĄŕĄŻĄíĄĂĄŻ¤ňŔßÄę¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:994
+#: clock/hwclock.c:1049
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -327,16 +359,16 @@ msgstr ""
"¤ł¤Î hwclock ¤ÎĘŁŔ˝¤Ď Alpha °Ęł°¤ÎĄŢĄ·Ąó¤ÇĄÓĄëĄÉ¤µ¤ě¤Ţ¤·¤ż\n"
"(¤˝¤·¤ĆĹöÁłˇ˘¸˝şß Alpha ľĺ¤ÇĽÂąÔ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó)ˇŁĽÂąÔ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:1003
+#: clock/hwclock.c:1058
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Ą«ˇĽĄÍĄë¤«¤éĄ¨ĄÝĄĂĄŻĂͤňĽčĆŔ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:1005
+#: clock/hwclock.c:1060
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Ą«ˇĽĄÍĄë¤ĎĄ¨ĄÝĄĂĄŻĂͤň %lu ¤ČÁŰÄꤷ¤Ć¤¤¤Ţ¤ą\n"
-#: clock/hwclock.c:1008
+#: clock/hwclock.c:1063
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -344,21 +376,21 @@ msgstr ""
"Ą¨ĄÝĄĂĄŻĂͤňŔßÄꤹ¤ë¤ż¤á¤Ë¤Ďˇ˘˛ż¤ÎĂͤňŔßÄꤹ¤ë¤«¤ňĂΤ餻¤ë¤ż¤á¤Ë 'epoch'\n"
"ĄŞĄ×Ą·ĄçĄó¤ň»Č¤ď¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:1011
+#: clock/hwclock.c:1066
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Ą¨ĄÝĄĂĄŻ¤ň %d ¤ËŔßÄꤷ¤Ţ¤»¤ó -- ĄĆĄąĄČ¤Ŕ¤±¤Ç¤ąˇŁ\n"
-#: clock/hwclock.c:1014
+#: clock/hwclock.c:1069
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Ą«ˇĽĄÍĄë¤ËĄ¨ĄÝĄĂĄŻĂͤňŔßÄꤹ¤ë¤ł¤Č¤¬¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤żˇŁ\n"
-#: clock/hwclock.c:1094
+#: clock/hwclock.c:1151
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s ¤Ď˛ż¤é¤«¤ÎĄŞĄ×Ą·ĄçĄó°úżô¤ňĽč¤ę¤Ţ¤ąˇŁ¤˘¤Ę¤ż¤Ď %d ¸ÄÍż¤¨¤Ţ¤·¤żˇŁ\n"
-#: clock/hwclock.c:1102
+#: clock/hwclock.c:1159
msgid ""
"You have specified multiple function options.\n"
"You can only perform one function at a time.\n"
@@ -366,16 +398,23 @@ msgstr ""
"¤˘¤Ę¤ż¤ĎµˇÇ˝ĄŞĄ×Ą·ĄçĄó¤ňĘŁżô¸Ä»ŘÄꤷ¤Ţ¤·¤żˇŁ\n"
"°ěĹ٤˰ě¤Ä¤ÎµˇÇ˝¤Î¤ßąÔ¤Ę¤¦¤ł¤Č¤¬¤Ç¤­¤Ţ¤ąˇŁ\n"
-#: clock/hwclock.c:1115
+#: clock/hwclock.c:1165
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive. You specified "
+"both.\n"
+msgstr "%s: --utc ¤Č --localtime ĄŞĄ×Ą·ĄçĄó¤ĎÁę¸ßÇÓ¾Ū¤Ç¤ą¤¬ˇ˘ÎľĘý¤¬»ŘÄꤵ¤ě¤Ţ¤·¤żˇŁ\n"
+
+#: clock/hwclock.c:1178
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Í­¸ú¤ĘŔßÄę»ţąď¤¬¤˘¤ę¤Ţ¤»¤óˇŁĄŻĄíĄĂĄŻ¤ňŔßÄę¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:1130
+#: clock/hwclock.c:1193
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr ""
"»ÄÇ°¤Ę¤¬¤éˇ˘ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤ÎĘŃąą¤ĎĄąˇĽĄŃˇĽĄćˇĽĄ¶¤Ç¤·¤«ąÔ¤Ę¤¨¤Ţ¤»¤óˇŁ\n"
-#: clock/hwclock.c:1134
+#: clock/hwclock.c:1197
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -383,7 +422,7 @@ msgstr ""
"»ÄÇ°¤Ę¤¬¤éˇ˘Ą«ˇĽĄÍĄëĆâ¤ÎĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤ÎĄ¨ĄÝĄĂĄŻĂͤňĘŃąą¤Ç¤­¤ë¤Î¤Ďˇ˘\n"
"ĄąˇĽĄŃˇĽĄćˇĽĄ¶¤Ŕ¤±¤Ç¤ąˇŁ\n"
-#: clock/hwclock.c:1150
+#: clock/hwclock.c:1213
msgid ""
"Cannot access the Hardware Clock via any known method. Use --debug option "
"to see the details of our search for an access method.\n"
@@ -391,40 +430,35 @@ msgstr ""
"Ą×ĄíĄ°ĄéĄŕ¤¬ĂΤë¸Â¤ę¤ÎĘýˡ¤Ç¤Ďˇ˘ĄĎˇĽĄÉĄ¦Ą§Ą˘ĄŻĄíĄĂĄŻ¤ËĄ˘ĄŻĄ»Ąą¤Ç¤­¤Ţ¤»¤óˇŁ\n"
"--debug ĄŞĄ×Ą·ĄçĄó¤ÇĄ˘ĄŻĄ»ĄąĘýˡ¸ˇş÷¤ÎľÜşŮ¤Ë¤Ä¤¤¤Ć¸«¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: clock/hwclock.c:1164
-#, c-format
-msgid "%s: %s, errno=%d: %s.\n"
-msgstr "%s: %s, Ą¨ĄéˇĽČÖąć=%d: %s.\n"
-
-#: clock/kd.c:40
+#: clock/kd.c:41
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "KDGHWCLK ¤«¤éĘŃąą¤Î¤ż¤á¤Î»ţąď¤ňĽčĆŔ¤ą¤ëĄëˇĽĄ×Ăć¤Ç¤ą\n"
-#: clock/kd.c:43
+#: clock/kd.c:44
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK ¤Î»ţąďĆɤ߼č¤ę¤¬ĽşÇÔ¤·¤Ţ¤·¤ż"
-#: clock/kd.c:50 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:144
msgid "Timed out waiting for time change.\n"
msgstr "»ţąďĘŃąąÂÔ¤Á¤¬ĄżĄ¤ĄŕĄ˘Ą¦ĄČ¤·¤Ţ¤·¤żˇŁ\n"
-#: clock/kd.c:54
+#: clock/kd.c:69
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "»ţąďĆɤ߹ţ¤ß¤Î¤ż¤á¤Î KDGHWCLK ioctl ¤¬ĄëˇĽĄ×Ćâ¤ÇĽşÇÔ¤·¤Ţ¤·¤ż"
-#: clock/kd.c:76
+#: clock/kd.c:91
msgid "ioctl() failed to read time from /dev/tty1"
msgstr "/dev/tty1 ¤«¤é»ţąď¤ňĆÉąţ¤ŕ¤ż¤á¤Î ioctl() ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
-#: clock/kd.c:112
+#: clock/kd.c:127
msgid "ioctl() to open /dev/tty1 failed"
msgstr "/dev/tty1 ¤ňĄŞˇĽĄ×Ąó¤ą¤ë¤ż¤á¤Î ioctl ¤¬ĽşÇÔ¤·¤Ţ¤·¤ż"
-#: clock/kd.c:142
+#: clock/kd.c:157
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK ioctl ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
-#: clock/kd.c:146
+#: clock/kd.c:161
msgid "Can't open /dev/tty1"
msgstr "/dev/tty1 ¤ňł«¤±¤Ţ¤»¤ó"
@@ -611,40 +645,45 @@ msgstr "Îľ"
msgid "Single"
msgstr "ĘŇ"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:198
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "»Č¤¤Ęý: %s [ -larvsmf ] /dev/name\n"
+
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr "%s ¤ĎĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ţ¤ą\t "
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr "ËÜĹö¤ËÂł¤±¤Ţ¤ą¤«"
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr "ĄÁĄ§ĄĂĄŻ¤ňĂć»ß¤·¤Ţ¤·¤ż\n"
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
-msgstr ""
+msgstr "Zone nr < FIRSTZONE in file `"
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
-msgstr ""
+msgstr "Zone nr >= ZONES in file `"
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
msgstr "ĄÖĄíĄĂĄŻ¤Îşď˝ü"
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
msgid "Read error: unable to seek to block in file '"
msgstr "ĆÉąţĄ¨ĄéˇĽ: ĄŐĄˇĄ¤ĄëĂć¤ÎĄÖĄíĄĂĄŻ¤Ë°ÜĆ°¤Ç¤­¤Ţ¤»¤ó '"
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
msgid "Read error: bad block in file '"
msgstr "ĆÉąţĄ¨ĄéˇĽ: ĄŐĄˇĄ¤Ąë¤ËÉÔŔµĄÖĄíĄĂĄŻ¤¬¤˘¤ę¤Ţ¤ą '"
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
@@ -652,45 +691,121 @@ msgstr ""
"ĆâÉôĄ¨ĄéˇĽ: ÉÔŔµĄÖĄíĄĂĄŻ¤Ř¤Î˝ń¤­ąţ¤ß\n"
"˝ń¤­ąţ¤ßÍ×µá¤Ď̵»ë¤µ¤ě¤Ţ¤ą\n"
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr "˝ń¤­ąţ¤ßĄÖĄíĄĂĄŻĆâ¤ÎĄ·ˇĽĄŻ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
-msgstr "˝ń¤­ąţ¤ßĄ¨ĄéˇĽ: ĄŐĄˇĄ¤ĄëĂć¤ËÉÔŔµĄÖĄíĄĂĄŻ¤¬¤˘¤ę¤Ţ¤ą '"
+msgstr "˝ń¤­ąţ¤ßĄ¨ĄéˇĽ: ĄŐĄˇĄ¤Ąë¤ÎĂć¤ËÉÔŔµĄÖĄíĄĂĄŻ¤¬¤˘¤ę¤Ţ¤ą '"
+
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr "ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ˝ńąţ»ţ¤ÎĄŐĄˇĄ¤ĄëĄ·ˇĽĄŻ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr "ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr "inode ĄŢĄĂĄ×¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr "ĄľˇĽĄóĄŢĄĂĄ×¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr "inode ¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr "Ą·ˇĽĄŻ¤ËĽşÇÔ"
+
+#: disk-utils/fsck.minix.c:560
+msgid "unable to read super block"
+msgstr "ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr "ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤ËÉÔŔµ¤ĘĄŢĄ¸ĄĂĄŻĄĘĄóĄĐˇĽ¤¬¤˘¤ę¤Ţ¤ą"
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr "Only 1k blocks/zones supported"
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr "bad s_imap_blocks field in super-block"
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "bad s_zmap_blocks field in super-block"
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr "inode ĄŢĄĂĄ×ÍŃĄĐĄĂĄŐĄˇ¤ÎłÎĘݤ¬¤Ç¤­¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr "inode ÍŃĄĐĄĂĄŐĄˇ¤ÎłÎĘݤ¬¤Ç¤­¤Ţ¤»¤óˇŁ"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr "inode Ą«Ą¦ĄóĄżÍŃĄĐĄĂĄŐĄˇ¤ÎłÎĘݤ¬¤Ç¤­¤Ţ¤»¤óˇŁ"
#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr "ĄľˇĽĄóĄ«Ą¦ĄóĄżÍŃĄĐĄĂĄŐĄˇ¤ÎłÎĘݤ¬¤Ç¤­¤Ţ¤»¤óˇŁ"
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr "inode ĄŢĄĂĄ×¤¬ĆÉąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr "ĄľˇĽĄóĄŢĄĂĄ×¤¬ĆÉąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr "inode ¤ňĆÉąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
-msgstr ""
+msgstr "Warning: Firstzone != Norm_firstzone\n"
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
#, c-format
msgid "%ld inodes\n"
msgstr "inode żô %ld\n"
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
#, c-format
msgid "%ld blocks\n"
msgstr "ĄÖĄíĄĂĄŻżô %ld\n"
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
-msgstr ""
+msgstr "Firstdatazone=%ld (%ld)\n"
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
#, c-format
msgid "Zonesize=%d\n"
-msgstr ""
+msgstr "Zone ĄµĄ¤Ąş=%d\n"
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr "şÇÂ祵Ą¤Ąş=%ld\n"
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr "ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕľőÂÖ=%d\n"
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
@@ -699,143 +814,175 @@ msgstr ""
"ĚľÁ°¤ÎÄą¤µ=%d\n"
"\n"
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
-msgstr ""
+msgstr "Inode %d ¤ĎÉÔ»ČÍѥޡĽĄŻ¤µ¤ě¤Ć¤¤¤Ţ¤ą¤¬ˇ˘Ľˇ¤ÎĄŐĄˇĄ¤Ąë¤¬ÍřÍѤ·¤Ć¤¤¤Ţ¤ą '"
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
-msgstr ""
+msgstr "»ČÍѥޡĽĄŻ"
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
-msgstr ""
+msgstr " ¤ĎĄâˇĽĄÉ %05o\n"
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr "·Ůąđ: inode żô¤¬Â礭¤ą¤®¤Ţ¤ąˇŁ\n"
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr "root inode ¤¬ĄÇĄŁĄěĄŻĄČĄę¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
-msgstr ""
+msgstr "ĄÖĄíĄĂĄŻ¤Ď°ĘÁ°¤«¤éÍřÍѤµ¤ě¤Ć¤¤¤Ţ¤ąˇŁ¸˝şß¤ĎĄŐĄˇĄ¤Ąë `"
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr "ĄŻĄęĄ˘"
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
-msgstr ""
+msgstr "ĄÖĄíĄĂĄŻ %d in ĄŐĄˇĄ¤Ąë `"
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
-msgstr ""
+msgstr "' ¤¬ÉÔ»ČÍѥޡĽĄŻ"
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
-msgstr ""
+msgstr "Ŕµ¤·¤¤"
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
-msgstr ""
+msgstr " ¤ĎÉÔŔµ inode ČÖąć¤ň»ý¤Á¤Ţ¤ą: ĄŐĄˇĄ¤Ąë '"
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
-msgstr ""
+msgstr " şď˝ü"
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
-msgstr ""
+msgstr ": ÉÔŔµ¤ĘĄÇĄŁĄěĄŻĄČĄę: '.' ¤¬şÇ˝é¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
-msgstr ""
+msgstr ": ÉÔŔµ¤ĘĄÇĄŁĄěĄŻĄČĄę: '..' ¤¬ 2 ČÖĚܤǤϤ˘¤ę¤Ţ¤»¤ó\n"
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+msgid "internal error"
+msgstr "ĆâÉôĄ¨ĄéˇĽ"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
-msgstr ""
+msgstr ": ÉÔŔµ¤ĘĄÇĄŁĄěĄŻĄČĄę: ĄµĄ¤Ąş¤¬ 32 ̤Ëţ"
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
-msgstr ""
+msgstr ": ÉÔŔµ¤ĘĄÇĄŁĄěĄŻĄČĄę: ĄµĄ¤Ąş¤¬ 32 ̤Ëţ"
+
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr "ÉÔŔµ¤Ę zone ¤Ç¤ÎĄ·ˇĽĄŻ¤ËĽşÇÔ"
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
-msgstr ""
+msgstr "Inode %d ¤ÎĄâˇĽĄÉ¤ĎĄŻĄęĄ˘¤µ¤ě¤şˇŁ"
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
#, c-format
msgid "Inode %d not used, marked used in the bitmap."
-msgstr ""
+msgstr "inode %d ¤Ď»Č¤ď¤ě¤Ţ¤»¤ó¤¬ˇ˘ĄÓĄĂĄČĄŢĄĂĄ×¤Ç¤Ď»ČÍѥޡĽĄŻ¤¬ÉŐ¤¤¤Ć¤¤¤Ţ¤ą"
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
-msgstr ""
+msgstr "inode %d ¤¬»ČÍѤµ¤ě¤Ţ¤ą¤¬ˇ˘ĄÓĄĂĄČĄŢĄĂĄ×¤Ç¤ĎÉÔ»ČÍѥޡĽĄŻ¤¬ÉŐ¤¤¤Ć¤¤¤Ţ¤ą"
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr ""
+msgstr "inode %d (ĄâˇĽĄÉ = %07o), i_nlinks=%d, counted=%d."
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
-msgstr ""
+msgstr "i_nlinks ¤ÎĂͤň count ¤ËŔßÄꤷ¤Ţ¤·¤ż"
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
#, c-format
msgid "Zone %d: marked in use, no file uses it."
-msgstr ""
+msgstr "Zone %d: ÍřÍѥޡĽĄŻ¤¬ÉŐ¤¤¤Ć¤¤¤Ţ¤ą¤¬ˇ˘¤É¤ÎĄŐĄˇĄ¤Ąë¤â»Č¤Ă¤Ć¤¤¤Ţ¤»¤ó"
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
-msgstr ""
+msgstr "ĄŢˇĽĄŻ¤Ę¤·"
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
-msgstr ""
+msgstr "Zone %d: %s»ČÍѡ˘counted=%d\\n\n"
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
-msgstr ""
+msgstr "ÉÔ"
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
msgid "Set"
-msgstr ""
+msgstr "ŔßÄę"
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr "ÉÔŔµ¤Ę inode ĄµĄ¤Ąş"
+
+#: disk-utils/fsck.minix.c:1257
+msgid "bad v2 inode size"
+msgstr "ÉÔŔµ¤Ę v2 inode ĄµĄ¤Ąş"
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr "ÂĐĎĂĹŞ¤Ę˝¤Éü¤ňąÔ¤Ę¤¦°ŮĂĽËö¤¬É¬ÍפǤą"
+
+#: disk-utils/fsck.minix.c:1287
+#, c-format
+msgid "unable to open '%s'"
+msgstr "'%s' ¤ňł«¤±¤Ţ¤»¤ó"
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
-msgstr ""
+msgstr "%s ¤ĎĄŻĄęˇĽĄó¤Ç¤ąˇ˘ĄÁĄ§ĄĂĄŻ¤·¤Ţ¤»¤óˇŁ\n"
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
-msgstr ""
+msgstr "¶ŻŔ©ĹŞ¤Ë %s ¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¸ˇşş¤·¤Ţ¤ąˇŁ\n"
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr ""
+msgstr "%s ¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤Ď±ř¤ě¤Ć¤Ş¤ęˇ˘¸ˇşş¤¬É¬ÍפǤąˇŁ\n"
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
msgstr ""
+"\n"
+"%6ld iĄÎˇĽĄÉ¤¬»Č¤ď¤ě¤ż (%ld%%)\n"
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
-msgstr ""
+msgstr "%6ld zone ¤¬»Č¤ď¤ě¤ż (%ld%%)\n"
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -848,28 +995,41 @@ msgid ""
"------\n"
"%6d files\n"
msgstr ""
+"\n"
+"%6d ÄĚľďĄŐĄˇĄ¤Ąë\n"
+"%6d ĄÇĄŁĄěĄŻĄČĄę\n"
+"%6d Ą­ĄăĄéĄŻĄżĄÇĄôĄˇĄ¤ĄąĄŐĄˇĄ¤Ąë\n"
+"%6d ĄÖĄíĄĂĄŻĄÇĄôĄˇĄ¤ĄąĄŐĄˇĄ¤Ąë\n"
+"%6d ĄĎˇĽĄÉĄęĄóĄŻ\n"
+"%6d Ą·ĄóĄÜĄęĄĂĄŻĄęĄóĄŻ\n"
+"------\n"
+"%6d ĄŐĄˇĄ¤Ąë\n"
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
"----------------------------\n"
msgstr ""
+"----------------------------------\n"
+"*ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤¬ĘŃąą¤µ¤ě¤Ţ¤·¤ż*\n"
+"----------------------------------\n"
#: disk-utils/mkfs.c:66
msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
msgstr ""
"»Č¤¤Ęý: mkfs [-V] [-t ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ·ż] [fs ĄŞĄ×Ą·ĄçĄó] ĄÇĄĐĄ¤Ąą [ĄµĄ¤Ąş]\n"
-#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:328 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:221 mount/sundries.c:195
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
msgstr "%s: ĄáĄâĄę¤¬Â­¤ę¤Ţ¤»¤óˇŞ\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
-msgstr "mkfs ĄĐˇĽĄ¸ĄçĄó "
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs ĄĐˇĽĄ¸ĄçĄó %s (%s)\n"
#: disk-utils/mkfs.minix.c:186
#, c-format
@@ -883,7 +1043,7 @@ msgstr "%s ¤ĎĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ţ¤ą -- ¤ł¤ł¤Ë¤ĎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤ň¤Ä¤Ż¤ě¤Ţ¤»¤óˇŞ"
#: disk-utils/mkfs.minix.c:271
msgid "seek to boot block failed in write_tables"
-msgstr ""
+msgstr "write_tables ¤Ç¤ÎĄÖˇĽĄČĄÖĄíĄĂĄŻ¤Ř¤ÎĄ·ˇĽĄŻ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
#: disk-utils/mkfs.minix.c:273
msgid "unable to clear boot sector"
@@ -891,11 +1051,7 @@ msgstr "ĄÖˇĽĄČĄ»ĄŻĄż¤ňĄŻĄęĄ˘¤Ç¤­¤Ţ¤»¤ó"
#: disk-utils/mkfs.minix.c:275
msgid "seek failed in write_tables"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr "ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤Î˝ń¤­ąţ¤ß¤¬¤Ç¤­¤Ţ¤»¤ó"
+msgstr "write_tables ¤Ç¤ÎĄ·ˇĽĄŻ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
@@ -909,13 +1065,9 @@ msgstr "ĄľˇĽĄóĄŢĄĂĄ×¤Î˝ń¤­ąţ¤ß¤¬¤Ç¤­¤Ţ¤»¤ó"
msgid "unable to write inodes"
msgstr "inode ¤Î˝ń¤­ąţ¤ß¤¬¤Ç¤­¤Ţ¤»¤ó"
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:292
msgid "write failed in write_block"
-msgstr ""
+msgstr "write_block ¤Ç¤Î˝ń¤­ąţ¤ß¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
#. Could make triple indirect block here
#: disk-utils/mkfs.minix.c:300 disk-utils/mkfs.minix.c:374
@@ -946,19 +1098,19 @@ msgstr ""
#: disk-utils/mkfs.minix.c:546
msgid "seek failed during testing of blocks"
-msgstr ""
+msgstr "ĄÖĄíĄĂĄŻ¤ÎĄĆĄąĄČĂć¤ËĄ·ˇĽĄŻ¤¬ĽşÇÔ¤·¤Ţ¤·¤ż"
#: disk-utils/mkfs.minix.c:554
msgid "Weird values in do_check: probably bugs\n"
-msgstr ""
+msgstr "do_check ¤ËĘѤĘĂͤ¬¤˘¤ę¤Ţ¤ą: ¿ʬĄĐĄ°¤Ç¤·¤ç¤¦\n"
-#: disk-utils/mkfs.minix.c:585
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
msgid "seek failed in check_blocks"
-msgstr ""
+msgstr "check_blocks ¤Ç¤ÎĄ·ˇĽĄŻ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
#: disk-utils/mkfs.minix.c:594
msgid "bad blocks before data-area: cannot make fs"
-msgstr ""
+msgstr "ĄÇˇĽĄżÎΰč°ĘÁ°¤ËÉÔŔµĄÖĄíĄĂĄŻ: ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤ňşîŔ®¤Ç¤­¤Ţ¤»¤ó"
#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
#, c-format
@@ -971,11 +1123,7 @@ msgstr "ÉÔŔµĄÖĄíĄĂĄŻżô 1\n"
#: disk-utils/mkfs.minix.c:614
msgid "can't open file of bad blocks"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
-msgid "bad inode size"
-msgstr ""
+msgstr "ÉÔŔµĄÖĄíĄĂĄŻ¤ÎĄŐĄˇĄ¤Ąë¤ňł«¤±¤Ţ¤»¤ó"
#: disk-utils/mkfs.minix.c:669
#, c-format
@@ -984,7 +1132,7 @@ msgstr "%s: minix v2 ¤ÎĄµĄÝˇĽĄČ¤Ä¤­¤ÇĄłĄóĄŃĄ¤Ąë¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
#: disk-utils/mkfs.minix.c:685
msgid "strtol error: number of blocks not specified"
-msgstr ""
+msgstr "strtol Ą¨ĄéˇĽ: ĄÖĄíĄĂĄŻ¤Îżô¤¬»ŘÄꤵ¤ě¤Ţ¤»¤ó¤Ç¤·¤ż"
#: disk-utils/mkfs.minix.c:717
#, c-format
@@ -999,48 +1147,71 @@ msgstr "%s ¤ÎľőÂÖ¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
#: disk-utils/mkfs.minix.c:723
#, c-format
msgid "will not try to make filesystem on '%s'"
-msgstr ""
+msgstr "'%s' ľĺ¤ËĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤ňşî¤é¤Ę¤¤¤č¤¦¤Ë¤·¤Ţ¤ą"
#: disk-utils/mkswap.c:101
#, c-format
msgid "Assuming pages of size %d\n"
-msgstr "ĄµĄ¤Ąş %s ĄÚˇĽĄ¸¤ň»î¤·¤Ţ¤ą\n"
+msgstr "ĄµĄ¤Ąş %d ĄÚˇĽĄ¸¤ň»î¤·¤Ţ¤ą\n"
+
+#: disk-utils/mkswap.c:185
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr "»Č¤¤Ęý: %s [-c] [-v0|-v1] /dev/name [ĄÖĄíĄĂĄŻżô]\n"
+
+#: disk-utils/mkswap.c:208
+msgid "too many bad pages"
+msgstr "ÉÔŔµĄÚˇĽĄ¸¤¬Âż¤ą¤®¤Ţ¤ą"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1100
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
+msgstr "ĄáĄâĄę¤¬Â­¤ę¤Ţ¤»¤ó"
-#: disk-utils/mkswap.c:234
+#: disk-utils/mkswap.c:239
msgid "one bad page\n"
msgstr "ÉÔŔµ¤ĘĄÚˇĽĄ¸żô 1\n"
-#: disk-utils/mkswap.c:236
+#: disk-utils/mkswap.c:241
#, c-format
msgid "%d bad pages\n"
msgstr "ÉÔŔµ¤ĘĄÚˇĽĄ¸żô %d\n"
-#: disk-utils/mkswap.c:340
+#: disk-utils/mkswap.c:345
#, c-format
msgid "%s: error: Nowhere to set up swap on?\n"
msgstr "%s: Ą¨ĄéˇĽ: ĄąĄďĄĂĄ×¤ňÍ­¸ú¤ËŔßÄꤹ¤ë¤ż¤á¤Îľě˝ę¤¬¤Ę¤¤ˇ©\n"
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:354
#, c-format
msgid "%s: error: size %ld is larger than device size %d\n"
msgstr "%s: Ą¨ĄéˇĽ: ĄµĄ¤Ąş %ld ¤¬ĄÇĄĐĄ¤Ąą¤ÎĄµĄ¤Ąş %d ¤č¤ę¤âÂ礭¤¤¤Ç¤ą\n"
-#: disk-utils/mkswap.c:367
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr "%s: Ą¨ĄéˇĽ: ̤ĂΤΥСĽĄ¸ĄçĄó %d\n"
-#: disk-utils/mkswap.c:373
+#: disk-utils/mkswap.c:378
#, c-format
msgid "%s: error: swap area needs to be at least %ldkB\n"
msgstr "%s: Ą¨ĄéˇĽ: ĄąĄďĄĂĄ×Îΰč¤ĎľŻ¤Ę¤Ż¤Č¤â %ldkB ɬÍפǤą\n"
-#: disk-utils/mkswap.c:392
+#: disk-utils/mkswap.c:397
#, c-format
msgid "%s: warning: truncating swap area to %ldkB\n"
msgstr "%s: ·Ůąđ: ĄąĄďĄĂĄ×Îΰč¤ň %ldkB ¤ËŔÚ¤ęµÍ¤á¤Ţ¤·¤ż\n"
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr "'%s' ¤Ë¤ĎĄąĄďĄĂĄ×ĄÇĄôĄˇĄ¤Ąą¤ňşî¤é¤Ę¤¤¤č¤¦¤Ë¤·¤Ţ¤ą"
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr "Ă×ĚżĄ¨ĄéˇĽ: şÇ˝é¤ÎĄÚˇĽĄ¸¤ňĆÉąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1054,11 +1225,27 @@ msgstr ""
"ĄąĄďĄĂĄ×\n"
"¤ň¤ňşîŔ®¤·¤ż¤±¤ě¤Đˇ˘-f ĄŞĄ×Ą·ĄçĄó¤Ç¶ŻÍפ·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: disk-utils/mkswap.c:444
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr "ĄąĄďĄĂĄ×¶ő´Ö¤ňŔßÄę¤Ç¤­¤Ţ¤»¤ó: ĆÉąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr "ĄąĄďĄĂĄ×¶ő´ÖĄĐˇĽĄ¸ĄçĄó %d ¤ňŔßÄꤷ¤Ţ¤ąˇ˘ĄµĄ¤Ąş = %ld ĄĐĄ¤ĄČ\n"
+#: disk-utils/mkswap.c:455
+msgid "unable to rewind swap-device"
+msgstr "ĄąĄďĄĂĄ×ĄÇĄôĄˇĄ¤Ąą¤ň´¬¤­Ě᤻¤Ţ¤»¤ó"
+
+#: disk-utils/mkswap.c:458
+msgid "unable to write signature page"
+msgstr "˝đĚľĄÚˇĽĄ¸¤ň˝ń¤­ąţ¤á¤Ţ¤»¤ó"
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr "fsync ¤ËĽşÇÔ"
+
#: disk-utils/setfdprm.c:30
#, c-format
msgid "Invalid number: %s\n"
@@ -1084,6 +1271,7 @@ 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"
#: disk-utils/setfdprm.c:104
#, c-format
@@ -1095,45 +1283,45 @@ msgstr " %s [ -c | -y | -n | -d ] ĄÇĄĐĄ¤Ąą\n"
msgid " %s [ -c | -y | -n ] dev\n"
msgstr " %s [ -c | -y | -n ] ĄÇĄĐĄ¤Ąą\n"
-#: fdisk/cfdisk.c:353 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr "»ČÍŃÉÔ˛Ä"
-#: fdisk/cfdisk.c:355 fdisk/cfdisk.c:1855
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
msgid "Free Space"
msgstr "¶ő¤­Îΰč"
-#: fdisk/cfdisk.c:358
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr "Linux ext2"
#. also Solaris
-#: fdisk/cfdisk.c:360 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr "Linux"
-#: fdisk/cfdisk.c:363
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:369
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:380
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr "ĄÇĄŁĄąĄŻ¤¬ĘŃąą¤µ¤ě¤Ţ¤·¤żˇŁ\n"
-#: fdisk/cfdisk.c:381
+#: fdisk/cfdisk.c:423
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
"ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ňŔµ¤·¤Żąąż·¤µ¤»¤ë¤Ë¤ĎĄ·ĄąĄĆĄŕ¤ňşĆµŻĆ°¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/cfdisk.c:384
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -1145,735 +1333,749 @@ msgstr ""
"¤Ţ¤Ă¤żľěąç¤Ďˇ˘cfdisk ĄŢĄËĄĺĄ˘ĄëĄÚˇĽĄ¸¤Ë¤˘¤ëÄɲþđĘó\n"
"¤ň»˛ľČ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/cfdisk.c:479
+#: fdisk/cfdisk.c:521
msgid "FATAL ERROR"
msgstr "*Ă×̿Ū¤ĘĄ¨ĄéˇĽ*"
-#: fdisk/cfdisk.c:488
+#: fdisk/cfdisk.c:530
msgid "Press any key to exit cfdisk"
msgstr "ĂćĂǤą¤ë¤Ë¤Ď˛ż¤«Ą­ˇĽ¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤"
-#: fdisk/cfdisk.c:524 fdisk/cfdisk.c:532
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
msgid "Cannot seek on disk drive"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖľĺ¤Ç seek ¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:526
+#: fdisk/cfdisk.c:568
msgid "Cannot read disk drive"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ¤ňĆɤ߹ţ¤á¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:534
+#: fdisk/cfdisk.c:576
msgid "Cannot write disk drive"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ¤Ë˝ń¤­ąţ¤á¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:771
+#: fdisk/cfdisk.c:815
msgid "Too many partitions"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Âż¤ą¤®¤Ţ¤ą"
-#: fdisk/cfdisk.c:776
+#: fdisk/cfdisk.c:820
msgid "Partition begins before sector 0"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Ą»ĄŻĄż 0 ¤č¤ę¤Ţ¤¨¤«¤é»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤ą"
-#: fdisk/cfdisk.c:781
+#: fdisk/cfdisk.c:825
msgid "Partition ends before sector 0"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Ą»ĄŻĄż 0 ¤č¤ęÁ°¤Ç˝Ş¤ď¤Ă¤Ć¤¤¤Ţ¤ą"
-#: fdisk/cfdisk.c:786
+#: fdisk/cfdisk.c:830
msgid "Partition begins after end-of-disk"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬ĄÇĄŁĄąĄŻ¤Î˝ŞĹŔ¤č¤ę¤â¸ĺ¤í¤«¤é»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤ą"
-#: fdisk/cfdisk.c:791
+#: fdisk/cfdisk.c:835
msgid "Partition ends after end-of-disk"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬ĄÇĄŁĄąĄŻ¤Î˝ŞĹŔ¤č¤ę¤â¸ĺ¤í¤Ç˝Ş¤ď¤Ă¤Ć¤¤¤Ţ¤ą"
-#: fdisk/cfdisk.c:839
+#: fdisk/cfdisk.c:859
+msgid "logical partitions not in disk order"
+msgstr "ĎŔÍýÎΰ褬ĄÇĄŁĄąĄŻ¤Î˝ç˝ř¤Č°ěĂפ·¤Ţ¤»¤ó"
+
+#: fdisk/cfdisk.c:862
+msgid "logical partitions overlap"
+msgstr "ĎŔÍýÎΰ褬˝ĹĘŁ¤·¤Ć¤¤¤Ţ¤ą"
+
+#: fdisk/cfdisk.c:864
+msgid "enlarged logical partitions overlap"
+msgstr "łČÂ礵¤ě¤żĎŔÍýÎΰ褬˝ĹĘŁ¤·¤Ć¤¤¤Ţ¤ą"
+
+#: fdisk/cfdisk.c:894
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr ""
"!!!! ĆâÉôĄ¨ĄéˇĽˇŁłČÄĄÎΰč°Ęł°¤ËĎŔÍýĄÉĄéĄ¤ĄÖ¤ňşîŔ®¤·¤č¤¦¤Č¤·¤Ć¤¤¤Ţ¤ą !!!!"
-#: fdisk/cfdisk.c:850 fdisk/cfdisk.c:862
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
"¤ł¤ł¤Ë¤ĎĎŔÍýĄÉĄéĄ¤ĄÖ¤ňşîŔ®¤Ç¤­¤Ţ¤»¤ó -- 2 ¤Ä¤ÎłČÄĄÎΰč¤Ç¤˘¤ě¤ĐşîŔ®¤·¤Ţ¤ą"
-#: fdisk/cfdisk.c:1012
+#: fdisk/cfdisk.c:1067
msgid "Menu item too long. Menu may look odd."
msgstr "ĄáĄËĄĺˇĽąŕĚÜĚľ¤¬Äą¤ą¤®¤Ţ¤ąˇŁĄáĄËĄĺˇĽÉ˝Ľ¨¤¬Íđ¤ě¤Ć¤¤¤ë˛ÄÇ˝Ŕ­¤¬¤˘¤ę¤Ţ¤ąˇŁ"
-#: fdisk/cfdisk.c:1068
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr "ĄáĄËĄĺˇĽ¤ËĘý¸ţ¤¬¤˘¤ę¤Ţ¤»¤óˇŁżĺĘżĘý¸ţ¤ň˝é´üĂͤȤ·¤Ţ¤ąˇŁ"
-#: fdisk/cfdisk.c:1203
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr "ÉÔŔµ¤ĘĄ­ˇĽ"
-#: fdisk/cfdisk.c:1226
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Âł¤±¤ë¤Ë¤Ď˛ż¤«Ą­ˇĽ¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤"
-#: fdisk/cfdisk.c:1273 fdisk/cfdisk.c:1824 fdisk/cfdisk.c:2347
-#: fdisk/cfdisk.c:2349
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "´đËÜÎΰč"
-#: fdisk/cfdisk.c:1273
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "ż·µ¬¤Ë´đËÜÎΰč¤ňşîŔ®¤·¤Ţ¤ą"
-#: fdisk/cfdisk.c:1274 fdisk/cfdisk.c:1824 fdisk/cfdisk.c:2346
-#: fdisk/cfdisk.c:2349
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "ĎŔÍýÎΰč"
-#: fdisk/cfdisk.c:1274
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "ż·µ¬¤ËĎŔÍýÎΰč¤ňşîŔ®¤·¤Ţ¤ą"
-#: fdisk/cfdisk.c:1275 fdisk/cfdisk.c:1328 fdisk/cfdisk.c:2036
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Ăć»ß"
-#: fdisk/cfdisk.c:1275 fdisk/cfdisk.c:1328
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşîŔ®¤·¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:1291
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "!!! ĆâÉôĄ¨ĄéˇĽ !!!"
-#: fdisk/cfdisk.c:1294
+#: fdisk/cfdisk.c:1344
msgid "Size (in MB): "
msgstr "ĄµĄ¤Ąş (MB ñ°Ě): "
-#: fdisk/cfdisk.c:1326
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "şÇ˝é¤«¤é"
-#: fdisk/cfdisk.c:1326
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "¶ő¤­Îΰč¤ÎşÇ˝é¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňÄɲĂ"
-#: fdisk/cfdisk.c:1327
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "şÇ¸ĺ¤«¤é"
-#: fdisk/cfdisk.c:1327
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr "¶ő¤­Îΰč¤ÎşÇ¸ĺ¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňÄɲĂ"
-#: fdisk/cfdisk.c:1345
+#: fdisk/cfdisk.c:1397
msgid "No room to create the extended partition"
msgstr "łČÄĄÎΰč¤ňşîŔ®¤ą¤ë¤ż¤á¤Îľě˝ę¤¬¤˘¤ę¤Ţ¤»¤ó"
-#. probably a file or cdrom
-#: fdisk/cfdisk.c:1377
-msgid "Cannot read disk drive geometry"
-msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ¤ÎĄ¸ĄŞĄáĄČĄę¤ňĆɤ߹ţ¤á¤Ţ¤»¤ó"
-
-#: fdisk/cfdisk.c:1392
+#: fdisk/cfdisk.c:1436
msgid "Bad signature on partition table"
msgstr "ÎΰčĄĆˇĽĄÖĄë¤Î˝đĚľ¤¬ÉÔŔµ¤Ç¤ą"
-#: fdisk/cfdisk.c:1395
-msgid "Cannot get disk size"
-msgstr "ĄÇĄŁĄąĄŻĄµĄ¤Ąş¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
+#: fdisk/cfdisk.c:1474
+msgid "You specified more cylinders than fit on disk"
+msgstr "ĄÇĄŁĄąĄŻ¤Ë¤Č¤Ă¤ĆŬŔڤʿô¤č¤ę¤âÂż¤Ż¤ÎĄ·ĄęĄóĄŔżô¤ň»ŘÄꤵ¤ě¤Ţ¤·¤ż"
-#: fdisk/cfdisk.c:1413
-msgid "Cannot derive a geometry from an empty partition table"
-msgstr "¶ő¤ÎÎΰčĄĆˇĽĄÖĄë¤«¤é¤ĎĄ¸ĄŞĄáĄČĄę¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
-
-#: fdisk/cfdisk.c:1421
-msgid "Cannot derive a geometry from the partition table"
-msgstr "¤˝¤ÎÎΰčĄĆˇĽĄÖĄë¤«¤éĄ¸ĄŞĄáĄČĄę¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
-
-#: fdisk/cfdisk.c:1454
+#: fdisk/cfdisk.c:1504
msgid "Cannot open disk drive"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ¤ňł«¤±¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:1456 fdisk/cfdisk.c:1640
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
msgid "Opened disk read-only - you have no permission to write"
msgstr "ĄÇĄŁĄąĄŻ¤ňĆÉąţ¤ßŔěÍѤdz«¤­¤Ţ¤·¤ż -- ¤˘¤Ę¤ż¤Ë¤Ď˝ńąţ¤ß¸˘¸Â¤¬¤˘¤ę¤Ţ¤»¤ó"
+#: fdisk/cfdisk.c:1527
+msgid "Cannot get disk size"
+msgstr "ĄÇĄŁĄąĄŻĄµĄ¤Ąş¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
+
#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1499
+#: fdisk/cfdisk.c:1553
msgid "Bad primary partition"
msgstr "ÉÔŔµ¤Ę´đËÜÎΰč"
#. avoid snprintf
-#: fdisk/cfdisk.c:1530
+#: fdisk/cfdisk.c:1584
msgid "Bad logical partition"
msgstr "ÉÔŔµ¤ĘĎŔÍýÎΰč"
-#: fdisk/cfdisk.c:1652
+#: fdisk/cfdisk.c:1699
msgid "Warning!! This may destroy data on your disk!"
msgstr "·ŮąđˇŞ ¤ł¤ě¤Ď¤˘¤Ę¤ż¤ÎĄÇĄŁĄąĄŻ¤Ë¤˘¤ëĄÇˇĽĄż¤ňÇ˲ő¤ą¤ë¤«¤â¤·¤ě¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:1656
+#: fdisk/cfdisk.c:1703
msgid "Are you sure you want write the partition table to disk? (yes or no): "
msgstr ""
"ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ó¤Ç¤â¤č¤í¤·¤¤¤Ç¤ą¤«ˇ©(yes ¤Ţ¤ż¤Ď no): "
-#: fdisk/cfdisk.c:1662
+#: fdisk/cfdisk.c:1709
msgid "no"
-msgstr ""
+msgstr "no"
-#: fdisk/cfdisk.c:1663
+#: fdisk/cfdisk.c:1710
msgid "Did not write partition table to disk"
msgstr "ÎΰčĄĆˇĽĄÖĄë¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ß¤Ţ¤»¤ó¤Ç¤·¤ż"
-#: fdisk/cfdisk.c:1665
+#: fdisk/cfdisk.c:1712
msgid "yes"
msgstr "yes"
-#: fdisk/cfdisk.c:1668
+#: fdisk/cfdisk.c:1715
msgid "Please enter `yes' or `no'"
msgstr "`yes' ¤« `no' ¤Î¤¤¤ş¤ě¤«¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤"
-#: fdisk/cfdisk.c:1672
+#: fdisk/cfdisk.c:1719
msgid "Writing partition table to disk..."
msgstr "ÎΰčĄĆˇĽĄÖĄë¤ň˝ń¤­ąţ¤ßĂć..."
-#: fdisk/cfdisk.c:1697 fdisk/cfdisk.c:1701
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
msgid "Wrote partition table to disk"
msgstr "ÎΰčĄĆˇĽĄÖĄë¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ß¤Ţ¤·¤ż"
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1746
msgid ""
"Wrote partition table, but re-read table failed. Reboot to update table."
msgstr ""
"ÎΰčĄĆˇĽĄÖĄë¤ň˝ń¤­ąţ¤ß¤Ţ¤·¤ż¤¬ˇ˘şĆĆÉąţ¤ß¤ËĽşÇÔˇŁşĆµŻĆ°¤·¤Ćąąż·¤·¤Ć¤Ż¤Ŕ¤µ¤¤"
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1756
msgid ""
"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
msgstr ""
"ĄÖˇĽĄČ˛ÄÇ˝´đËÜÎΰ褬°ě¤Ä¤Ç¤Ď¤˘¤ę¤Ţ¤»¤óˇŁDOS MBR ¤Ď¤ł¤ě¤ňĄÖˇĽĄČ¤Ç¤­¤Ţ¤»¤óˇŁ"
-#: fdisk/cfdisk.c:1767 fdisk/cfdisk.c:1885 fdisk/cfdisk.c:1977
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
msgstr "ĄŐĄˇĄ¤ĄëĚľ¤ňĆţÎϡ˘˛čĚ̤ËÉ˝Ľ¨¤ą¤ëľěąç¤ĎĄęĄżˇĽĄóĄ­ˇĽ: "
-#: fdisk/cfdisk.c:1775 fdisk/cfdisk.c:1893 fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
#, c-format
msgid "Cannot open file '%s'"
msgstr "ĄŐĄˇĄ¤Ąë '%s' ¤ňł«¤±¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:1786
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ: %s\n"
-#: fdisk/cfdisk.c:1788
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr "Ą»ĄŻĄż 0:\n"
-#: fdisk/cfdisk.c:1795
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr "Ą»ĄŻĄż %d:\n"
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr " ̵¤· "
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr " ´đËÜ/ĎŔÍý"
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr " ´đËÜÎΰč"
-#: fdisk/cfdisk.c:1821
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr " ĎŔÍýÎΰč"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1859 fdisk/fdisk.c:1059 fdisk/fdisk.c:1208
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:560
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "ÉÔĚŔ"
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr "ĄÖˇĽĄČ (%02X)"
-#: fdisk/cfdisk.c:1867 fdisk/cfdisk.c:2355
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr "̤ĂÎ (%02X)"
-#: fdisk/cfdisk.c:1869
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr "¤Ę¤· (%02X)"
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr "%s ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó\n"
-#: fdisk/cfdisk.c:1906
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr " şÇ˝é¤Î şÇ¸ĺ¤Î\n"
-#: fdisk/cfdisk.c:1907
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
" # ÎÎ°č Ą»ĄŻĄż Ą»ĄŻĄż ĄŞĄŐĄ»ĄĂĄČ Â礭¤µ FilesystemĄżĄ¤Ą×(ID) "
"ĄŐĄéĄ°\n"
-#: fdisk/cfdisk.c:1908
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
msgstr ""
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr " ---şÇ˝é¤Î----- ----şÇ¸ĺ¤Î---- ˝é¤á¤ÎĄ» \n"
-#: fdisk/cfdisk.c:1999
+#: fdisk/cfdisk.c:2038
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:2000
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr ""
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-#: fdisk/cfdisk.c:2033
+#: fdisk/cfdisk.c:2072
msgid "Raw"
msgstr "Ŕ¸ĄÇˇĽĄż"
-#: fdisk/cfdisk.c:2033
+#: fdisk/cfdisk.c:2072
msgid "Print the table using raw data format"
msgstr "Ŕ¸ĄÇˇĽĄż¤Î·ÁĽ°¤ÇĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ĐÎĎ"
-#: fdisk/cfdisk.c:2034 fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr "Ą»ĄŻĄż"
-#: fdisk/cfdisk.c:2034
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr "Ą»ĄŻĄż˝ç¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ĐÎĎ"
-#: fdisk/cfdisk.c:2035
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr "ĄĆˇĽĄÖĄë"
-#: fdisk/cfdisk.c:2035
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr "ñ¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ĐÎĎ"
-#: fdisk/cfdisk.c:2036
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ĐÎϤ·¤Ę¤¤"
-#: fdisk/cfdisk.c:2064
-msgid "Help Screen for cfdisk "
-msgstr "cfdisk ¤ÎĄŘĄëĄ×˛čĚĚ "
+#: fdisk/cfdisk.c:2103
+msgid "Help Screen for cfdisk"
+msgstr "cfdisk ¤ÎĄŘĄëĄ×˛čĚĚ"
-#: fdisk/cfdisk.c:2066
+#: fdisk/cfdisk.c:2105
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr "cfdisk ¤ĎĂĽËö·żĄÇĄŁĄąĄŻĄŃˇĽĄĆĄŁĄ·ĄçĄóşîŔ®Ą×ĄíĄ°ĄéĄŕ¤Ç¤ąˇŁ"
-#: fdisk/cfdisk.c:2067
+#: fdisk/cfdisk.c:2106
msgid "allows you to create, delete and modify partitions on your hard"
msgstr "ĄĎˇĽĄÉĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşîŔ®ˇ˘şď˝üˇ˘ĘŃąą"
-#: fdisk/cfdisk.c:2068
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr "¤ą¤ë¤ł¤Č¤¬¤Ç¤­¤Ţ¤ąˇŁ"
-#: fdisk/cfdisk.c:2070
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
+#: fdisk/cfdisk.c:2109
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr "ĄłĄŢĄóĄÉ ŔâĚŔ"
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
-msgstr ""
+msgstr "------- -------"
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
msgstr " b Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ÎĄÖˇĽĄČĄŐĄéĄ°¤ÎŔÚÂŘ"
-#: fdisk/cfdisk.c:2075
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
msgstr " d Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşď˝ü"
-#: fdisk/cfdisk.c:2076
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr " g Ą·ĄęĄóĄŔ, ĄŘĄĂĄŔ, ĄČĄéĄĂĄŻĹö¤ż¤ę¤ÎĄ»ĄŻĄżżô¤ňĘŃąą"
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2116
msgid " WARNING: This option should only be used by people who"
msgstr " ·Ůąđ: ¤ł¤ÎĄŞĄ×Ą·ĄçĄó¤¬˛ż¤ň¤ą¤ë¤â¤Î¤«Íý˛ň¤·¤Ć¤¤¤Ę¤¤żÍ"
-#: fdisk/cfdisk.c:2078
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr " ¤Ď»ČÍѤ·¤Ć¤Ď¤¤¤±¤Ę¤¤ˇŁ"
-#: fdisk/cfdisk.c:2079
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
msgstr " h ¤ł¤Î˛čĚ̤ňÉ˝Ľ¨"
-#: fdisk/cfdisk.c:2080
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
msgstr " m Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ÎĄÇĄŁĄąĄŻ»ČÍŃÎ̤ňşÇÂç¤Ë¤ą¤ëˇŁ"
-#: fdisk/cfdisk.c:2081
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr " Ăí°Ő: ¤ł¤ÎĄŞĄ×Ą·ĄçĄó¤Ďˇ˘DOS, OS/2 Ĺů¤Č¸ß´ąŔ­¤Î¤Ę¤¤"
-#: fdisk/cfdisk.c:2082
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr " ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşîŔ®¤ą¤ë˛ÄÇ˝Ŕ­¤¬¤˘¤ę¤Ţ¤ąˇŁ"
-#: fdisk/cfdisk.c:2083
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
msgstr " n ¶ő¤­Îΰ褫¤éż·µ¬¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşîŔ®"
-#: fdisk/cfdisk.c:2084
+#: fdisk/cfdisk.c:2123
msgid " p Print partition table to the screen or to a file"
msgstr " p ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˛čĚ̤ޤż¤ĎĄÇĄŁĄąĄŻ¤Ë˝ĐÎϤą¤ë"
-#: fdisk/cfdisk.c:2085
+#: fdisk/cfdisk.c:2124
msgid " There are several different formats for the partition"
msgstr " ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Î˝ĐÎϤˤϼˇ¤Î¤č¤¦¤ĘĘŁżô¤Î·ÁĽ°¤«¤éÁŞÂň"
-#: fdisk/cfdisk.c:2086
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr " ¤Ç¤­¤ë:"
-#: fdisk/cfdisk.c:2087
+#: fdisk/cfdisk.c:2126
msgid " r - Raw data (exactly what would be written to disk)"
msgstr " r - Ŕ¸ĄÇˇĽĄż(ĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤Ţ¤ě¤ëľđĘ󤽤Τâ¤Î)"
-#: fdisk/cfdisk.c:2088
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr " s - Ą»ĄŻĄż˝ç¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó"
-#: fdisk/cfdisk.c:2089
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr " t - Ŕ¸¤Î·ÁĽ°¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó"
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr " q ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ń¤­ąţ¤Ţ¤ş¤ËĄ×ĄíĄ°ĄéĄŕ¤ň˝ŞÎ»"
-#: fdisk/cfdisk.c:2091
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
msgstr " t ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ňĘŃąą"
-#: fdisk/cfdisk.c:2092
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
msgstr " u É˝Ľ¨¤ą¤ëĄŃˇĽĄĆĄŁĄ·ĄçĄóĄµĄ¤Ąş¤Îñ°Ě¤ňĘŃąą¤ą¤ë"
-#: fdisk/cfdisk.c:2093
-msgid " Rotates through Mb, sectors and cylinders"
-msgstr " MB, Ą»ĄŻĄż, Ą·ĄęĄóĄŔ¤Î˝ç¤ËĘѤď¤ë"
+#: fdisk/cfdisk.c:2132
+msgid " Rotates through MB, sectors and cylinders"
+msgstr " MB, Ą»ĄŻĄż, Ą·ĄęĄóĄŔ¤Î˝ç¤Ë˝Ű´Ä¤ą¤ë"
-#: fdisk/cfdisk.c:2094
+#: fdisk/cfdisk.c:2133
msgid " W Write partition table to disk (must enter upper case W)"
msgstr " W ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ŕ(Âçʸ»ú W ¤ň"
-#: fdisk/cfdisk.c:2095
+#: fdisk/cfdisk.c:2134
msgid " Since this might destroy data on the disk, you must"
msgstr " ĆţÎϤ·¤Ę¤±¤ě¤Đ¤Ę¤é¤Ę¤¤)ˇŁ¤ł¤ÎĄŞĄ×Ą·ĄçĄó¤ĎĄÇĄŁĄąĄŻľĺ¤Î"
-#: fdisk/cfdisk.c:2096
+#: fdisk/cfdisk.c:2135
msgid " either confirm or deny the write by entering `yes' or"
msgstr " ĄÇˇĽĄż¤ňÇ˲ő¤ą¤ë˛ÄÇ˝Ŕ­¤¬¤˘¤ë¤ż¤áˇ˘'yes'¤Ţ¤ż¤Ď'no'¤ÎĆţ"
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr " ÎϤˤč¤ęˇ˘˝ń¤­ąţ¤ß¤ňąÔ¤¦¤«¤É¤¦¤«¤ňłÎǧ¤ą¤ëˇŁ"
-#: fdisk/cfdisk.c:2098
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
msgstr "ľĺĚđ°őĄ­ˇĽ ľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ËĄ«ˇĽĄ˝Ąë¤ň°ÜĆ°"
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
msgstr "˛ĽĚđ°őĄ­ˇĽ ˛Ľ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ËĄ«ˇĽĄ˝Ąë¤ň°ÜĆ°"
-#: fdisk/cfdisk.c:2100
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr "CTRL-L ˛čĚ̤ňşĆÉÁ˛č"
-#: fdisk/cfdisk.c:2101
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
msgstr " ? ¤ł¤Î˛čĚ̤ňÉ˝Ľ¨"
-#: fdisk/cfdisk.c:2103
+#: fdisk/cfdisk.c:2142
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "Ăí°Ő: ĄłĄŢĄóĄÉ¤Ď¤ą¤Ů¤ĆÂçʸ»úˇ˘ľ®Ę¸»ú¤É¤Á¤é¤Ç¤â»ČÍѤǤ­¤Ţ¤ą"
-#: fdisk/cfdisk.c:2104
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr "(˝ń¤­ąţ¤ß¤ň˝ü¤Ż)ˇŁ"
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2436 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr "Ą·ĄęĄóĄŔ"
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
msgstr "Ą·ĄęĄóĄŔ¤ÎĄ¸ĄŞĄáĄČĄę¤ňĘŃąą"
-#: fdisk/cfdisk.c:2135 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "ĄŘĄĂĄÉżô"
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
msgstr "ĄŘĄĂĄÉ¤ÎĄ¸ĄŞĄáĄČĄę¤ňĘŃąą"
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
msgstr "Ą»ĄŻĄż¤ÎĄ¸ĄŞĄáĄČĄę¤ňĘŃąą"
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr "˝ŞÎ»"
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr "Ą¸ĄŞĄáĄČĄę¤ňĘŃąą¤·¤Ć˝ŞÎ»"
-#: fdisk/cfdisk.c:2150
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr "Ą·ĄęĄóĄŔżô¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤: "
-#: fdisk/cfdisk.c:2157 fdisk/cfdisk.c:2700
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
msgid "Illegal cylinders value"
msgstr "ÉÔŔµ¤ĘĄ·ĄęĄóĄŔżô"
-#: fdisk/cfdisk.c:2163
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr "ĄŘĄĂĄŔżô¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤: "
-#: fdisk/cfdisk.c:2170 fdisk/cfdisk.c:2710
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
msgid "Illegal heads value"
msgstr "ÉÔŔµ¤ĘĄŘĄĂĄÉżô"
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr "ĄČĄéĄĂĄŻĹö¤ż¤ę¤ÎĄ»ĄŻĄżżô¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤: "
-#: fdisk/cfdisk.c:2183 fdisk/cfdisk.c:2717
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
msgid "Illegal sectors value"
msgstr "ÉÔŔµ¤ĘĄ»ĄŻĄżżô"
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr "ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤: "
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2348
msgid "Cannot change FS Type to empty"
msgstr "ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ň¶ő¤ËĘŃąą¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2350
msgid "Cannot change FS Type to extended"
msgstr "ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ňłČÄĄ¤ËĘŃąą¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2324 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "ĄÖˇĽĄČ"
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
-msgstr ""
+msgstr "̤ĂÎ(%02X)"
-#: fdisk/cfdisk.c:2329 fdisk/cfdisk.c:2332
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
-msgstr ""
+msgstr ", NC"
-#: fdisk/cfdisk.c:2337 fdisk/cfdisk.c:2340
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
-msgstr ""
+msgstr "NC"
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr "´đËÜ/ĎŔÍý"
-#: fdisk/cfdisk.c:2422
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "ĄÇĄŁĄąĄŻĄÉĄéĄ¤ĄÖ: %s"
-#: fdisk/cfdisk.c:2424
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr "ĄµĄ¤Ąş: %lld ĄĐĄ¤ĄČ"
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "ĄŘĄĂĄÉ: %d ĄČĄéĄĂĄŻĹö¤ż¤ę¤ÎĄ»ĄŻĄż: %d Ą·ĄęĄóĄŔ: %d"
-#: fdisk/cfdisk.c:2428
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "ĚľÁ°"
-#: fdisk/cfdisk.c:2429
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "ĄŐĄéĄ°"
-#: fdisk/cfdisk.c:2430
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "Îΰ西Ą¤Ą×"
-#: fdisk/cfdisk.c:2431
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "FSĄżĄ¤Ą×"
-#: fdisk/cfdisk.c:2432
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr "[ĄéĄŮĄë]"
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr " Ą»ĄŻĄż"
-#: fdisk/cfdisk.c:2438
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "ĄµĄ¤Ąş (MB)"
-#: fdisk/cfdisk.c:2493
+#: fdisk/cfdisk.c:2494
+msgid "Size (GB)"
+msgstr "ĄµĄ¤Ąş (GB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "ĄÖˇĽĄČ˛Ä"
-#: fdisk/cfdisk.c:2493
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
msgstr "Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ÎĄÖˇĽĄČĄŐĄéĄ°¤ňŔÚ¤ęÂؤ¨¤ë"
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr "şď˝ü"
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
msgstr "Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşď˝ü"
-#: fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr "Ą¸ĄŞĄáĄČĄę"
-#: fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
msgstr "ĄÇĄŁĄąĄŻĄ¸ĄŞĄáĄČĄę¤ňĘŃąą¤ą¤ë(Ą¨Ą­ĄąĄŃˇĽĄČÍŃ)"
-#: fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr "ĄŘĄëĄ×"
-#: fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
msgstr "ĄŘĄëĄ×˛čĚ̤ňÉ˝Ľ¨"
-#: fdisk/cfdisk.c:2497
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr "şÇÂ粽"
-#: fdisk/cfdisk.c:2497
+#: fdisk/cfdisk.c:2553
msgid "Maximize disk usage of the current partition (experts only)"
msgstr "Ą«ˇĽĄ˝Ąëľĺ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ÎĄÇĄŁĄąĄŻ»ČÍŃÎ̤ňşÇÂ粽(Ą¨Ą­ĄąĄŃˇĽĄČÍŃ)"
-#: fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr "ż·µ¬şîŔ®"
-#: fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr "¶ő¤­Îΰ褫¤éż·¤·¤ŻĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňşîŔ®"
-#: fdisk/cfdisk.c:2499
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr "É˝Ľ¨"
-#: fdisk/cfdisk.c:2499
+#: fdisk/cfdisk.c:2555
msgid "Print partition table to the screen or to a file"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˛čĚ̤ޤż¤ĎĄŐĄˇĄ¤Ąë¤Ë˝ĐÎĎ"
-#: fdisk/cfdisk.c:2500
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr "˝ŞÎ»"
-#: fdisk/cfdisk.c:2500
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ň˝ń¤­ąţ¤Ţ¤ş¤ËĄ×ĄíĄ°ĄéĄŕ¤ň˝ŞÎ»"
-#: fdisk/cfdisk.c:2501
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr "FSĄżĄ¤Ą×"
-#: fdisk/cfdisk.c:2501
+#: fdisk/cfdisk.c:2557
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr "ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤ÎĄżĄ¤Ą×¤ňĘŃąą¤ą¤ë(DOS, Linux, OS/2 ¤Ę¤É)"
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr "ñ°Ě"
-#: fdisk/cfdisk.c:2502
+#: fdisk/cfdisk.c:2558
msgid "Change units of the partition size display (MB, sect, cyl)"
msgstr "É˝Ľ¨¤ą¤ëĄŃˇĽĄĆĄŁĄ·ĄçĄóĄµĄ¤Ąş¤Îñ°Ě(MB, Ą»ĄŻĄż, Ą·ĄęĄóĄŔ)¤ňĘŃąą¤ą¤ë"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr "˝ń¤­ąţ¤ß"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2559
msgid "Write partition table to disk (this might destroy data)"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ŕ(ĄÇˇĽĄż¤ňÇ˲ő¤ą¤ë˛ÄÇ˝Ŕ­¤˘¤ę)"
-#: fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2605
msgid "Cannot make this partition bootable"
msgstr "¤ł¤ÎÎΰč¤ňĄÖˇĽĄČ˛ÄÇ˝¤Ë¤Ď¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2615
msgid "Cannot delete an empty partition"
msgstr "¶ő¤ÎÎΰč¤ňşď˝ü¤ą¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2579 fdisk/cfdisk.c:2581
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
msgid "Cannot maximize this partition"
msgstr "¤ł¤ÎÎΰč¤ňşÇÂ粽¤ą¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2589
+#: fdisk/cfdisk.c:2645
msgid "This partition is unusable"
msgstr "¤ł¤ÎÎΰč¤Ď»ČÍѤǤ­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2647
msgid "This partition is already in use"
msgstr "¤ł¤ÎĄÇĄŁĄąĄŻ¤Ď¸˝şß»ČÍŃĂć¤Ç¤ąˇŁ"
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2664
msgid "Cannot change the type of an empty partition"
msgstr "¶ő¤ÎÎΰč¤ÎĄżĄ¤Ą×¤ňĘŃąą¤ą¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2633 fdisk/cfdisk.c:2639
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
msgid "No more partitions"
msgstr "¤ł¤ě°Ęľĺ¤ÎÎΰč¤Ď¤˘¤ę¤Ţ¤»¤ó"
-#: fdisk/cfdisk.c:2646
+#: fdisk/cfdisk.c:2704
msgid "Illegal command"
msgstr "ÉÔŔµ¤ĘĄłĄŢĄóĄÉ"
-#: fdisk/cfdisk.c:2656
+#: fdisk/cfdisk.c:2714
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr ""
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
#. Unfortunately, xgettext does not handle multi-line strings
#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2721
#, c-format
msgid ""
"\n"
@@ -1908,242 +2110,249 @@ msgstr ""
" ¤ňʤ¤ą\n"
"\n"
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:247
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"
+"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 drives) use 2048-byte sectors\n"
msgstr ""
-"»Č¤¤Ęý: fdisk [-b SSZ] [-u] [ĄÇĄŁĄąĄŻ] ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄë¤ÎĘŃąą\n"
-" fdisk -l [-b SSZ] [-u] [ĄÇĄŁĄąĄŻ] "
-"ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄëĄęĄąĄČ¤ÎÉ˝Ľ¨\n"
-" fdisk -s ĄŃˇĽĄĆĄŁĄ·ĄçĄó "
-"ĄÖĄíĄĂĄŻ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄóĄµĄ¤ĄşÉ˝Ľ¨\n"
-" fdisk -v fdisk ¤ÎĄĐˇĽĄ¸ĄçĄóÉ˝Ľ¨\n"
-"`ĄÇĄŁĄąĄŻ' ¤Ë¤Ď /dev/hdb ¤ä /dev/sda ¤ÎÍͤʲż¤«¤ňÍż¤¨¤Ţ¤ą\n"
-"¤˝¤·¤Ć `ĄŃˇĽĄĆĄŁĄ·ĄçĄó' ¤Ë¤Ď /dev/hda7 ¤ÎÍͤʲż¤«¤ňÍż¤¨¤Ţ¤ą\n"
-"-u: (Ą·ĄęĄóĄŔ¤ÎÂĺ¤ď¤ę¤Ë)Ą»ĄŻĄżĄćĄËĄĂĄČ¤Î¤Îł«»Ďˇ˘˝ŞÎ»¤ňÍż¤¨¤Ţ¤ą\n"
-"-b 2048: (¤˘¤ëĽď¤Î MO ĄÉĄéĄ¤ĄÖÍŃ) 2048 ĄĐĄ¤ĄČ¤ÎĄ»ĄŻĄżĄµĄ¤Ąş¤ň»Č¤¤¤Ţ¤ą\n"
-
-#: fdisk/fdisk.c:251
-msgid "A disk block device is needed.\n"
-msgstr "ĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤˘¤ë¤ł¤Č¤¬É¬ÍפǤąˇŁ\n"
+"»Č¤¤Ęý: fdisk [-b SSZ] [-u] ĄÇĄŁĄąĄŻ ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄë¤ÎĘŃąą\n"
+" fdisk -l [-b SSZ] [-u] ĄÇĄŁĄąĄŻ ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄëĄęĄąĄČ¤ÎÉ˝Ľ¨\n"
+" fdisk -s ĄŃˇĽĄĆĄŁĄ·ĄçĄó ĄÖĄíĄĂĄŻ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄóĄµĄ¤ĄşÉ˝Ľ¨\n"
+" fdisk -v fdisk ¤ÎĄĐˇĽĄ¸ĄçĄóÉ˝Ľ¨\n"
+"¤ł¤ł¤Ç `ĄÇĄŁĄąĄŻ' ¤Č¤Ď /dev/hdb ¤ä /dev/sda ¤ÎÍͤʲż¤«¤Î»ö¤Ç¤ą\n"
+"¤˝¤·¤Ć `ĄŃˇĽĄĆĄŁĄ·ĄçĄó' ¤Č¤Ď /dev/hda7 ¤ÎÍͤʲż¤«¤Î¤ł¤Č¤Ç¤ą\n"
+"-u: (Ą·ĄęĄóĄŔ¤ÎÂĺ¤ď¤ę¤Ë)Ą»ĄŻĄżĄćĄËĄĂĄČ¤Îł«»Ďˇ˘˝ŞÎ»¤ňÍż¤¨¤Ţ¤ą\n"
+"-b 2048: (¤˘¤ëĽď¤Î MO ĄÉĄéĄ¤ĄÖÍѤË) 2048 ĄĐĄ¤ĄČ¤ÎĄ»ĄŻĄżĄµĄ¤Ąş¤ň»Č¤¤¤Ţ¤ą\n"
+
+#: fdisk/fdisk.c:259
+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 ""
+"»Č¤¤Ęý: fdisk [-l] [-b SSZ] [-u] ĄÇĄôĄˇĄ¤Ąą\n"
+" Îă: fdisk /dev/hda (°ěČÖĚܤΠIDE ĄÇĄŁĄąĄŻ)\n"
+" Ëô¤Ď: fdisk /dev/sdc (»°ČÖĚܤΠSCSI ĄÇĄŁĄąĄŻ)\n"
+" Ëô¤Ď: fdisk /dev/eda (°ěČÖĚܤΠPS/2 ESDI ĄÉĄéĄ¤Ąô)\n"
+" Ëô¤Ď: fdisk /dev/rd/c0d0 Ëô¤Ď: fdisk /dev/ida/c0d0 (RAID ĄÇĄôĄˇĄ¤Ąą)\n"
+" ...\n"
-#: fdisk/fdisk.c:254
-msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
-msgstr ""
-"Íż¤¨¤é¤ě¤żĚľÁ°¤ĎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ň»˛ľČ¤·¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
-"¤˘¤ë¤¤¤Ďˇ˘ĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤µ¤¨¤Ę¤¤¤Î¤«¤âĂΤě¤Ţ¤»¤óˇŁ\n"
-
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:267
#, c-format
msgid "Unable to open %s\n"
msgstr "%s ¤ňł«¤±¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:261
+#: fdisk/fdisk.c:270
#, c-format
msgid "Unable to read %s\n"
msgstr "%s ¤ňĆɤá¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:264
+#: fdisk/fdisk.c:273
#, c-format
msgid "Unable to seek on %s\n"
msgstr "%s ¤ňĄ·ˇĽĄŻ¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:267
+#: fdisk/fdisk.c:276
#, c-format
msgid "Unable to write %s\n"
msgstr "%s ¤Ř¤Î˝ń¤­ąţ¤ß¤¬¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:270
+#: fdisk/fdisk.c:279
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr "%s ¤Ç¤Î BLKGETSIZE ioctl ¤ËĽşÇÔ\n"
+
+#: fdisk/fdisk.c:283
msgid "Unable to allocate any more memory\n"
msgstr "¤ł¤ě°Ęľĺ¤ÎĄáĄâĄę¤¬łÎĘݤǤ­¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:285
msgid "Fatal error\n"
msgstr "Ă×̿Ū¤ĘĄ¨ĄéˇĽ\n"
-#: fdisk/fdisk.c:283 fdisk/fdisk.c:302 fdisk/fdisk.c:320 fdisk/fdisk.c:327
-#: fdisk/fdisk.c:350 fdisk/fdisk.c:368 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
msgid "Command action"
msgstr "ĄłĄŢĄóĄÉ¤ÎĆ°şî"
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:297
msgid " a toggle a read only flag"
msgstr " a ĆÉąţ¤ßŔěÍѥե饰¤ň¤Ä¤±¤ë"
#. sun
-#: fdisk/fdisk.c:285 fdisk/fdisk.c:329
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
msgid " b edit bsd disklabel"
msgstr " b bsd ĄÇĄŁĄąĄŻĄéĄŮĄë¤ňĘÔ˝¸¤ą¤ë"
-#: fdisk/fdisk.c:286
+#: fdisk/fdisk.c:299
msgid " c toggle the mountable flag"
msgstr " c ĄŢĄ¦ĄóĄČ˛ÄÇ˝ĄŐĄéĄ°¤ň¤Ä¤±¤ë"
#. sun
-#: fdisk/fdisk.c:287 fdisk/fdisk.c:306 fdisk/fdisk.c:331
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " d delete a partition"
msgstr " d Îΰč¤ňşď˝ü¤ą¤ë"
-#: fdisk/fdisk.c:288 fdisk/fdisk.c:307 fdisk/fdisk.c:332
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
msgid " l list known partition types"
msgstr " l ´űĂΤÎÎΰ西Ą¤Ą×¤ňĄęĄąĄČÉ˝Ľ¨¤ą¤ë"
#. sun
-#: fdisk/fdisk.c:289 fdisk/fdisk.c:308 fdisk/fdisk.c:321 fdisk/fdisk.c:333
-#: fdisk/fdisk.c:358 fdisk/fdisk.c:375 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
msgid " m print this menu"
msgstr " m ¤ł¤ÎĄáĄËĄĺˇĽ¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/fdisk.c:290 fdisk/fdisk.c:309 fdisk/fdisk.c:334
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
msgid " n add a new partition"
msgstr " n ż·¤ż¤ËÎΰč¤ňşîŔ®¤ą¤ë"
-#: fdisk/fdisk.c:291 fdisk/fdisk.c:310 fdisk/fdisk.c:322 fdisk/fdisk.c:335
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
msgid " o create a new empty DOS partition table"
msgstr " o ż·¤ż¤Ë¶ő¤Î DOS ÎΰčĄĆˇĽĄÖĄë¤ňşîŔ®¤ą¤ë"
-#: fdisk/fdisk.c:292 fdisk/fdisk.c:311 fdisk/fdisk.c:336 fdisk/fdisk.c:359
-#: fdisk/fdisk.c:376
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
msgid " p print the partition table"
msgstr " p ÎΰčĄĆˇĽĄÖĄë¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/fdisk.c:293 fdisk/fdisk.c:312 fdisk/fdisk.c:323 fdisk/fdisk.c:337
-#: fdisk/fdisk.c:360 fdisk/fdisk.c:377 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
msgid " q quit without saving changes"
msgstr " q ĘŃąą¤ňĘݸ¤»¤ş¤Ë˝ŞÎ»¤ą¤ë"
-#: fdisk/fdisk.c:294 fdisk/fdisk.c:313 fdisk/fdisk.c:324 fdisk/fdisk.c:338
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
msgid " s create a new empty Sun disklabel"
msgstr " s ¶ő¤Î Sun ĄÇĄŁĄąĄŻĄéĄŮĄë¤ňşîŔ®¤ą¤ë"
#. sun
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:339
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
msgid " t change a partition's system id"
msgstr " t Îΰč¤ÎĄ·ĄąĄĆĄŕ ID ¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
msgid " u change display/entry units"
msgstr " u É˝Ľ¨/ąŕĚÜĄćĄËĄĂĄČ¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:316 fdisk/fdisk.c:341 fdisk/fdisk.c:363
-#: fdisk/fdisk.c:380
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
msgid " v verify the partition table"
msgstr " v ÎΰčĄĆˇĽĄÖĄë¤ňľČąç¤ą¤ë"
-#: fdisk/fdisk.c:298 fdisk/fdisk.c:317 fdisk/fdisk.c:342 fdisk/fdisk.c:364
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
msgid " w write table to disk and exit"
msgstr " w ĄĆˇĽĄÖĄë¤ňĄÇĄŁĄąĄŻ¤Ë˝ń¤­ąţ¤ßˇ˘˝ŞÎ»¤ą¤ë"
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
msgid " x extra functionality (experts only)"
msgstr " x ĆĂĘ̤ʵˇÇ˝ (Ą¨Ą­ĄąĄŃˇĽĄČŔěÍŃ)"
-#: fdisk/fdisk.c:303
+#: fdisk/fdisk.c:316
msgid " a select bootable partition"
msgstr " a ĄÖˇĽĄČ˛ÄÇ˝Îΰč¤ňÁŞÂň¤ą¤ë"
#. sgi flavour
-#: fdisk/fdisk.c:304
+#: fdisk/fdisk.c:317
msgid " b edit bootfile entry"
msgstr " b ĄÖˇĽĄČĄŐĄˇĄ¤ĄëĄ¨ĄóĄČĄę¤ňĘÔ˝¸¤ą¤ë"
#. sgi
-#: fdisk/fdisk.c:305
+#: fdisk/fdisk.c:318
msgid " c select sgi swap partition"
msgstr " c sgi ĄąĄďĄĂĄ×Îΰč¤ňÁŞÂň¤ą¤ë"
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:341
msgid " a toggle a bootable flag"
msgstr " a ĄÖˇĽĄČ˛ÄÇ˝ĄŐĄéĄ°¤ň¤Ä¤±¤ë"
-#: fdisk/fdisk.c:330
+#: fdisk/fdisk.c:343
msgid " c toggle the dos compatibility flag"
msgstr " c dos ¸ß´ąĄŐĄéĄ°¤ň¤Ä¤±¤ë"
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:364
msgid " a change number of alternate cylinders"
msgstr " a ÂĺÂŘĄ·ĄęĄóĄŔżô¤ňĘŃąą¤ą¤ë"
#. sun
-#: fdisk/fdisk.c:352 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
msgid " c change number of cylinders"
msgstr " c Ą·ĄęĄóĄŔżô¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:353 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
msgid " d print the raw data in the partition table"
msgstr " d ÎΰčĄĆˇĽĄÖĄëĆâ¤ÎŔ¸ĄÇˇĽĄż¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/fdisk.c:354
+#: fdisk/fdisk.c:367
msgid " e change number of extra sectors per cylinder"
msgstr " e Ą·ĄęĄóĄŔËč¤ÎÍľľęĄ»ĄŻĄżżô¤ňĘŃąą¤ą¤ë"
#. sun
-#: fdisk/fdisk.c:355 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
msgid " h change number of heads"
msgstr " h ĄŘĄĂĄÉżô¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:356
+#: fdisk/fdisk.c:369
msgid " i change interleave factor"
msgstr " i Ą¤ĄóĄżˇĽĄęˇĽĄÖĄŐĄˇĄŻĄż¤ňĘŃąą¤ą¤ë"
#. sun
-#: fdisk/fdisk.c:357
+#: fdisk/fdisk.c:370
msgid " o change rotation speed (rpm)"
msgstr " o ˛óĹľżô¤ňĘŃąą¤ą¤ë (rpm)"
-#: fdisk/fdisk.c:361 fdisk/fdisk.c:378 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
msgid " r return to main menu"
msgstr " r ĄáĄ¤ĄóĄáĄËĄĺˇĽ¤ËĚá¤ë"
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:379
-msgid " s change number of sectors"
-msgstr " s Ą»ĄŻĄżżô¤ňĘŃąą¤ą¤ë"
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+msgid " s change number of sectors/track"
+msgstr " s Ą»ĄŻĄżżô/ĄČĄéĄĂĄŻ¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:365
+#: fdisk/fdisk.c:378
msgid " y change number of physical cylinders"
msgstr " y ĘŞÍýĄ·ĄęĄóĄŔżô¤ňĘŃąą¤ą¤ë"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:382
msgid " b move beginning of data in a partition"
msgstr " b ÎΰčĆâ¤ÎĄÇˇĽĄż¤ÎŔčƬ¤Ë°ÜĆ°¤ą¤ë"
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:385
msgid " e list extended partitions"
msgstr " e łČÄĄÎΰč¤ňĄęĄąĄČÉ˝Ľ¨¤ą¤ë"
#. !sun
-#: fdisk/fdisk.c:373
+#: fdisk/fdisk.c:386
msgid " g create an IRIX partition table"
msgstr " g IRIX ÎΰčĄĆˇĽĄÖĄë¤ňşîŔ®¤ą¤ë"
-#: fdisk/fdisk.c:469
+#: fdisk/fdisk.c:482
msgid "You must set"
msgstr "ŔßÄꤹ¤ëɬÍפ¬¤˘¤ę¤Ţ¤ą"
-#: fdisk/fdisk.c:483
+#: fdisk/fdisk.c:496
msgid "heads"
msgstr "ĄŘĄĂĄÉżô"
-#: fdisk/fdisk.c:485 fdisk/fdisk.c:893 fdisk/sfdisk.c:843
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
msgid "sectors"
msgstr "Ą»ĄŻĄżżô"
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:893 fdisk/fdiskbsdlabel.c:441
-#: fdisk/sfdisk.c:843
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:442
+#: fdisk/sfdisk.c:842
msgid "cylinders"
msgstr "Ą·ĄęĄóĄŔżô"
-#: fdisk/fdisk.c:491
+#: fdisk/fdisk.c:504
#, c-format
msgid ""
"%s%s.\n"
@@ -2152,30 +2361,30 @@ msgstr ""
"%s%s.\n"
"¤˘¤Ę¤ż¤ĎĆĂĘ̵ˇÇ˝ĄáĄËĄĺˇĽ¤«¤é¤ł¤ě¤ňąÔ¤Ę¤¦¤ł¤Č¤¬¤Ç¤­¤Ţ¤ą\n"
-#: fdisk/fdisk.c:492
+#: fdisk/fdisk.c:505
msgid " and "
msgstr " µÚ¤Ó "
-#: fdisk/fdisk.c:526
+#: fdisk/fdisk.c:539
msgid "Bad offset in primary extended partition\n"
msgstr "´đËÜłČÄĄÎΰč¤ËÉÔŔµ¤ĘĄŞĄŐĄ»ĄĂĄČ¤¬¤˘¤ę¤Ţ¤ą\n"
-#: fdisk/fdisk.c:533
+#: fdisk/fdisk.c:546
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "·Ůąđ: %d °Ęąß¤ÎÎΰč¤ňşď˝ü¤·¤Ţ¤ą\n"
-#: fdisk/fdisk.c:554
+#: fdisk/fdisk.c:567
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "·Ůąđ: ÎΰčĄĆˇĽĄÖĄë %d Ćâ¤ÎĆĂĘ̤ʥęĄóĄŻĄÝĄ¤ĄóĄż¤Ç¤ą\n"
-#: fdisk/fdisk.c:562
+#: fdisk/fdisk.c:575
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "·Ůąđ: ÎΰčĄĆˇĽĄÖĄë %d Ćâ¤ÎĆĂĘ̤ʥǡĽĄż¤ň̵»ë¤·¤Ţ¤ą\n"
-#: fdisk/fdisk.c:588
+#: fdisk/fdisk.c:601
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"
@@ -2186,16 +2395,16 @@ msgstr ""
"ĄÇĄŁĄąĄŻĄéĄŮĄë¤ňşîŔ®¤·¤Ţ¤ąˇŁ¤˘¤Ę¤ż¤¬˝ń¤­ąţ¤ß¤ň·čÄꤹ¤ë¤Ţ¤Çˇ˘ĘŃąą¤Ď\n"
"ĄáĄâĄęĆâ¤Ŕ¤±¤Ë»Ä¤·¤Ţ¤ąˇŁ¤˝¤Î¸ĺ¤Ď¤â¤Á¤í¤ó°ĘÁ°¤ÎĆâÍƤϽ¤ÉüÉÔ˛ÄÇ˝¤Ë¤Ę¤ę¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:637
msgid "You will not be able to write the partition table.\n"
msgstr "ÎΰčĄĆˇĽĄÖĄë¤Î˝ń¤­ąţ¤ß¤ňąÔ¤¨¤Ţ¤»¤óˇŁ\n"
-#: fdisk/fdisk.c:633
+#: fdisk/fdisk.c:646
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Ăí°Ő: Ą»ĄŻĄżĄµĄ¤Ąş¤¬ %d ¤Ç¤ą (%d ¤Ç¤Ď¤Ę¤Ż)\n"
-#: fdisk/fdisk.c:681
+#: fdisk/fdisk.c:694
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
@@ -2203,16 +2412,16 @@ msgstr ""
"ĄÇĄĐĄ¤Ąą¤ĎŔµľď¤Ę DOS ÎΰčĄĆˇĽĄÖĄë¤âˇ˘Sun ¤ä SGI ĄÇĄŁĄąĄŻĄéĄŮĄë¤â\n"
"´Ţ¤ó¤Ç¤¤¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:697
+#: fdisk/fdisk.c:710
msgid "Internal error\n"
msgstr "ĆâÉôĄ¨ĄéˇĽ\n"
-#: fdisk/fdisk.c:707
+#: fdisk/fdisk.c:720
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "ĆĂĘ̤ʳČÄĄÎΰč %d ¤ň̵»ë¤·¤Ţ¤ą\n"
-#: fdisk/fdisk.c:714
+#: fdisk/fdisk.c:727
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2221,7 +2430,7 @@ msgstr ""
"·Ůąđ: ÎΰčĄĆˇĽĄÖĄë %2$d ¤ÎÉÔŔµ¤ĘĄŐĄéĄ° 0x%1$04x ¤Ď w(˝ń¤­ąţ¤ß)¤Ë¤č¤Ă¤Ć\n"
"Ŕµľď¤Ë¤Ę¤ę¤Ţ¤ą\n"
-#: fdisk/fdisk.c:735
+#: fdisk/fdisk.c:748
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2229,65 +2438,65 @@ msgstr ""
"\n"
"EOF ¤ň 3 ˛óĆɤߤޤ·¤ż -- ˝ŞÎ»¤·¤Ţ¤ą..\n"
-#: fdisk/fdisk.c:772
+#: fdisk/fdisk.c:785
msgid "Hex code (type L to list codes): "
msgstr "16żĘżôĄłˇĽĄÉ (L ĄłĄŢĄóĄÉ¤ÇĄłˇĽĄÉĄęĄąĄČÉ˝Ľ¨): "
-#: fdisk/fdisk.c:811
+#: fdisk/fdisk.c:824
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, ˝é´üĂÍ %d): "
-#: fdisk/fdisk.c:865
+#: fdisk/fdisk.c:878
#, c-format
msgid "Using default value %d\n"
msgstr "˝é´üĂÍ %d ¤ň»Č¤¤¤Ţ¤ą\n"
-#: fdisk/fdisk.c:869
+#: fdisk/fdisk.c:882
msgid "Value out of range.\n"
msgstr "ČĎ°Ďł°¤ÎĂͤǤąˇŁ\n"
-#: fdisk/fdisk.c:876
+#: fdisk/fdisk.c:889
msgid "Partition number"
msgstr "ÎΰčČÖąć"
-#: fdisk/fdisk.c:884
+#: fdisk/fdisk.c:897
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "·Ůąđ: Îΰč %d ¤Ď¶ő¤ÎĄżĄ¤Ą×¤Ç¤ąˇŁ\n"
-#: fdisk/fdisk.c:891
+#: fdisk/fdisk.c:904
msgid "cylinder"
msgstr "Ą·ĄęĄóĄŔ"
-#: fdisk/fdisk.c:891
+#: fdisk/fdisk.c:904
msgid "sector"
msgstr "Ą»ĄŻĄż"
-#: fdisk/fdisk.c:900
+#: fdisk/fdisk.c:913
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "%s ¤ÎÉ˝Ľ¨/ąŕĚÜĄćĄËĄĂĄČ¤ňĘŃąą¤·¤Ţ¤ą\n"
-#: fdisk/fdisk.c:910
+#: fdisk/fdisk.c:923
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "·Ůąđ: Îΰč %d ¤ĎłČÄĄÎΰč¤Ç¤ą\n"
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:936
msgid "DOS Compatibility flag is set\n"
msgstr "DOS ¸ß´ąĄŐĄéĄ°¤¬ŔßÄꤵ¤ě¤Ţ¤·¤ż\n"
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:940
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS ¸ß´ąĄŐĄéĄ°¤ĎŔßÄꤵ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1013
+#: fdisk/fdisk.c:1026
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Îΰč %d ¤Ď¤Ţ¤Ŕ¸şß¤·¤Ţ¤»¤óˇŞ\n"
-#: fdisk/fdisk.c:1018
+#: fdisk/fdisk.c:1031
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2299,7 +2508,7 @@ msgstr ""
"¿ʬŔő¤Ď¤«¤Ę¤ł¤Č¤Ç¤ąˇŁ¤˘¤Ę¤ż¤Ď `d' ĄłĄŢĄóĄÉ¤ň»Č¤Ă¤Ć¤ł¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ň\n"
"şď˝ü¤Ç¤­¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:1027
+#: fdisk/fdisk.c:1040
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2307,7 +2516,7 @@ msgstr ""
"¤˘¤Ę¤ż¤ĎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ňłČÄĄĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ËĘŃąą¤Ç¤­¤Ţ¤»¤ó¤·ˇ˘\n"
"¤˝¤ÎµŐ¤â¤Ţ¤ż¤Ç¤­¤Ţ¤»¤óˇŁ¤Ţ¤şşď˝ü¤ňąÔ¤Ę¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/fdisk.c:1036
+#: fdisk/fdisk.c:1049
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2316,7 +2525,7 @@ msgstr ""
"Îΰč 3 ¤ň Whole disk (5) ¤Č¤·¤Ć»Ä¤·¤Ć¤Ş¤Ż¤ł¤Č¤ňąÍθ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇ˘\n"
"SunOS/Solaris ¤Ď¤ł¤ě¤ň´üÂÔ¤·¤Ţ¤ą¤·ˇ˘Linux ¤Ç¤µ¤¨¤˝¤ě¤¬Ëľ¤Ţ¤·¤¤¤Ç¤ąˇŁ\n"
-#: fdisk/fdisk.c:1042
+#: fdisk/fdisk.c:1055
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2326,52 +2535,52 @@ msgstr ""
"volume (6) ¤Č¤·¤Ć»Ä¤·¤Ć¤Ş¤Ż¤ł¤Č¤ňąÍθ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁIRIX "
"¤Ď¤ł¤ě¤ň´üÂÔ¤·¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:1056
+#: fdisk/fdisk.c:1069
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Îΰč¤ÎĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ň %d ¤«¤é %x (%s) ¤ËĘŃąą¤·¤Ţ¤·¤ż\n"
-#: fdisk/fdisk.c:1109
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr "Îΰč %d ¤Ď°Ű¤Ę¤Ă¤żĘŞÍý/ĎŔÍýł«»Ď°ĚĂ֤ˤʤäƤ¤¤Ţ¤ą(Linux ¤Ç¤Ď̵¤¤?):\n"
-#: fdisk/fdisk.c:1111 fdisk/fdisk.c:1119 fdisk/fdisk.c:1128 fdisk/fdisk.c:1137
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " ĘŞÍý=(%d, %d, %d) "
-#: fdisk/fdisk.c:1112 fdisk/fdisk.c:1120
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "ĎŔÍý=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1117
+#: fdisk/fdisk.c:1130
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "Îΰč %d ¤Ď°Ű¤Ę¤Ă¤żĘŞÍý/ĎŔÍý˝ŞĹŔ¤Ë¤Ę¤Ă¤Ć¤¤¤Ţ¤ą:\n"
-#: fdisk/fdisk.c:1126
+#: fdisk/fdisk.c:1139
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Îΰč %i ¤ĎĄ·ĄęĄóĄŔ¶­ł¦¤Ç»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤»¤ó:\n"
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1142
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "(%d, %d, 1) ¤Ç¤˘¤ë¤Ů¤­¤Ç¤ą\n"
-#: fdisk/fdisk.c:1135
+#: fdisk/fdisk.c:1148
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Îΰč %i ¤ĎĄ·ĄęĄóĄŔ¶­ł¦¤Ç˝Ş¤ď¤Ă¤Ć¤¤¤Ţ¤»¤ó:\n"
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1151
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "(%d, %d, %d) ¤Ç¤˘¤ë¤Ů¤­¤Ç¤ą\n"
-#: fdisk/fdisk.c:1145
+#: fdisk/fdisk.c:1158
#, c-format
msgid ""
"\n"
@@ -2386,16 +2595,16 @@ msgstr ""
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1182
+#: fdisk/fdisk.c:1195
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
-msgstr "%*s ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ ĄÖĄíĄĂĄŻ ID Ą·ĄąĄĆĄŕ\n"
+msgstr "%*s ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ ĄÖĄíĄĂĄŻ ID Ą·ĄąĄĆĄŕ\n"
-#: fdisk/fdisk.c:1183 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr "ĄÇĄĐĄ¤Ąą"
-#: fdisk/fdisk.c:1223
+#: fdisk/fdisk.c:1236
#, c-format
msgid ""
"\n"
@@ -2406,104 +2615,104 @@ msgstr ""
"ĄÇĄŁĄąĄŻ %s: ĄŘĄĂĄÉ %d, Ą»ĄŻĄż %d, Ą·ĄęĄóĄŔ %d\n"
"\n"
-#: fdisk/fdisk.c:1225
+#: fdisk/fdisk.c:1238
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:1264
+#: fdisk/fdisk.c:1277
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "·Ůąđ: Îΰč %d ¤ĎĄ»ĄŻĄż 0 ¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1267
+#: fdisk/fdisk.c:1280
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Îΰč %d: ĄŘĄĂĄÉ %d ¤ĎşÇÂçĂÍ %d ¤č¤ę¤âÂ礭¤¤¤Ç¤ą\n"
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1283
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Îΰč %d: Ą»ĄŻĄż %d ¤ĎşÇÂçĂÍ %d ¤č¤ę¤âÂ礭¤¤¤Ç¤ą\n"
-#: fdisk/fdisk.c:1273
+#: fdisk/fdisk.c:1286
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Îΰč %d: Ą·ĄęĄóĄŔ %d ¤ĎşÇÂçĂÍ %d ¤č¤ę¤âÂ礭¤¤¤Ç¤ą\n"
-#: fdisk/fdisk.c:1277
+#: fdisk/fdisk.c:1290
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Îΰč %d: Á°¤ÎĄ»ĄŻĄż %d ¤Ďąç·× %d ¤Č°ěĂפ·¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1307
+#: fdisk/fdisk.c:1320
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "·Ůąđ: Îΰč %d ¤ËÉÔŔµ¤ĘĄÇˇĽĄżł«»Ď°ĚĂÖ¤¬¤˘¤ę¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1315
+#: fdisk/fdisk.c:1328
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "·Ůąđ: Îΰč %d ¤Ďˇ˘Îΰč %d ¤Č˝Ĺ¤Ę¤Ă¤Ć¤¤¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:1333
+#: fdisk/fdisk.c:1346
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "·Ůąđ: Îΰč %d ¤Ď¶ő¤Ç¤ą\n"
-#: fdisk/fdisk.c:1338
+#: fdisk/fdisk.c:1351
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "ĎŔÍýÎΰč %d ¤ĎÎΰč %d Á´ÂΤˤʤäƤ¤¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1344
+#: fdisk/fdisk.c:1357
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "ąç·×łÎĘÝĄ»ĄŻĄż %d ¤ĎşÇÂçĂÍ %d ¤č¤ę¤âÂ礭¤¤¤Ç¤ą\n"
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1360
#, c-format
msgid "%d unallocated sectors\n"
msgstr "łÎĘݤµ¤ě¤Ć¤¤¤Ę¤¤Ą»ĄŻĄż¤¬ %d ¤˘¤ę¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr "Îΰč %d ¤ĎÄęµÁşŃ¤Ç¤ąˇŁ¤Ţ¤ş¤Ďşď˝ü¤ňąÔ¤Ę¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/fdisk.c:1380 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr "şÇ˝é %s"
-#: fdisk/fdisk.c:1395 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Ą»ĄŻĄż %d ¤Ď´ű¤ËłÎĘݺѤߤǤą\n"
-#: fdisk/fdisk.c:1421
+#: fdisk/fdisk.c:1440
msgid "No free sectors available\n"
msgstr "ÍřÍѲÄÇ˝ĄŐĄęˇĽĄ»ĄŻĄż¤¬¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1431 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "˝ŞĹŔ %s ¤Ţ¤ż¤Ď +ĄµĄ¤Ąş ¤Ţ¤ż¤Ď +ĄµĄ¤ĄşM ¤Ţ¤ż¤Ď +ĄµĄ¤ĄşK"
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1480
#, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
msgstr "·Ůąđ: Îΰč %d ¤Ď´ńżôĄ»ĄŻĄżżô¤Ë¤Ę¤Ă¤Ć¤¤¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:1498 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:591
msgid "The maximum number of partitions has been created\n"
msgstr "şÇÂçÎΰčżô¤ĎşîŔ®şŃ¤Ç¤ą\n"
-#: fdisk/fdisk.c:1508
+#: fdisk/fdisk.c:1527
msgid "You must delete some partition and add an extended partition first\n"
msgstr "łČÄĄÎΰč¤ňÄɲ乤ëÁ°¤Ëˇ˘¤Ţ¤şÎΰč¤ňşď˝ü¤ą¤ëɬÍפ¬¤˘¤ę¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1512
+#: fdisk/fdisk.c:1531
#, c-format
msgid ""
"Command action\n"
@@ -2514,20 +2723,20 @@ msgstr ""
" %s\n"
" p ´đËÜÎΰč (1-4)\n"
-#: fdisk/fdisk.c:1514
+#: fdisk/fdisk.c:1533
msgid "l logical (5 or over)"
msgstr "l ĎŔÍý (5 °Ęľĺ)"
-#: fdisk/fdisk.c:1514
+#: fdisk/fdisk.c:1533
msgid "e extended"
msgstr "e łČÄĄ"
-#: fdisk/fdisk.c:1531
+#: fdisk/fdisk.c:1550
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "ĄżĄ¤Ą× `%c' ¤Ë¤Č¤Ă¤Ć¤ĎÉÔŔµ¤ĘÎΰčČÖąć¤Ç¤ą\n"
-#: fdisk/fdisk.c:1563
+#: fdisk/fdisk.c:1582
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2535,15 +2744,11 @@ msgstr ""
"ÎΰčĄĆˇĽĄÖĄë¤Ď¸ň´ą¤µ¤ě¤Ţ¤·¤żˇŞ\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1591
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "ioctl() ¤ň¸Ć¤Ó˝Đ¤·¤ĆÎΰčĄĆˇĽĄÖĄë¤ňşĆĆÉąţ¤ß¤·¤Ţ¤ąˇŁ\n"
-#: fdisk/fdisk.c:1582
-msgid "Syncing disks.\n"
-msgstr "ĄÇĄŁĄąĄŻ¤ňƱ´ü¤µ¤»¤Ţ¤ąˇŁ\n"
-
-#: fdisk/fdisk.c:1587
+#: fdisk/fdisk.c:1607
#, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
@@ -2552,7 +2757,7 @@ msgstr ""
"ĄĆˇĽĄÖĄë¤ÎşĆĆɤ߹ţ¤ß¤¬Ą¨ĄéˇĽĄąĄĆˇĽĄżĄą %d ¤ÇĽşÇÔ: %s.\n"
"ÎΰčľđĘó¤ňŔµ¤·¤Żąąż·¤µ¤»¤ë¤Ë¤ĎĄ·ĄąĄĆĄŕ¤ňşĆµŻĆ°¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/fdisk.c:1593
+#: fdisk/fdisk.c:1613
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2563,56 +2768,60 @@ msgstr ""
"·Ůąđ: DOS 6.x Îΰč¤ňşîŔ®ˇ˘¤Ţ¤ż¤ĎĘŃąą¤·¤Ć¤·¤Ţ¤Ă¤żľěąç¤Ďˇ˘\n"
"fdisk ĄŢĄËĄĺĄ˘ĄëĄÚˇĽĄ¸¤Ë¤˘¤ëÄɲþđĘó¤ň»˛ľČ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/fdisk.c:1624
+#: fdisk/fdisk.c:1620
+msgid "Syncing disks.\n"
+msgstr "ĄÇĄŁĄąĄŻ¤ňƱ´ü¤µ¤»¤Ţ¤ąˇŁ\n"
+
+#: fdisk/fdisk.c:1651
#, c-format
msgid "Device: %s\n"
msgstr "ĄÇĄĐĄ¤Ąą: %s\n"
-#: fdisk/fdisk.c:1639
+#: fdisk/fdisk.c:1666
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Îΰč %d ¤ËĄÇˇĽĄżÎΰ褬¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1645
+#: fdisk/fdisk.c:1672
msgid "New beginning of data"
msgstr "ż·µ¬ĄÇˇĽĄżł«»Ď°ĚĂÖ"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1686
msgid "Expert command (m for help): "
msgstr "Ą¨Ą­ĄąĄŃˇĽĄČĄłĄŢĄóĄÉ (m ¤ÇĄŘĄëĄ×): "
-#: fdisk/fdisk.c:1670
+#: fdisk/fdisk.c:1697
msgid "Number of cylinders"
msgstr "Ą·ĄęĄóĄŔżô"
-#: fdisk/fdisk.c:1691
+#: fdisk/fdisk.c:1718
msgid "Number of heads"
msgstr "ĄŘĄĂĄÉżô"
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1743
msgid "Number of sectors"
msgstr "Ą»ĄŻĄżżô"
-#: fdisk/fdisk.c:1719
+#: fdisk/fdisk.c:1746
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "·Ůąđ: DOS ¸ß´ą¤Î¤ż¤á¤ÎĄ»ĄŻĄżĄŞĄŐĄ»ĄĂĄČ¤ňŔßÄꤷ¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "ĄÇĄŁĄąĄŻ %s ¤ĎŔµľď¤ĘÎΰčĄĆˇĽĄÖĄë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1795
+#: fdisk/fdisk.c:1822
#, c-format
msgid "Cannot open %s\n"
msgstr "%s ¤ňł«¤±¤Ţ¤»¤ó\n"
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1887
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"¤ł¤ÎĄ«ˇĽĄÍĄë¤ĎĄ»ĄŻĄżĄµĄ¤Ąş¤ňĽ«Ę¬Ç§Ľ±¤·¤Ţ¤ą -- -b ĄŞĄ×Ą·ĄçĄó¤Ď̵»ë¤·¤Ţ¤ą\n"
-#: fdisk/fdisk.c:1864
+#: fdisk/fdisk.c:1890
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2620,16 +2829,11 @@ msgstr ""
"·Ůąđ: -b (Ą»ĄŻĄżĄµĄ¤ĄşŔßÄę) ĄŞĄ×Ą·ĄçĄó¤Ď 1 ¤Ä¤ÎĄÇĄĐĄ¤Ąą»ŘÄę¤Č¶¦¤Ë\n"
"»ČÍѤµ¤ě¤ë¤Ů¤­¤Ç¤ą\n"
-#: fdisk/fdisk.c:1985
-#, c-format
-msgid "Using %s as default device!\n"
-msgstr "ĄÇĄŐĄ©ĄëĄČĄÇĄĐĄ¤Ąą¤Č¤·¤Ć %s ¤ň»Č¤¤¤Ţ¤ąˇŞ\n"
-
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:1948
msgid "Command (m for help): "
msgstr "ĄłĄŢĄóĄÉ (m ¤ÇĄŘĄëĄ×): "
-#: fdisk/fdisk.c:2005
+#: fdisk/fdisk.c:1962
#, c-format
msgid ""
"\n"
@@ -2638,15 +2842,15 @@ msgstr ""
"\n"
"¸˝şß¤ÎĄÖˇĽĄČĄŐĄˇĄ¤Ąë¤Ď: %s\n"
-#: fdisk/fdisk.c:2007
+#: fdisk/fdisk.c:1964
msgid "Please enter the name of the new boot file: "
msgstr "ż·¤ż¤ĘĄÖˇĽĄČĄŐĄˇĄ¤ĄëĚľ¤ňĆţÎϤ·¤Ć¤Ż¤Ŕ¤µ¤¤: "
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:1966
msgid "Boot file unchanged\n"
msgstr "ĄÖˇĽĄČĄŐĄˇĄ¤Ąë¤ňĘŃąą¤·¤Ţ¤»¤ó¤Ç¤·¤ż\n"
-#: fdisk/fdisk.c:2069
+#: fdisk/fdisk.c:2026
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2671,6 +2875,18 @@ msgid ""
"\t to remove the disk logically from your AIX\n"
"\t machine. (Otherwise you become an AIXpert)."
msgstr ""
+"\n"
+" ¤ł¤ÎĄÇĄŁĄąĄŻ¤Ë¤ĎŔµľď¤Ę AIX ĄéĄŮĄë¤¬¤˘¤ę¤Ţ¤ąˇŁ\n"
+" Čóľď¤Ë»ÄÇ°¤Ç¤ą¤¬ˇ˘şŁ¤Î¤Č¤ł¤í Linux ¤Ď¤ł¤ě¤é¤ÎĄÇĄŁĄąĄŻ¤ň\n"
+" °·¤¦¤ł¤Č¤¬¤Ç¤­¤Ţ¤»¤óˇŁ¤·¤«¤·¤Ę¤¬¤éˇ˘¤¤¤Ż¤Ä¤«¤Î˝ő¸Ŕ¤ň\n"
+" ¤·¤Ć¤Ş¤­¤Ţ¤ą:\n"
+" 1. fdisk ¤Ď˝ń¤­ąţ¤ßĂć¤Ë¤˝¤ÎĆâÍƤňÇ˲ő¤·¤Ţ¤ąˇŁ\n"
+" 2. ¤ł¤ÎĄÇĄŁĄąĄŻ¤¬ĄÜĄęĄĺˇĽĄŕĄ°ĄëˇĽĄ×¤Î˝ĹÍפĘÉôʬ¤Ç¤Ď*¤Ę¤¤*»ö¤ň\n"
+" łÎ¤«¤á¤Ţ¤·¤ç¤¦ˇŁ(Âľ¤ÎĘýˡ¤Č¤·¤Ć¤Ďˇ˘ĄßĄéˇĽ¤·¤Ć¤¤¤ë¤Î¤Ç¤Ď¤Ę¤¤\n"
+" Âľ¤ÎĄÇĄŁĄąĄŻ¤ňşď˝ü¤ą¤ë¤Î¤â¤¤¤¤¤Ç¤·¤ç¤¦)\n"
+" 3. ¤ł¤ÎĘŞÍýĄÜĄęĄĺˇĽĄŕ¤ňşď˝ü¤ą¤ëÁ°¤Ëˇ˘¤˘¤Ę¤ż¤Î AIX ĄŢĄ·Ąó¤«¤é\n"
+" ɬ¤şĄÇĄŁĄąĄŻľĺ¤ÎĎŔÍýĄÇĄŁĄąĄŻ¤ňşď˝ü¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ(Âľ¤ÎĘýˡ\n"
+" ¤Č¤·¤Ć¤Ďˇ˘¤˘¤Ę¤ż¤¬ĂŁżÍ(AIXpert)¤Ë¤Ę¤ë¤ł¤Č¤Ç¤ą)"
#: fdisk/fdiskbsdlabel.c:97
#, c-format
@@ -2770,11 +2986,11 @@ msgstr " Ľč˝Đ¤·˛ÄÇ˝"
#: fdisk/fdiskbsdlabel.c:295
msgid " ecc"
-msgstr ""
+msgstr " ecc"
#: fdisk/fdiskbsdlabel.c:297
msgid " badsect"
-msgstr ""
+msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
@@ -2811,12 +3027,12 @@ msgstr "˛óĹľżô: %d\n"
#: fdisk/fdiskbsdlabel.c:307
#, c-format
msgid "interleave: %d\n"
-msgstr ""
+msgstr "interleave: %d\n"
#: fdisk/fdiskbsdlabel.c:308
#, c-format
msgid "trackskew: %d\n"
-msgstr ""
+msgstr "trackskew: %d\n"
#: fdisk/fdiskbsdlabel.c:309
#, c-format
@@ -2826,16 +3042,16 @@ msgstr "cylinderskew: %d\n"
#: fdisk/fdiskbsdlabel.c:310
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr ""
+msgstr "headswitch: %ld\t\t# ĄßĄęÉĂ\n"
#: fdisk/fdiskbsdlabel.c:311
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr ""
+msgstr "track-to-track seek: %ld\t# ĄßĄęÉĂ\n"
#: fdisk/fdiskbsdlabel.c:312
msgid "drivedata: "
-msgstr ""
+msgstr "drivedata: "
#: fdisk/fdiskbsdlabel.c:321
#, c-format
@@ -2848,7 +3064,7 @@ msgstr ""
#: fdisk/fdiskbsdlabel.c:322
msgid "# size offset fstype [fsize bsize cpg]\n"
-msgstr ""
+msgstr "# ĄµĄ¤Ąş ĄŞĄŐĄ»ĄĂĄČ fs ·ż [fsize bsize cpg]\n"
#: fdisk/fdiskbsdlabel.c:378
#, c-format
@@ -2860,98 +3076,99 @@ msgstr "%s%d ¤ËĄÇĄŁĄąĄŻĄéĄŮĄë¤ň˝ń¤­ąţ¤ß¤Ţ¤ąˇŁ\n"
msgid "Writing disklabel to %s.\n"
msgstr "%s ¤ËĄÇĄŁĄąĄŻĄéĄŮĄë¤ň˝ń¤­ąţ¤ß¤Ţ¤ąˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:392
+#: fdisk/fdiskbsdlabel.c:393
#, c-format
msgid "%s%d contains no disklabel.\n"
msgstr "%s%d ¤ĎĄÇĄŁĄąĄŻĄéĄŮĄë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤»¤óˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:395
+#: fdisk/fdiskbsdlabel.c:396
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s ¤ĎĄÇĄŁĄąĄŻĄéĄŮĄë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤»¤óˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:399
+#: fdisk/fdiskbsdlabel.c:400
msgid "Do you want to create a disklabel? (y/n) "
msgstr "ĄÇĄŁĄąĄŻĄéĄŮĄë¤ňşîŔ®¤·¤Ţ¤ą¤«? (y/n) "
-#: fdisk/fdiskbsdlabel.c:438
+#: fdisk/fdiskbsdlabel.c:439
msgid "bytes/sector"
msgstr "ĄĐĄ¤ĄČ/Ą»ĄŻĄż"
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:440
msgid "sectors/track"
msgstr "Ą»ĄŻĄż/ĄČĄéĄĂĄŻ"
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:441
msgid "tracks/cylinder"
msgstr "ĄČĄéĄĂĄŻ/Ą·ĄęĄóĄŔ"
-#: fdisk/fdiskbsdlabel.c:448
+#: fdisk/fdiskbsdlabel.c:449
msgid "sectors/cylinder"
msgstr "Ą»ĄŻĄż/Ą·ĄęĄóĄŔ"
-#: fdisk/fdiskbsdlabel.c:452
+#: fdisk/fdiskbsdlabel.c:453
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
+"ĄÇĄŐĄ©ĄëĄČ¤Ç sectors/track * tracks/cylinder °Ę˛Ľ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤é¤Ę¤¤ˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:454
+#: fdisk/fdiskbsdlabel.c:455
msgid "rpm"
-msgstr ""
+msgstr "rpm"
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:456
msgid "interleave"
-msgstr ""
+msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:457
msgid "trackskew"
-msgstr ""
+msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:458
msgid "cylinderskew"
-msgstr ""
+msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:459
msgid "headswitch"
-msgstr ""
+msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:460
msgid "track-to-track seek"
-msgstr ""
+msgstr "track-to-track seek"
-#: fdisk/fdiskbsdlabel.c:500
+#: fdisk/fdiskbsdlabel.c:501
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr ""
+msgstr "ĄÖˇĽĄČĄąĄČĄéĄĂĄ×: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:526
+#: fdisk/fdiskbsdlabel.c:527
msgid "Bootstrap overlaps with disk label!\n"
msgstr "ĄÖˇĽĄČĄąĄČĄéĄĂĄ×¤¬ĄÇĄŁĄąĄŻĄéĄŮĄë¤Č˝Ĺ¤Ę¤Ă¤Ć¤¤¤Ţ¤ąˇŞ\n"
-#: fdisk/fdiskbsdlabel.c:547
+#: fdisk/fdiskbsdlabel.c:548
#, c-format
msgid "Bootstrap installed on %s%d.\n"
msgstr "ĄÖˇĽĄČĄąĄČĄéĄĂĄ×¤Ď %s%d ¤ËĄ¤ĄóĄąĄČˇĽĄë¤µ¤ě¤Ţ¤·¤żˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:549
+#: fdisk/fdiskbsdlabel.c:550
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "ĄÖˇĽĄČĄąĄČĄéĄĂĄ×¤Ď %s ¤ËĄ¤ĄóĄąĄČˇĽĄë¤µ¤ě¤Ţ¤·¤żˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:570
+#: fdisk/fdiskbsdlabel.c:571
#, c-format
msgid "Partition (a-%c): "
msgstr "Îΰč (a-%c): "
-#: fdisk/fdiskbsdlabel.c:601
+#: fdisk/fdiskbsdlabel.c:602
msgid "This partition already exists.\n"
msgstr "¤ł¤ÎÎΰč¤Ď¤ą¤Ç¤Ë¸şß¤·¤Ţ¤ąˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:723
+#: fdisk/fdiskbsdlabel.c:724
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "·Ůąđ: Îΰ褬¿¤ą¤®¤Ţ¤ą (%d, şÇÂç¤Ď %d)ˇŁ\n"
-#: fdisk/fdiskbsdlabel.c:769
+#: fdisk/fdiskbsdlabel.c:770
msgid ""
"\n"
"Syncing disks.\n"
@@ -3138,7 +3355,7 @@ msgstr ""
#: fdisk/fdisksgilabel.c:448
msgid "More than one entire disk entry present.\n"
-msgstr "ĘŁżô¤ÎĄÇĄŁĄąĄŻÁ´ÂΤιŕĚܤ¬¤˘¤ę¤Ţ¤ąˇŁ\n"
+msgstr "ĘŁżô¤Î entire disk ¤ÎąŕĚܤ¬¤˘¤ę¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
msgid "No partitions defined\n"
@@ -3146,7 +3363,7 @@ msgstr "Îΰ褬ÄęµÁ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
#: fdisk/fdisksgilabel.c:463
msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr ""
+msgstr "IRIX ¤ĎĄŃˇĽĄĆĄŁĄ·ĄçĄó 11 ¤¬ entire disk ¤ňʤ¤¦¤Î¤ňËľ¤ß¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:465
#, c-format
@@ -3154,7 +3371,7 @@ msgid ""
"The entire disk partition should start at block 0,\n"
"not at diskblock %d.\n"
msgstr ""
-"Á´ÂÎĄÇĄŁĄąĄŻĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ďˇ˘ĄÖĄíĄĂĄŻ 0 ¤«¤é»Ď¤Ţ¤ë¤Ů¤­¤Ç¤ą¤¬ˇ˘\n"
+"entire disk ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ďˇ˘ĄÖĄíĄĂĄŻ 0 ¤«¤é»Ď¤Ţ¤ë¤Ů¤­¤Ç¤ą¤¬ˇ˘\n"
"ĄÇĄŁĄąĄŻĄÖĄíĄĂĄŻ %d ¤Ë¤Ę¤Ă¤Ć¤¤¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:469
@@ -3163,10 +3380,12 @@ msgid ""
"The entire disk partition is only %d diskblock large,\n"
"but the disk is %d diskblocks long.\n"
msgstr ""
+"entire disk ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ë %d ĄÇĄŁĄąĄŻĄÖĄíĄĂĄŻ¤ÎÂ礭¤µ¤·¤«¤Ę¤¤¤Ç¤ą¤¬ˇ˘\n"
+"¤˝¤ÎĄÇĄŁĄąĄŻ¤ÎÂ礭¤µ¤Ď %d ĄÇĄŁĄąĄŻĄÖĄíĄĂĄŻ¤Ç¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:476
msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó (#11) ¤ĎĄÇĄŁĄąĄŻÁ´ÂΤňʤ¤¦¤č¤¦¤Ë¤ą¤Ů¤­¤Ç¤ąˇŁ\n"
+msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó (#11) ¤Ď entire disk ¤ňʤ¤¦¤Ů¤­¤Ç¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:488
#, c-format
@@ -3218,7 +3437,7 @@ msgstr "\t¤˘¤Ę¤ż¤Ďˇ˘ĄÖˇĽĄČĄŐĄˇĄ¤ĄëĚľ¤Č¤·¤ĆÄĚľď¤Č°Ű¤Ę¤ëĚľÁ°¤ňÁŞ¤Ó¤Ţ¤·¤żˇŁ\n"
#: fdisk/fdisksgilabel.c:569
msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
+msgstr "»ÄÇ°¤Ę¤¬¤éˇ˘¶ő¤Ç¤Ď¤Ę¤¤Îΰč¤ÎĄżĄ°¤ňĘŃąą¤ą¤ë¤ł¤Č¤Ë¤Ę¤ę¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:576
msgid ""
@@ -3228,38 +3447,45 @@ 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 ""
+"¤˝¤ÎÎΰč¤ÎĄŞĄŐĄ»ĄĂĄČ 0 ČÖĂĎ¤Ď \"SGI volhdr\" ·ż¤Ë¤Ę¤Ă¤Ć¤¤¤ë¤ł¤Č¤ň¶Ż¤Żżäľ©\n"
+"¤·¤Ţ¤ąˇŁIRIX Ą·ĄąĄĆĄŕ¤Ç¤Ď sash ¤ä fx ¤ÎÍͤʥąĄżĄóĄÉĄ˘ĄíĄóĄÄˇĽĄë¤¬¤˝¤Î¤ł¤Č¤Ë\n"
+"°Í¸¤·¤ĆĄÇĄŁĄěĄŻĄČĄę¤«¤é¸ˇş÷¤ą¤ë¤ł¤Č¤Ë¤Ę¤ę¤Ţ¤ąˇŁ\"SGI volume\" entire disk\n"
+"¤Ŕ¤±¤¬ˇ˘¤ł¤Î¤ł¤Č¤ňĚȤě¤Ţ¤ąˇŁ\n"
+"¤ł¤ÎÎΰč¤Ë°Ű¤Ę¤ëĄżĄ°ÉŐ¤±¤Ë¤Ä¤¤¤Ćˇ˘¤č¤Ż˛ň¤Ă¤Ć¤¤¤ë¤Ę¤é YES ¤ČĆţÎϤ·¤Ć˛Ľ¤µ¤¤ˇŁ\n"
#. rebuild freelist
#: fdisk/fdisksgilabel.c:621
msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr ""
+msgstr "ĄÇĄŁĄąĄŻ¤ÎÎΰčƱ»Î¤¬˝ĹĘŁ¤·¤Ć¤¤¤ë¤ł¤Č¤ňĂΤäƤޤą¤«ˇ©\n"
#: fdisk/fdisksgilabel.c:691
msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr ""
+msgstr "entire disk ąŕĚܤμ«Ć°Ŕ¸Ŕ®¤ň»î¤ß¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:698
msgid "The entire disk is already covered with partitions.\n"
-msgstr ""
+msgstr "entire disk ¤¬´ű¤ËÎΰč¤ňʤ¤Ă¤Ć¤¤¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:703
msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
+msgstr "ĄÇĄŁĄąĄŻ¤ÎÎΰ褬˝ĹĘŁ¤·¤Ć¤¤¤Ţ¤ąˇŁ¤Ţ¤ş¤ł¤ě¤ň˛ż¤Č¤«¤·¤Ţ¤·¤ç¤¦ˇŞ\n"
#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
msgid ""
"It is highly recommended that eleventh partition\n"
"covers the entire disk and is of type `SGI volume'\n"
msgstr ""
+"11 ČÖĚܤÎÎΰč¤Ď entire disk ¤ňʤ¤¤ˇ˘`SGI volume' ·ż¤Ç¤˘¤ë¤ł¤Č¤ň\n"
+"¶Ż¤Żżäľ©¤·¤Ţ¤ą\n"
#: fdisk/fdisksgilabel.c:728
msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
+msgstr "ĄÇĄŁĄąĄŻ¤ÎÎΰ褬˝ĹĘŁ¤ą¤ë¤ł¤Č¤Ë¤Ę¤ę¤Ţ¤ąˇŁ¤Ţ¤ş¤ł¤ě¤ň˛ż¤Č¤«¤·¤Ţ¤·¤ç¤¦ˇŞ\n"
#: fdisk/fdisksgilabel.c:733
#, c-format
msgid " Last %s"
-msgstr ""
+msgstr " şÇ¸ĺ¤Î %s"
#: fdisk/fdisksgilabel.c:756
msgid ""
@@ -3268,16 +3494,19 @@ msgid ""
"content will be unrecoverable lost.\n"
"\n"
msgstr ""
+"ż·¤ż¤Ę SGI ĄÇĄŁĄąĄŻĄéĄŮĄëą˝ĂŰĂć¤Ë¤Ďˇ˘ĘŃąą¤Ď¤˝¤Î˝ń¤­ąţ¤ß¤ň·čÄꤹ¤ë¤Ţ¤Ç\n"
+"ĄáĄâĄęĆâ¤Ë¤Î¤ßČż±Ç¤µ¤ě¤Ţ¤ąˇŁ¤˝¤Î¸ĺ¤Ď¤â¤Á¤í¤óˇ˘°ĘÁ°¤ÎĆâÍƤϼş¤ď¤ěˇ˘\n"
+"Éü¸µ¤ĎÉÔ˛ÄÇ˝¤Č¤Ę¤ę¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:784
#, c-format
msgid "Trying to keep parameters of partition %d.\n"
-msgstr ""
+msgstr "Îΰč %d ¤ÎĂͤÎĘݸ¤ň»î¤ß¤Ţ¤ąˇŁ\n"
#: fdisk/fdisksgilabel.c:786
#, c-format
msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr ""
+msgstr "ID=%02x\tł«»Ď=%d\tÄą¤µ=%d\n"
#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
msgid "Empty"
@@ -3382,7 +3611,7 @@ msgstr "Ą·ĄęĄóĄŔËč¤ÎĆĂĘ̤ʥ»ĄŻĄż"
#: fdisk/fdisksunlabel.c:334
msgid "You may change all the disk params from the x menu"
-msgstr ""
+msgstr "Á´¤Ć¤ÎĄÇĄŁĄąĄŻĄŃĄéĄáˇĽĄż¤ň x ĄáĄËĄĺˇĽ¤«¤éĘŃąą¤Ç¤­¤Ţ¤ą"
#: fdisk/fdisksunlabel.c:337
msgid "3,5\" floppy"
@@ -3502,19 +3731,19 @@ msgstr "ĘŞÍýĄ·ĄęĄóĄŔżô"
#: fdisk/i386_sys_types.c:7
msgid "FAT12"
-msgstr ""
+msgstr "FAT12"
#: fdisk/i386_sys_types.c:8
msgid "XENIX root"
-msgstr ""
+msgstr "XENIX root"
#: fdisk/i386_sys_types.c:9
msgid "XENIX usr"
-msgstr ""
+msgstr "XENIX usr"
#: fdisk/i386_sys_types.c:10
msgid "FAT16 <32M"
-msgstr ""
+msgstr "FAT16 <32M"
#: fdisk/i386_sys_types.c:11
msgid "Extended"
@@ -3523,7 +3752,7 @@ msgstr "łČÄĄÎΰč"
#. DOS 3.3+ extended partition
#: fdisk/i386_sys_types.c:12
msgid "FAT16"
-msgstr ""
+msgstr "FAT16"
#. DOS 16-bit >=32M
#: fdisk/i386_sys_types.c:13
@@ -3533,7 +3762,7 @@ msgstr "HPFS/NTFS"
#. OS/2 IFS, eg, HPFS or NTFS or QNX
#: fdisk/i386_sys_types.c:14
msgid "AIX"
-msgstr ""
+msgstr "AIX"
#. AIX boot (AIX -- PS/2 port) or SplitDrive
#: fdisk/i386_sys_types.c:15
@@ -3617,11 +3846,11 @@ msgstr "Venix 80286"
#: fdisk/i386_sys_types.c:34
msgid "PPC PReP Boot"
-msgstr ""
+msgstr "PPC PReP Boot"
#: fdisk/i386_sys_types.c:35
msgid "SFS"
-msgstr ""
+msgstr "SFS"
#: fdisk/i386_sys_types.c:36
msgid "QNX4.x"
@@ -3637,37 +3866,37 @@ msgstr "QNX4.x 3rd part"
#: fdisk/i386_sys_types.c:39
msgid "OnTrack DM"
-msgstr ""
+msgstr "OnTrack DM"
#: fdisk/i386_sys_types.c:40
msgid "OnTrack DM6 Aux1"
-msgstr ""
+msgstr "OnTrack DM6 Aux1"
#. (or Novell)
#: fdisk/i386_sys_types.c:41
msgid "CP/M"
-msgstr ""
+msgstr "CP/M"
#. CP/M or Microport SysV/AT
#: fdisk/i386_sys_types.c:42
msgid "OnTrack DM6 Aux3"
-msgstr ""
+msgstr "OnTrack DM6 Aux3"
#: fdisk/i386_sys_types.c:43
msgid "OnTrackDM6"
-msgstr ""
+msgstr "OnTrackDM6"
#: fdisk/i386_sys_types.c:44
msgid "EZ-Drive"
-msgstr ""
+msgstr "EZ-Drive"
#: fdisk/i386_sys_types.c:45
msgid "Golden Bow"
-msgstr ""
+msgstr "Golden Bow"
#: fdisk/i386_sys_types.c:46
msgid "Priam Edisk"
-msgstr ""
+msgstr "Priam Edisk"
#. DOS R/O or SpeedStor
#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
@@ -3768,17 +3997,17 @@ msgstr "Syrinx"
#: fdisk/i386_sys_types.c:73
msgid "CP/M / CTOS / ..."
-msgstr ""
+msgstr "CP/M / CTOS / ..."
#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
#: fdisk/i386_sys_types.c:74
msgid "DOS access"
-msgstr ""
+msgstr "DOS access"
#. DOS access or SpeedStor 12-bit FAT extended partition
#: fdisk/i386_sys_types.c:75
msgid "DOS R/O"
-msgstr ""
+msgstr "DOS R/O"
#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
#: fdisk/i386_sys_types.c:77
@@ -3793,93 +4022,93 @@ msgstr "DOS Ą»Ą«ĄóĄŔĄę"
#. DOS 3.3+ secondary
#: fdisk/i386_sys_types.c:81
msgid "Linux raid autodetect"
-msgstr ""
+msgstr "Linux raid Ľ«Ć°¸ˇ˝Đ"
#. New (2.2.x) raid partition with autodetect
#. using persistent superblock
#: fdisk/i386_sys_types.c:83
msgid "LANstep"
-msgstr ""
+msgstr "LANstep"
#. SpeedStor >1024 cyl. or LANstep
#: fdisk/i386_sys_types.c:84
msgid "BBT"
-msgstr ""
+msgstr "BBT"
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
msgstr "%s ¤ÎĄ·ˇĽĄŻĄ¨ĄéˇĽ -- %lu ¤ňĄ·ˇĽĄŻ¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:153
+#: fdisk/sfdisk.c:152
#, 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:199
+#: fdisk/sfdisk.c:198
msgid "out of memory - giving up\n"
msgstr "ĄáĄâĄę¤¬Â­¤ę¤Ţ¤»¤ó -- Äü¤á¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
msgstr "%s ¤ÎĆɤ߼č¤ęĄ¨ĄéˇĽ -- Ą»ĄŻĄż %lu ¤ňĆɤá¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr "Ą¨ĄéˇĽ: Ą»ĄŻĄż %lu ¤Ë¤Ď msdos ĄµĄ¤Ąó¤¬¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
msgstr "%s ¤Ř¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ -- Ą»ĄŻĄż %lu ¤Ë˝ń¤­ąţ¤á¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:274
+#: fdisk/sfdisk.c:273
#, c-format
msgid "cannot open partition sector save file (%s)\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄ»ĄŻĄżĘݸĄŐĄˇĄ¤Ąë (%s) ¤ňĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:292
+#: fdisk/sfdisk.c:291
#, c-format
msgid "write error on %s\n"
msgstr "%s ¤Ř¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ\n"
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, c-format
msgid "cannot stat partition restore file (%s)\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóÉü¸µĄŐĄˇĄ¤Ąë (%s) ¤ÎľđĘó¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
msgid "partition restore file has wrong size - not restoring\n"
msgstr ""
"ĄŃˇĽĄĆĄŁĄ·ĄçĄóÉü¸µĄŐĄˇĄ¤Ąë¤ÎĄµĄ¤Ąş¤¬´Ö°ă¤Ă¤Ć¤¤¤Ţ¤ą -- Éü¸µ¤ňąÔ¤Ę¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:318
msgid "out of memory?\n"
msgstr "ĄáĄâĄę¤¬Â­¤ę¤Ę¤¤ˇ©\n"
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, c-format
msgid "cannot open partition restore file (%s)\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóÉü¸µĄŐĄˇĄ¤Ąë (%s) ¤ňł«¤±¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:331
+#: fdisk/sfdisk.c:330
#, c-format
msgid "error reading %s\n"
msgstr "%s ¤ÎĆɤ߼č¤ęĄ¨ĄéˇĽ\n"
-#: fdisk/sfdisk.c:338
+#: fdisk/sfdisk.c:337
#, c-format
msgid "cannot open device %s for writing\n"
msgstr "ĄÇĄĐĄ¤Ąą %s ¤ň˝ń¤­ąţ¤ß¤č¤¦¤ËĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
-msgstr "%s ¤ÎĄ»ĄŻĄż %lu ¤Ř¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ\n"
+msgstr "%2$s ¤ÎĄ»ĄŻĄż %1$lu ¤Ř¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ\n"
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3891,27 +4120,27 @@ msgstr ""
"¤ł¤ł¤Ë fdisk ¤ňÍřÍѤą¤ë¤Î¤Ď¿ʬ°ŐĚŁ¤¬¤Ę¤¤¤ł¤Č¤Ç¤ąˇŁ\n"
"[ËÜĹö¤Ë¤ł¤ě¤ňąÔ¤Ę¤¤¤ż¤±¤ě¤Đˇ˘--force ĄŞĄ×Ą·ĄçĄó¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤]\n"
-#: fdisk/sfdisk.c:422
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr "·Ůąđ: HDIO_GETGEO ¤ĎĄŘĄĂĄÉżô¤ň %d ¤ČĘÖ¤·¤Ţ¤·¤ż\n"
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr "·Ůąđ: HDIO_GETGEO ¤ĎĄ»ĄŻĄżżô¤ň %d ¤ČĘÖ¤·¤Ţ¤·¤ż\n"
-#: fdisk/sfdisk.c:428
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr "·Ůąđ: HDIO_GETGEO ¤ĎĄ·ĄęĄóĄŔżô¤ň %d ¤ČĘÖ¤·¤Ţ¤·¤ż\n"
-#: fdisk/sfdisk.c:432
+#: fdisk/sfdisk.c:431
#, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr "ĄÇĄŁĄąĄŻ %s: Ą¸ĄŞĄáĄČĄę¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -3921,7 +4150,7 @@ msgstr ""
"¤ł¤ě¤Ďˇ˘C/H/S ¤ňĄ˘ĄÉĄěĄąĽčĆŔ¤ËÍřÍѤ·¤Ć¤¤¤ëÁ´¤Ć¤ÎĄ˝ĄŐĄČĄ¦Ą§Ą˘¤Çˇ˘\n"
"ĚäÂ꤬Ŕ¸¤ş¤ë¤ł¤Č¤Ë¤Ę¤ę¤Ţ¤ąˇŁ\n"
-#: fdisk/sfdisk.c:438
+#: fdisk/sfdisk.c:437
#, c-format
msgid ""
"\n"
@@ -3930,32 +4159,32 @@ msgstr ""
"\n"
"ĄÇĄŁĄąĄŻ %s: Ą·ĄęĄóĄŔżô %luˇ˘ĄŘĄĂĄÉżô %luˇ˘%lu Ą»ĄŻĄż/ĄČĄéĄĂĄŻ\n"
-#: fdisk/sfdisk.c:518
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr ""
-"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄŘĄĂĄÉżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą:\n"
-" (0-%3$d ¤Ë¤·¤Ć¤Ż¤Ŕ¤µ¤¤)\n"
+"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄŘĄĂĄÉżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą: %3$d\n"
+" (0-%4$d ¤Ë¤·¤Ć¤Ż¤Ŕ¤µ¤¤)\n"
-#: fdisk/sfdisk.c:523
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
-"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄ»ĄŻĄżżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą:\n"
-" (1-%3$d ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó)\n"
+"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄ»ĄŻĄżżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą: %3$d\n"
+" (1-%4$d ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó)\n"
-#: fdisk/sfdisk.c:528
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
"0-%d)\n"
msgstr ""
-"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄ·ĄęĄóĄŔżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą:\n"
-" (0-%3$d ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó)\n"
+"ĄŃˇĽĄĆĄŁĄ·ĄçĄó %2$s ¤ÎĄ·ĄęĄóĄŔżô¤Č¤·¤Ć %1$s ¤ĎÉÔ˛ÄÇ˝¤Ç¤ą: %3$d\n"
+" (0-%4$d ¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó)\n"
-#: fdisk/sfdisk.c:567
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
@@ -3963,11 +4192,11 @@ msgstr ""
"Id ĚľÁ°\n"
"\n"
-#: fdisk/sfdisk.c:720
+#: fdisk/sfdisk.c:719
msgid "Re-reading the partition table ...\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄë¤ňşĆĆɤ߹ţ¤ßĂć...\n"
-#: fdisk/sfdisk.c:726
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
@@ -3975,39 +4204,31 @@ msgstr ""
"ĄŃˇĽĄĆĄŁĄ·ĄçĄóşÝĆÉąţ¤ßĄłĄŢĄóĄÉ¤¬ĽşÇÔ¤·¤Ţ¤·¤ż\n"
"mkfs ¤ň»Č¤¦Á°¤Ëˇ˘Ą·ĄąĄĆĄŕ¤ňşĆµŻĆ°¤·¤Ć¤Ż¤Ŕ¤µ¤¤\n"
-#: fdisk/sfdisk.c:731
+#: fdisk/sfdisk.c:730
#, c-format
msgid "Error closing %s\n"
msgstr "%s ¤ÎĄŻĄíˇĽĄşĄ¨ĄéˇĽ\n"
-#: fdisk/sfdisk.c:769
+#: fdisk/sfdisk.c:768
#, c-format
msgid "%s: no such partition\n"
msgstr "%s: ¤˝¤Î¤č¤¦¤ĘĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:792
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr "ǧĽ±¤Ç¤­¤Ę¤¤ĄŐĄ©ˇĽĄŢĄĂĄČ -- Ą»ĄŻĄżżô¤ňÍřÍѤ·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:831
+#: fdisk/sfdisk.c:830
#, c-format
msgid "# partition table of %s\n"
msgstr "# %s ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄë\n"
-#: fdisk/sfdisk.c:832
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-"unit: Ą»ĄŻĄżżô\n"
-"\n"
-
-#: fdisk/sfdisk.c:842
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr "̤ĽÂÁő¤ÎĄŐĄ©ˇĽĄŢĄĂĄČ -- %s ¤ňÍřÍѤ·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4016,11 +4237,11 @@ msgstr ""
"ĄćĄËĄĂĄČ = %lu ĄĐĄ¤ĄČ¤ÎĄ·ĄęĄóĄŔˇ˘1024 ĄĐĄ¤ĄČ¤ÎĄÖĄíĄĂĄŻˇ˘%d ¤«¤éżô¤¨¤Ţ¤ą\n"
"\n"
-#: fdisk/sfdisk.c:849
+#: fdisk/sfdisk.c:848
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr "ĄÇĄĐĄ¤Ąą ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ #Ą·ĄęĄóĄŔ #ĄÖĄíĄĂĄŻ ID Ą·ĄąĄĆĄŕ\n"
-#: fdisk/sfdisk.c:854
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
@@ -4029,11 +4250,11 @@ msgstr ""
"ĄćĄËĄĂĄČ = 512 ĄĐĄ¤ĄČ¤ÎĄ»ĄŻĄżˇ˘%d ¤«¤éżô¤¨¤Ţ¤ą\n"
"\n"
-#: fdisk/sfdisk.c:856
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr " ĄÇĄĐĄ¤Ąą ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ #Ą»ĄŻĄż ID Ą·ĄąĄĆĄŕ\n"
-#: fdisk/sfdisk.c:859
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
@@ -4042,11 +4263,11 @@ msgstr ""
"ĄćĄËĄĂĄČ = 1024 ĄĐĄ¤ĄČ¤ÎĄÖĄíĄĂĄŻˇ˘%d ¤«¤éżô¤¨¤Ţ¤ą\n"
"\n"
-#: fdisk/sfdisk.c:861
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr " ĄÇĄĐĄ¤Ąą ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ #ĄÖĄíĄĂĄŻ ID Ą·ĄąĄĆĄŕ\n"
-#: fdisk/sfdisk.c:864
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4055,40 +4276,21 @@ msgstr ""
"Units = 1048576 ĄĐĄ¤ĄČ¤ňĄáĄ¬ĄĐĄ¤ĄČˇ˘1024 ĄĐĄ¤ĄČ¤ÎĄÖĄíĄĂĄŻˇ˘%d ¤«¤éżô¤¨¤Ţ¤ą\n"
"\n"
-#: fdisk/sfdisk.c:866
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr "ĄÇĄĐĄ¤Ąą ĄÖˇĽĄČ »ĎĹŔ ˝ŞĹŔ MB #ĄÖĄíĄĂĄŻ ID Ą·ĄąĄĆĄŕ\n"
-#: fdisk/sfdisk.c:932
-#, c-format
-msgid " start=%9lu"
-msgstr " ł«»Ď=%9lu"
-
-#: fdisk/sfdisk.c:933
-#, c-format
-msgid ", size=%8lu"
-msgstr ", ĄµĄ¤Ąş=%8lu"
-
-#: fdisk/sfdisk.c:935
-#, c-format
-msgid ", Id=%2x"
-msgstr ", Id=%2x"
-
-#: fdisk/sfdisk.c:937
-msgid ", bootable"
-msgstr ", ĄÖˇĽĄČ˛Ä"
-
-#: fdisk/sfdisk.c:998
+#: fdisk/sfdisk.c:997
#, 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:1005
+#: fdisk/sfdisk.c:1004
#, 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:1008
+#: fdisk/sfdisk.c:1007
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr "Ą·ĄęĄóĄŔ %ld ¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Î˝ŞĹŔˇ˘ĄÇĄŁĄąĄŻ¤ÎşÇ¸ĺ¤ň±Ű¤¨¤Ć¤¤¤Ţ¤ą\n"
@@ -4097,7 +4299,7 @@ msgstr "Ą·ĄęĄóĄŔ %ld ¤ËĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Î˝ŞĹŔˇ˘ĄÇĄŁĄąĄŻ¤ÎşÇ¸ĺ¤ň±Ű¤¨¤Ć¤¤¤Ţ¤ą\n"
msgid "No partitions found\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1021
+#: fdisk/sfdisk.c:1025
#, c-format
msgid ""
"Warning: The first partition looks like it was made\n"
@@ -4108,94 +4310,94 @@ msgstr ""
" (%ld/%ld/%ld ¤Î¤«¤ď¤ę¤Ë)ˇŁ\n"
"¤ł¤ÎĄęĄąĄČ¤Ďˇ˘¤˝¤ÎĄ¸ĄŞĄáĄČĄę¤Č¸«¤Ę¤·¤Ţ¤ąˇŁ\n"
-#: fdisk/sfdisk.c:1068
+#: fdisk/sfdisk.c:1075
msgid "no partition table present.\n"
msgstr "¸˝şßĄŃˇĽĄĆĄŁĄ·ĄçĄóľđĘó¤Ď¤˘¤ę¤Ţ¤»¤óˇŁ\n"
-#: fdisk/sfdisk.c:1070
+#: fdisk/sfdisk.c:1077
#, c-format
msgid "strange, only %d partitions defined.\n"
msgstr "ĘѤǤąˇ˘%d ¤Ä¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤·¤«ÄęµÁ¤µ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
-#: fdisk/sfdisk.c:1079
+#: fdisk/sfdisk.c:1086
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
msgstr ""
"·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄµĄ¤Ąş 0 ¤Ç¤ą¤¬ˇ˘¶ő¤Č¤·¤ĆĄŢˇĽĄŻ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1082
+#: fdisk/sfdisk.c:1089
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄµĄ¤Ąş 0 ¤Ę¤Î¤ËĄÖˇĽĄČ˛ÄÇ˝¤Ç¤ąˇŁ\n"
-#: fdisk/sfdisk.c:1085
+#: fdisk/sfdisk.c:1092
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄµĄ¤Ąş 0 ¤Çˇ˘ČóĄĽĄí¤Îł«»Ď°ĚĂ֤Ǥą\n"
-#: fdisk/sfdisk.c:1096
+#: fdisk/sfdisk.c:1103
#, c-format
msgid "Warning: partition %s "
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤Ďˇ˘"
-#: fdisk/sfdisk.c:1097
+#: fdisk/sfdisk.c:1104
#, c-format
msgid "is not contained in partition %s\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤Ë´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1108
+#: fdisk/sfdisk.c:1115
#, c-format
msgid "Warning: partitions %s "
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s "
-#: fdisk/sfdisk.c:1109
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr "¤Č %s ¤¬˝Ĺ¤Ę¤Ă¤Ć¤¤¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1127
#, c-format
msgid "Warning: partition %s contains part of "
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤¬"
-#: fdisk/sfdisk.c:1121
+#: fdisk/sfdisk.c:1128
#, c-format
msgid "the partition table (sector %lu),\n"
-msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s (Ą»ĄŻĄż %lu)¤Î°ěÉô¤ň´Ţ¤ó¤Ç¤Ş¤ęˇ˘\n"
+msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóĄĆˇĽĄÖĄë (Ą»ĄŻĄż %lu)¤Î°ěÉô¤ň´Ţ¤ó¤Ç¤Ş¤ęˇ˘\n"
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr "¤ł¤ě¤ňąÔ¤¦¤Čˇ˘Ç˲ő¤µ¤ě¤Ć¤·¤Ţ¤¦¤ł¤Č¤Ë¤Ę¤ë¤Ç¤·¤ç¤¦\n"
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1138
#, c-format
msgid "Warning: partition %s starts at sector 0\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤¬Ą»ĄŻĄż 0 ¤«¤é»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1135
+#: fdisk/sfdisk.c:1142
#, c-format
msgid "Warning: partition %s extends past end of disk\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄÇĄŁĄąĄŻ¤Î˝Ş¤ę¤ň±Ű¤¨¤Ć¤¤¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr "´đËÜÎΰčĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ç¤Ďˇ˘łČÄĄĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ď°ě¤Ä¤Ŕ¤±şî¤ě¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr " (Linux ¤Ç¤ĎĚäÂę¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó¤±¤É¤â)\n"
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1174
#, c-format
msgid "Warning: partition %s does not start at a cylinder boundary\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄ·ĄęĄóĄŔ¶­ł¦¤«¤é»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1173
+#: fdisk/sfdisk.c:1180
#, c-format
msgid "Warning: partition %s does not end at a cylinder boundary\n"
msgstr "·Ůąđ: ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤ĎĄ·ĄęĄóĄŔ¶­ł¦¤Ç˝Ş¤ď¤Ă¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1191
+#: fdisk/sfdisk.c:1198
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"
@@ -4204,7 +4406,7 @@ msgstr ""
"LILO ¤Ë¤Č¤Ă¤Ć¤ĎĚäÂꤢ¤ę¤Ţ¤»¤ó¤¬ˇ˘DOS ¤Î MBR ¤Ď¤ł¤ÎĄÇĄŁĄąĄŻ¤ňĄÖˇĽĄČ¤Ç¤­¤Ę¤Ż\n"
"¤Ę¤Ă¤Ć¤·¤Ţ¤¤¤Ţ¤ąˇŁ\n"
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
@@ -4212,7 +4414,7 @@ msgstr ""
"·Ůąđ: ÉáÄ̤ϥץ饤ĄŢĄęĄŃˇĽĄĆĄŁĄ·ĄçĄó°ě¤Ä¤ňĄÖˇĽĄČ¤Ç¤­¤ë¤č¤¦¤Ë¤·¤Ţ¤ąˇŁ\n"
"LILO ¤Ď `ĄÖˇĽĄČ˛ÄÇ˝' ĄŐĄéĄ°¤ň̵»ë¤·¤Ţ¤ą¤±¤É¤âˇŁ\n"
-#: fdisk/sfdisk.c:1204
+#: fdisk/sfdisk.c:1211
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"
@@ -4221,152 +4423,152 @@ msgstr ""
"LILO ¤Ë¤Č¤Ă¤Ć¤ĎĚäÂꤢ¤ę¤Ţ¤»¤ó¤¬ˇ˘DOS MBR ¤Ď¤ł¤ÎĄÇĄŁĄąĄŻ¤ňĄÖˇĽĄČ¤Ç¤­¤Ę¤Ż\n"
"¤Ę¤Ă¤Ć¤·¤Ţ¤¤¤Ţ¤ąˇŁ\n"
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1228
#, 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:1230
+#: fdisk/sfdisk.c:1237
#, 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:1233
+#: fdisk/sfdisk.c:1240
#, 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:1266 fdisk/sfdisk.c:1343
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, c-format
msgid "too many partitions - ignoring those past nr (%d)\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Âż¤ą¤®¤Ţ¤ą -- nr (%d) °Ęąß¤ň̵»ë¤·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1288
msgid "tree of partitions?\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤ÎĄÄĄęˇĽˇ©\n"
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr "Disk Manager ¤ň¸ˇ˝Đ -- ¤ł¤ě¤ňĘáÂŞ¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr "DM6 ĄµĄ¤Ąó¤ňČŻ¸« -- Äü¤á¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1412
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr "ĘѤǤą..., ĄµĄ¤Ąş 0 ¤ÎłČÄĄĄŃˇĽĄĆĄŁĄ·ĄçĄó ˇ©\n"
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr "ĘѤǤą..., ĄµĄ¤Ąş 0 ¤Î BSD ĄŃˇĽĄĆĄŁĄ·ĄçĄóˇ©\n"
-#: fdisk/sfdisk.c:1451
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr " %s: ǧĽ±¤Ç¤­¤Ę¤¤ĄŃˇĽĄĆĄŁĄ·ĄçĄó\n"
-#: fdisk/sfdisk.c:1463
+#: fdisk/sfdisk.c:1470
msgid "-n flag was given: Nothing changed\n"
msgstr "-n ĄŐĄéĄ°¤¬Íż¤¨¤é¤ě¤Ţ¤·¤ż: ˛ż¤âĘŃąą¤·¤Ţ¤»¤ó¤Ç¤·¤ż\n"
-#: fdisk/sfdisk.c:1476
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr "¸Ĺ¤¤Ą»ĄŻĄż¤ÎĘݸ¤ËĽşÇÔ -- ĂćĂǤ·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1481
+#: fdisk/sfdisk.c:1488
#, c-format
msgid "Failed writing the partition on %s\n"
msgstr "%s ¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó˝ń¤­ąţ¤ß¤ËĽşÇÔ\n"
-#: fdisk/sfdisk.c:1558
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr "Äą¤¤¤«ÉÔ´°Á´¤ĘąÔ¤ÎĆţÎĎ -- Ăć»ß¤·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1594
+#: fdisk/sfdisk.c:1601
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr "ĆţÎĎĄ¨ĄéˇĽ: `=' ¤Ď %s ĄŐĄŁˇĽĄëĄÉ¤Î¸ĺ¤Ë¤·¤Ć¤Ż¤Ŕ¤µ¤¤\n"
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1608
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr "ĆţÎĎĄ¨ĄéˇĽ: %2$s ĄŐĄŁˇĽĄëĄÉ¤Î¸ĺ¤ÎÍ˝´ü¤·¤Ę¤¤Ę¸»ú `%1$c'\n"
-#: fdisk/sfdisk.c:1607
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr "ǧĽ±¤Ç¤­¤Ę¤¤ĆţÎĎ: %s\n"
-#: fdisk/sfdisk.c:1639
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr "żô»ú¤¬Â礭¤ą¤®¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1643
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr "żô»ú¤Î¸ĺ¤í¤ËĄ´Ąß¤¬ÉŐ¤¤¤Ć¤¤¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1759
+#: fdisk/sfdisk.c:1766
msgid "no room for partition descriptor\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄóµ­˝Ň»Ň¤Î¶ő¤­¤¬¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1792
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr "łČÄĄĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Î°Ď¤¤¤ňą˝ĂۤǤ­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1843
+#: fdisk/sfdisk.c:1850
msgid "too many input fields\n"
msgstr "ĆţÎĎĄŐĄŁˇĽĄëĄÉ¤¬Âż¤ą¤®¤Ţ¤ą\n"
#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr "¤ł¤ě°Ęľĺ¤Î¶ő¤­¤¬¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:1896
+#: fdisk/sfdisk.c:1903
msgid "Illegal type\n"
msgstr "ÉÔŔµ¤ĘĄżĄ¤Ą×\n"
-#: fdisk/sfdisk.c:1928
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr "·Ůąđ: ˛ÄÇ˝¤ĘĄµĄ¤Ąş¤ÎşÇÂç (%lu) ¤ň±Ű¤¨¤Ć¤¤¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1940
msgid "Warning: empty partition\n"
msgstr "·Ůąđ: ¶ő¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó\n"
-#: fdisk/sfdisk.c:1947
+#: fdisk/sfdisk.c:1954
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr "·Ůąđ: ÉÔŔµ¤ĘĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬»Ď¤Ţ¤Ă¤Ć¤¤¤Ţ¤ą (°ěČֺǽé %lu)\n"
-#: fdisk/sfdisk.c:1960
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr "ǧĽ±¤Ç¤­¤Ę¤¤ĄÖˇĽĄČ˛ÄÇ˝ĄŐĄéĄ° -- - ¤« * ¤ňÁޤó¤Ç¤Ż¤Ŕ¤µ¤¤\n"
-#: fdisk/sfdisk.c:1977 fdisk/sfdisk.c:1990
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr "c,h,s ¤Î°ěÉô¤ň»ŘÄꡩ\n"
-#: fdisk/sfdisk.c:2001
+#: fdisk/sfdisk.c:2008
msgid "Extended partition not where expected\n"
msgstr "łČÄĄĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Í˝´ü¤·¤żľě˝ę¤Ë¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2033
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr "ÉÔŔµ¤ĘĆţÎĎ\n"
-#: fdisk/sfdisk.c:2055
+#: fdisk/sfdisk.c:2062
msgid "too many partitions\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó¤¬Âż¤ą¤®¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2095
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"
@@ -4377,96 +4579,96 @@ msgstr ""
"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
"ÉáÄĚ¤Ď <start> ¤Č <size> (¤˝¤·¤Ć¶˛¤é¤Ż <type>)¤ň»ŘÄꤹ¤ë¤Ŕ¤±¤Çą˝¤¤¤Ţ¤»¤óˇŁ\n"
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2115
msgid "version"
msgstr "ĄĐˇĽĄ¸ĄçĄó"
-#: fdisk/sfdisk.c:2114
+#: fdisk/sfdisk.c:2121
#, c-format
msgid "Usage: %s [options] device ...\n"
msgstr "»Č¤¤Ęý: %s [ĄŞĄ×Ą·ĄçĄó] ĄÇĄĐĄ¤ĄąĚľ...\n"
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr "ĄÇĄĐĄ¤Ąą: /dev/hda ¤ä /dev/sda ¤ÎÍͤʲż¤«"
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr "Í­±×¤ĘĄŞĄ×Ą·ĄçĄó:"
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2124
msgid " -s [or --show-size]: list size of a partition"
msgstr " -s [or --show-size]: Îΰ襵Ą¤Ąş¤ÎĄęĄąĄČ"
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2125
msgid " -c [or --id]: print or change partition Id"
msgstr " -c [or --id]: Îΰč ID ¤ÎÉ˝Ľ¨¤Ţ¤ż¤ĎĘŃąą"
-#: fdisk/sfdisk.c:2119
+#: fdisk/sfdisk.c:2126
msgid " -l [or --list]: list partitions of each device"
msgstr " -l [or --list]: ĄÇĄĐĄ¤ĄąËč¤ÎÎΰčĄęĄąĄČ"
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2127
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr " -d [or --dump]: Á°¤ËƱ¤¸¤Ŕ¤¬ˇ˘¸ĺ¤ÎĆţÎĎ˝ńĽ°¤Ë±č¤¦¤č¤¦¤Ë¤ą¤ë"
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2128
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr " -i [or --increment]: Ą·ĄęĄóĄŔżô¤Ę¤ÉˇŁ0 ¤Ç¤Ď¤Ę¤Ż 1 ¤«¤é"
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2129
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of "
"sectors/blocks/cylinders/MB"
msgstr ""
" -uS, -uB, -uC, -uM: Ą»ĄŻĄż/ĄÖĄíĄĂĄŻ/Ą·ĄęĄóĄŔ/MB ¤ÎĄćĄËĄĂĄČ¤ÎĽőÍý/Ęóąđ"
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2130
msgid " -T [or --list-types]:list the known partition types"
msgstr " -T [or --list-types]:´űĂΤÎÎΰ西Ą¤Ą×¤ÎĄęĄąĄČ"
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2131
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr " -D [or --DOS]: DOS ¸ß´ąĄâˇĽĄÉ -- ¶ő´Ö¤¬ľŻ¤·ĚµÂ̤ˤʤę¤Ţ¤ą"
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2132
msgid " -R [or --re-read]: make kernel reread partition table"
msgstr " -R [or --re-read]: Ą«ˇĽĄÍĄë¤ËÎΰčĄĆˇĽĄÖĄë¤ňşĆĆÉąţ¤ß¤µ¤»¤ë"
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2133
msgid " -N# : change only the partition with number #"
msgstr " -N# : »ŘÄęČÖąć# ¤ÎÎΰč¤Î¤ßĘŃąą¤ą¤ë"
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2134
msgid " -n : do not actually write to disk"
msgstr " -n : ĄÇĄŁĄąĄŻ¤Ř¤ÎĽÂşÝ¤Î˝ńąţ¤ß¤ňąÔ¤ď¤Ę¤¤"
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2135
msgid ""
" -O file : save the sectors that will be overwritten to file"
msgstr " -O file : ľĺ˝ń¤­¤µ¤ě¤ëĄ»ĄŻĄż¤ňĄŐĄˇĄ¤Ąë¤ËĘݸ¤ą¤ë"
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2136
msgid " -I file : restore these sectors again"
msgstr " -I file : Ą»ĄŻĄż¤ňĄŐĄˇĄ¤Ąë¤«¤éÉü¸µ¤ą¤ë"
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr " -v [or --version]: ĄĐˇĽĄ¸ĄçĄó¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2138
msgid " -? [or --help]: print this message"
msgstr " -? [or --help]: ¤ł¤ÎĄáĄĂĄ»ˇĽĄ¸¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr "´í¸±¤ĘĄŞĄ×Ą·ĄçĄó:"
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2140
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr " -g [or --show-geometry]: Ą«ˇĽĄÍĄë¤ÎĄ¸ĄŞĄáĄČĄęľđĘó¤ňÉ˝Ľ¨¤ą¤ë"
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
@@ -4474,123 +4676,123 @@ msgstr ""
" -x [or --show-extended]: łČÄĄÎΰčĄęĄąĄČ¤âÉ˝Ľ¨¤ą¤ë\n"
" ¤Ţ¤ż¤Ď¤˝¤ě¤é¤Îµ­˝Ň»Ň¤ÎĆţÎϤňĆŔ¤ë"
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2143
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr " -L [or --Linux]: Linux ¤Ë¤˝¤°¤ď¤Ę¤Ż¤Ć¤âʸ¶ç¤ň±ľ¤ď¤Ę¤¤"
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr " -q [or --quiet]: ·ŮąđĄáĄĂĄ»ˇĽĄ¸¤ňÍŢŔ©¤ą¤ë"
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr " Ą¸ĄŞĄáĄČĄę¸ˇ˝Đ¤ň¶ŻŔ©»ŘÄę¤Ç¤­¤Ţ¤ą:"
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2146
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr " -C# [or --cylinders #]:»ČÍѤą¤ëĄ·ĄęĄóĄŔżô¤ňŔßÄꤹ¤ë"
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr " -H# [or --heads #]: »ČÍѤą¤ëĄŘĄĂĄÉżô¤ňŔßÄꤹ¤ë"
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr " -S# [or --sectors #]: »ČÍѤą¤ëĄ»ĄŻĄżżô¤ňŔßÄꤹ¤ë"
-#: fdisk/sfdisk.c:2142
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr "Ě·˝â¤ÎĄÁĄ§ĄĂĄŻ¤ňąÔ¤ď¤Ę¤¤¤č¤¦¤Ë¤Ç¤­¤Ţ¤ą:"
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2150
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr " -f [or --force]: ¤Ş¤«¤·¤Ę»ŘÄę¤ňąÔ¤Ă¤Ć¤âˇ˘¤˝¤Î¤Ţ¤ŢĽÂąÔ¤·¤Ţ¤ą"
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2156
msgid "Usage:"
msgstr "»Č¤¤Ęý:"
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2157
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr "%s ĄÇĄĐĄ¤Ąą\t\t ĄÇĄĐĄ¤Ąąľĺ¤ÎĄ˘ĄŻĄĆĄŁĄôÎΰč¤ňĄęĄąĄČ¤·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:2151
+#: fdisk/sfdisk.c:2158
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
"%s ĄÇĄĐĄ¤Ąą n1 n2 ... n1 ¤ňĄ˘ĄŻĄĆĄŁĄô¤Ë¤·¤Ć..., »Ä¤ę¤ňČ󥢥ŻĄĆĄŁĄô¤Ë¤·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2159
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr "%s -An ĄÇĄĐĄ¤Ąą\t n ¤ňĄ˘ĄŻĄĆĄŁĄô¤Ë¤·ˇ˘¤˝¤ě°Ęł°¤ňČ󥢥ŻĄĆĄŁĄô¤Ë¤·¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr "ĄłĄŢĄóĄÉ¤Ę¤·ˇ©\n"
-#: fdisk/sfdisk.c:2394
+#: fdisk/sfdisk.c:2401
#, c-format
msgid "total: %d blocks\n"
msgstr "ąç·×: %d ĄÖĄíĄĂĄŻ\n"
-#: fdisk/sfdisk.c:2431
+#: fdisk/sfdisk.c:2438
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr "»Č¤¤Ęý: sfdisk --print-id ĄÇĄĐĄ¤Ąą ĄŃˇĽĄĆĄŁĄ·ĄçĄóČÖąć\n"
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2440
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr "»Č¤¤Ęý: sfdisk --change-id ĄÇĄĐĄ¤Ąą ĄŃˇĽĄĆĄŁĄ·ĄçĄóČÖąć ID\n"
-#: fdisk/sfdisk.c:2435
+#: fdisk/sfdisk.c:2442
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr "»Č¤¤Ęý: sfdisk --id ĄÇĄĐĄ¤Ąą ĄŃˇĽĄĆĄŁĄ·ĄçĄóČÖąć [ID]\n"
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2449
msgid "can specify only one device (except with -l or -s)\n"
msgstr "°ě¤Ä¤ÎĄÇĄĐĄ¤Ąą¤Î¤ß»ŘÄę¤Ç¤­¤Ţ¤ą (-l ¤ä -s ¤ň˝ü¤Ż)\n"
-#: fdisk/sfdisk.c:2467
+#: fdisk/sfdisk.c:2474
#, c-format
msgid "cannot open %s %s\n"
msgstr "%s ¤ň%s¤ÇĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2467
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr "Ćɤ߽ń¤­˛ÄÇ˝"
-#: fdisk/sfdisk.c:2467
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr "ĆÉąţ¤ß˛ÄÇ˝"
-#: fdisk/sfdisk.c:2492
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr "%s: OK\n"
-#: fdisk/sfdisk.c:2509
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr "%s: Ą·ĄęĄóĄŔżô %dˇ˘ĄŘĄĂĄÉżô %dˇ˘%d Ą»ĄŻĄż/ĄČĄéĄĂĄŻ\n"
-#: fdisk/sfdisk.c:2512
+#: fdisk/sfdisk.c:2519
#, c-format
msgid "%s: unknown geometry\n"
msgstr "%s: ̤ĂΤΥ¸ĄŞĄáĄČĄę\n"
-#: fdisk/sfdisk.c:2528
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr "%s ¤Ř¤Î BLKGETSIZE ioctl ¤ËĽşÇÔ\n"
-#: fdisk/sfdisk.c:2605
+#: fdisk/sfdisk.c:2612
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr "ÉÔŔµ¤ĘĄÖˇĽĄČĄŐĄéĄ°: 0x80 ¤Ç¤Ę¤Ż 0x%x ¤Ç¤ą\n"
-#: fdisk/sfdisk.c:2622 fdisk/sfdisk.c:2675 fdisk/sfdisk.c:2705
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
msgid ""
"Done\n"
"\n"
@@ -4598,7 +4800,7 @@ msgstr ""
"˝ŞÎ»\n"
"\n"
-#: fdisk/sfdisk.c:2631
+#: fdisk/sfdisk.c:2638
#, c-format
msgid ""
"You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4608,35 +4810,35 @@ msgstr ""
"LILO ¤Ç¤ĎĚäÂꤢ¤ę¤Ţ¤»¤ó¤¬ˇ˘DOS MBR ¤Ď 1 ¤Ä¤ÎĄ˘ĄŻĄĆĄŁĄÖ¤ĘĄŃˇĽĄĆĄŁĄ·ĄçĄó¤·¤«\n"
"ĄÖˇĽĄČ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: fdisk/sfdisk.c:2645
+#: fdisk/sfdisk.c:2652
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó %s ¤Ë¤Ď ID %x ¤¬¤˘¤ęˇ˘±Ł¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2701
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr "ÉÔŔµ¤Ę ID %x\n"
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2723
msgid "This disk is currently in use.\n"
msgstr "¤ł¤ÎĄÇĄŁĄąĄŻ¤Ď¸˝şß»ČÍŃĂć¤Ç¤ąˇŁ\n"
-#: fdisk/sfdisk.c:2733
+#: fdisk/sfdisk.c:2740
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr "Ă×̿Ū¤ĘĄ¨ĄéˇĽ: %s ¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2736
+#: fdisk/sfdisk.c:2743
#, c-format
msgid "Warning: %s is not a block device\n"
msgstr "·Ůąđ: %s ¤ĎĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2749
msgid "Checking that no-one is using this disk right now ...\n"
msgstr "¸˝şßˇ˘ĂŻ¤â¤ł¤ÎĄÇĄŁĄąĄŻ¤ň»Č¤Ă¤Ć¤¤¤Ę¤¤¤«¤ňÄ´¤Ů¤Ţ¤ą...\n"
-#: fdisk/sfdisk.c:2744
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -4651,28 +4853,28 @@ msgstr ""
"¤¬¤˘¤ě¤Đ swapoff ¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
"¤Á¤Ę¤ß¤Ë --no-reread ĄŐĄéĄ°¤Ç¤ł¤ÎĄÁĄ§ĄĂĄŻ¤ňÍŢŔ©¤Ç¤­¤Ţ¤ąˇŁ\n"
-#: fdisk/sfdisk.c:2748
+#: fdisk/sfdisk.c:2755
msgid "Use the --force flag to overrule all checks.\n"
msgstr "Á´¤Ć¤ÎĄÁĄ§ĄĂĄŻ¤ňĶ±Ű¤µ¤»¤ë¤Ë¤Ď --force ĄŐĄéĄ°¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: fdisk/sfdisk.c:2752
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr "OK"
-#: fdisk/sfdisk.c:2761
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr "¸Ĺ¤¤ľěĚĚ:\n"
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2772
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr "ĄŃˇĽĄĆĄŁĄ·ĄçĄó %d ¤Ď¸şß¤·¤Ţ¤»¤ó¤Î¤Çˇ˘ĘŃąą¤Ç¤­¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2773
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr "ż·¤ż¤ĘľěĚĚ:\n"
-#: fdisk/sfdisk.c:2778
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
@@ -4680,19 +4882,19 @@ msgstr ""
"»ä¤Ď¤ł¤ě¤é¤ÎĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ë´ŘÍż¤·¤ż¤Ż¤˘¤ę¤Ţ¤»¤ó -- ĘŃąą¤·¤Ţ¤»¤óˇŁ\n"
"(ËÜĹö¤Ë¤ł¤ě¤ňąÔ¤Ę¤¤¤ż¤±¤ě¤Đˇ˘--force ĄŞĄ×Ą·ĄçĄó¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤)\n"
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2788
msgid "I don't like this - probably you should answer No\n"
msgstr "»ä¤Ď¤ł¤ě¤Ë´ŘÍż¤·¤ż¤Ż¤˘¤ę¤Ţ¤»¤ó -- ¶˛¤é¤Ż No ¤ČĹú¤¨¤ë¤Ů¤­¤Ç¤·¤ç¤¦\n"
-#: fdisk/sfdisk.c:2786
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr "¤ł¤ě¤Ç¤˘¤Ę¤ż¤ÎÍ×µá¤ĎËţ¤ż¤µ¤ě¤Ţ¤ą¤«ˇ© [ynq] "
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr "ĄÇĄŁĄąĄŻ¤Ř¤Î˝ń¤­ąţ¤ß¤ňąÔ¤Ę¤¤¤Ţ¤ą¤«ˇ© [ynq] "
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
@@ -4700,15 +4902,15 @@ msgstr ""
"\n"
"sfdisk: ĆţÎϤ¬Ă»¤ą¤®¤Ţ¤ą\n"
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2802
msgid "Quitting - nothing changed\n"
msgstr "ĂćĂÇ -- ˛ż¤âĘŃąą¤·¤Ţ¤»¤ó\n"
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2808
msgid "Please answer one of y,n,q\n"
msgstr "y,n,q ¤Î¤¤¤ş¤ě¤«¤ÇĹú¤¨¤Ć¤Ż¤Ŕ¤µ¤¤\n"
-#: fdisk/sfdisk.c:2809
+#: fdisk/sfdisk.c:2816
msgid ""
"Successfully wrote the new partition table\n"
"\n"
@@ -4716,7 +4918,7 @@ msgstr ""
"ż·¤ż¤ĘĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Î˝ń¤­ąţ¤ß¤ËŔ®¸ů\n"
"\n"
-#: fdisk/sfdisk.c:2815
+#: fdisk/sfdisk.c:2822
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"
@@ -4823,163 +5025,161 @@ msgstr "ĄŞĄ×Ą·ĄçĄóʸ»úÎó°úżô¤¬Â­¤ę¤Ţ¤»¤ó"
#: getopt-1.0.3b/getopt.c:433
msgid "getopt (enhanced) 1.0.3\n"
-msgstr ""
+msgstr "getopt (enhanced) 1.0.3\n"
#: getopt-1.0.3b/getopt.c:439
msgid "internal error, contact the author."
msgstr "ĆâÉôĄ¨ĄéˇĽˇ˘şîĽÔ¤ËϢÍí¤ňˇŁ"
-#: login-utils/agetty.c:300
+#: login-utils/agetty.c:306
msgid "calling open_tty\n"
msgstr "open_tty ¤Î¸Ć¤Ó˝Đ¤·Ăć\n"
#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:313
+#: login-utils/agetty.c:319
msgid "calling termio_init\n"
msgstr "termio_init ¸Ć¤Ó˝Đ¤·Ăć\n"
-#: login-utils/agetty.c:318
+#: login-utils/agetty.c:324
msgid "writing init string\n"
msgstr "˝é´ü˛˝Ę¸»úÎó¤Î˝ń¤­ąţ¤ßĂć\n"
#. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:328
+#: login-utils/agetty.c:334
msgid "before autobaud\n"
-msgstr ""
+msgstr "Ľ«Ć°ĄÜˇĽĄěˇĽĄČ¸ˇ˝ĐÁ°\n"
-#: login-utils/agetty.c:340
+#: login-utils/agetty.c:346
msgid "waiting for cr-lf\n"
msgstr "cr-lf ¤ňÂԤäƤ¤¤Ţ¤ą\n"
-#: login-utils/agetty.c:344
+#: login-utils/agetty.c:350
#, c-format
msgid "read %c\n"
msgstr "%c ¤ňĆÉąţ¤ß\n"
#. Read the login name.
-#: login-utils/agetty.c:353
+#: login-utils/agetty.c:359
msgid "reading login name\n"
msgstr "ĄíĄ°Ą¤ĄóĚľ¤ňĆÉąţ¤á¤Ţ¤»¤ó\n"
-#: login-utils/agetty.c:374
+#: login-utils/agetty.c:380
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s: %s ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó: %m"
-#: login-utils/agetty.c:394
+#: login-utils/agetty.c:400
msgid "can't malloc initstring"
msgstr "ʸ»úÎó˝é´ü˛˝ÍŃĄáĄâĄę¤¬łÎĘݤǤ­¤Ţ¤»¤ó"
-#: login-utils/agetty.c:456
+#: login-utils/agetty.c:465
#, c-format
msgid "bad timeout value: %s"
msgstr "ÉÔŔµ¤ĘĄżĄ¤ĄŕĄ˘Ą¦ĄČĂÍ: %s"
-#: login-utils/agetty.c:465
+#: login-utils/agetty.c:474
msgid "after getopt loop\n"
msgstr "getopt ĄëˇĽĄ×¤Î¸ĺ\n"
-#: login-utils/agetty.c:483
+#: login-utils/agetty.c:492
msgid "exiting parseargs\n"
msgstr "°úżô˛ňŔϤň˝ŞÎ»¤·¤Ţ¤ą\n"
-#: login-utils/agetty.c:496
+#: login-utils/agetty.c:505
msgid "entered parse_speeds\n"
msgstr "parse_speeds ¤ËĆţ¤ę¤Ţ¤·¤ż\n"
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:508
#, c-format
msgid "bad speed: %s"
msgstr "ÉÔŔµ¤Ę®ĹŮ: %s"
-#: login-utils/agetty.c:501
+#: login-utils/agetty.c:510
msgid "too many alternate speeds"
msgstr "ÂĺÂŘ®Ĺ٤¬Âż¤ą¤®¤Ţ¤ą"
-#: login-utils/agetty.c:503
+#: login-utils/agetty.c:512
msgid "exiting parsespeeds\n"
msgstr "parsespeeds ¤ň˝Ş¤ď¤ę¤Ţ¤ą\n"
-#: login-utils/agetty.c:576
+#: login-utils/agetty.c:587
#, c-format
msgid "%s: open for update: %m"
msgstr "%s: ąąż·ÍŃ¤ËĄŞˇĽĄ×Ąó: %m"
-#: login-utils/agetty.c:592
+#: login-utils/agetty.c:605
#, c-format
msgid "%s: no utmp entry"
msgstr "%s: utmp ąŕĚܤˤ˘¤ę¤Ţ¤»¤ó"
-#: login-utils/agetty.c:621
+#: login-utils/agetty.c:634
#, c-format
msgid "/dev: chdir() failed: %m"
msgstr "/dev: chdir() ¤¬ĽşÇÔ: %m"
-#: login-utils/agetty.c:625
+#: login-utils/agetty.c:638
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s: Ą­ĄăĄéĄŻĄżĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
#. ignore close(2) errors
-#: login-utils/agetty.c:632
+#: login-utils/agetty.c:645
msgid "open(2)\n"
-msgstr ""
+msgstr "open(2)\n"
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:647
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s: ɸ˝ŕĆţÎϤȤ·¤Ćł«¤Ż¤ł¤Č¤¬¤Ç¤­¤Ţ¤»¤ó: %m"
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:657
#, c-format
msgid "%s: not open for read/write"
msgstr "%s: Ćɤ߽ń¤­ÎľÍŃ¤ËĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó"
#. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:648
+#: login-utils/agetty.c:661
msgid "duping\n"
-msgstr ""
+msgstr "ĘŁŔ˝Ăć\n"
#. set up stdout and stderr
-#: login-utils/agetty.c:650
+#: login-utils/agetty.c:663
#, c-format
msgid "%s: dup problem: %m"
-msgstr "%s: dup ¤ËĚäÂęČŻŔ¸: %m"
+msgstr "%s: ĘŁŔ˝¤ËĚäÂęČŻŔ¸: %m"
-#: login-utils/agetty.c:712
+#: login-utils/agetty.c:733
msgid "term_io 2\n"
-msgstr ""
+msgstr "term_io 2\n"
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:915
msgid "user"
msgstr "ĄćˇĽĄ¶"
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:915
msgid "users"
msgstr "ĄćˇĽĄ¶"
-#: login-utils/agetty.c:982
+#: login-utils/agetty.c:1003
#, c-format
msgid "%s: read: %m"
msgstr "%s: read: %m"
-#: login-utils/agetty.c:1028
+#: login-utils/agetty.c:1049
#, c-format
msgid "%s: input overrun"
msgstr "%s: ĆţÎϤ¬°î¤ě¤Ţ¤·¤ż"
-#: login-utils/agetty.c:1152
+#: login-utils/agetty.c:1173
#, c-format
msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
-"baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] 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 "
-"˝é´ü˛˝Ę¸»úÎó] ĄÜˇĽĄěˇĽĄČ,... ąÔ [ĂĽËöĄżĄ¤Ą×]\n"
-"Ëô¤Ď\t[-hiLmw] [-l ĄíĄ°Ą¤ĄóĄ×ĄíĄ°ĄéĄŕ] [-tĄżĄ¤ĄŕĄ˘Ą¦ĄČ [-I ˝é´ü˛˝Ę¸»úÎó] ąÔ "
-"ĄÜˇĽĄěˇĽĄČ,... [ĂĽËöĄżĄ¤Ą×]\n"
+"»Č¤¤Ęý: %s [-hiLmw] [-l ĄíĄ°Ą¤ĄóĄ×ĄíĄ°ĄéĄŕ] [-t ĄżĄ¤ĄŕĄ˘Ą¦ĄČ] [-I ˝é´ü˛˝Ę¸»úÎó] [-H ĄíĄ°Ą¤ĄóĄŰĄąĄČ] ĄÜˇĽĄěˇĽĄČ,... ąÔ [ĂĽËöĄżĄ¤Ą×]\n"
+"Ëô¤Ď\t[-hiLmw] [-l ĄíĄ°Ą¤ĄóĄ×ĄíĄ°ĄéĄŕ] [-tĄżĄ¤ĄŕĄ˘Ą¦ĄČ [-I ˝é´ü˛˝Ę¸»úÎó] [-H ĄíĄ°Ą¤ĄóĄŰĄąĄČ] ąÔ ĄÜˇĽĄěˇĽĄČ,... [ĂĽËöĄżĄ¤Ą×]\n"
#: login-utils/checktty.c:46
#, c-format
@@ -4989,7 +5189,7 @@ msgstr "ÉÔŔµĄíĄ°Ą¤Ąó: %s\n"
#: login-utils/checktty.c:52
#, c-format
msgid "sleepexit %d\n"
-msgstr "ĄąĄęˇĽĄ×˝ŞÎ»\n"
+msgstr "ĄąĄęˇĽĄ×˝ŞÎ» %d\n"
#: login-utils/checktty.c:108 login-utils/checktty.c:130
msgid "login: memory low, login may fail\n"
@@ -5018,53 +5218,53 @@ msgstr "%2$s ¤«¤é %1$s ¤Ř¤ÎĄíĄ°Ą¤Ąó¤Ďˇ˘˝é´üľőÂ֤ǤϵńČݤµ¤ě¤Ţ¤·¤żˇŁ\n"
msgid "Login on %s from %s denied.\n"
msgstr "%2$s ¤«¤é %1$s ¤Ř¤ÎĄíĄ°Ą¤Ąó¤ĎČÝÄꤵ¤ě¤Ţ¤·¤żˇŁ\n"
-#: login-utils/chfn.c:136 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
msgstr "%s: ¤˘¤Ę¤ż (ĄćˇĽĄ¶ %d) ¤Ď¸şß¤·¤Ţ¤»¤óˇŁ\n"
-#: login-utils/chfn.c:143 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
msgstr "%s: ĄćˇĽĄ¶ \"%s\" ¤Ď¸şß¤·¤Ţ¤»¤óˇŁ\n"
-#: login-utils/chfn.c:148 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr ""
"%s: ĄíˇĽĄ«Ąë¤ÎąŕĚܤ·¤«ĘŃąą¤Ç¤­¤Ţ¤»¤ó -- ¤«¤ď¤ę¤Ë yp%s ¤ň»Č¤¤¤Ţ¤·¤ç¤¦ˇŁ\n"
-#: login-utils/chfn.c:160
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "%s ¤Î finger ľđĘó¤ňĘŃąą¤·¤Ţ¤ąˇŁ\n"
-#: login-utils/chfn.c:166 login-utils/chfn.c:170 login-utils/chfn.c:177
-#: login-utils/chfn.c:181 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
msgstr "ĄŃĄąĄďˇĽĄÉĄ¨ĄéˇĽˇŁ"
-#: login-utils/chfn.c:190 login-utils/chsh.c:178 login-utils/login.c:650
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:684
#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
+#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
msgid "Password: "
msgstr "ĄŃĄąĄďˇĽĄÉ: "
-#: login-utils/chfn.c:193 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
msgstr "´Ö°ă¤Ă¤żĄŃĄąĄďˇĽĄÉ¤Ç¤ąˇŁ"
-#: login-utils/chfn.c:204
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
msgstr "finger ľđĘó¤ĎĘŃąą¤µ¤ě¤Ţ¤»¤ó¤Ç¤·¤żˇŁ\n"
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
msgstr "»Č¤¤Ęý: %s [ -f ĄŐĄëĄÍˇĽĄŕ ] [ -o ĄŞĄŐĄŁĄą ] "
-#: login-utils/chfn.c:308
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
@@ -5072,11 +5272,11 @@ msgstr ""
"[ -p ĄŞĄŐĄŁĄąĹĹĎĂČÖąć ]\n"
"\t[ -h Ľ«ÂđĹĹĎĂČÖąć ] "
-#: login-utils/chfn.c:309
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
msgstr "[ --help ] [ --version ]\n"
-#: login-utils/chfn.c:378 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
@@ -5084,28 +5284,28 @@ msgstr ""
"\n"
"ĂćĂǡŁ\n"
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
msgstr "ĄŐĄŁˇĽĄëĄÉ¤¬Äą¤ą¤®¤Ţ¤ąˇŁ\n"
-#: login-utils/chfn.c:419
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
msgstr "'%c' ¤Ďµö˛Ä¤µ¤ě¤Ţ¤»¤óˇŁ\n"
-#: login-utils/chfn.c:424
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
msgstr "ĄłĄóĄČĄíˇĽĄëʸ»ú¤Ďµö˛Ä¤µ¤ě¤Ţ¤»¤óˇŁ\n"
-#: login-utils/chfn.c:489
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "finger ľđĘó¤ĎĘŃąą *¤µ¤ě¤Ţ¤»¤ó¤Ç¤·¤ż*ˇŁ¤Ţ¤ż¤˘¤Č¤Ç»î¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: login-utils/chfn.c:492
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
msgstr "finger ľđĘó¤ňĘŃąą¤·¤Ţ¤·¤żˇŁ\n"
-#: login-utils/chfn.c:506 login-utils/chsh.c:412 sys-utils/cytune.c:324
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
msgid "malloc failed"
msgstr "malloc ¤ËĽşÇÔ"
@@ -5250,7 +5450,9 @@ msgstr " ĄíĄ°Ą¤Ąó¤·¤ż¤Ţ¤Ţ¤Ç¤ą"
msgid ""
"\n"
"wtmp begins %s"
-msgstr "\nwtmp ¤Ď %s ¤«¤é»Ď¤Ţ¤ę¤Ţ¤ą "
+msgstr ""
+"\n"
+"wtmp ¤Ď %s ¤«¤é»Ď¤Ţ¤ę¤Ţ¤ą "
#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
msgid "last: malloc failure.\n"
@@ -5258,7 +5460,7 @@ msgstr "last: ĄáĄâĄęłÎĘݤ˼şÇÔˇŁ\n"
#: login-utils/last.c:416
msgid "last: gethostname"
-msgstr ""
+msgstr "last: gethostname"
#: login-utils/last.c:469
#, c-format
@@ -5269,30 +5471,37 @@ msgstr ""
"\n"
"łä¤ęąţ¤ß¤¬Ćţ¤ę¤Ţ¤·¤ż %10.10s %5.5s \n"
-#: login-utils/login.c:349
+#: login-utils/login.c:377
msgid "login: -h for super-user only.\n"
msgstr "login: -h ¤ĎĄąˇĽĄŃˇĽĄćˇĽĄ¶ŔěÍѤǤąˇŁ\n"
-#: login-utils/login.c:374
+#: login-utils/login.c:402
msgid "usage: login [-fp] [username]\n"
msgstr "»Č¤¤Ęý: login [-fp] [ĄćˇĽĄ¶Ěľ]\n"
-#: login-utils/login.c:476
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr "login: PAM ĽşÇÔˇŁĂćĂǤ·¤Ţ¤ą: %s\n"
-#: login-utils/login.c:478
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "PAM ¤Î˝é´ü˛˝¤¬¤Ç¤­¤Ţ¤»¤ó: %s"
-#: login-utils/login.c:518
+#. 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:519
+msgid "login: "
+msgstr "ĄíĄ°Ą¤Ąó: "
+
+#: login-utils/login.c:552
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr ""
+msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
-#: login-utils/login.c:520
+#: login-utils/login.c:554
msgid ""
"Login incorrect\n"
"\n"
@@ -5300,17 +5509,17 @@ msgstr ""
"Login ¤¬´Ö°ă¤Ă¤Ć¤¤¤Ţ¤ą\n"
"\n"
-#: login-utils/login.c:529
+#: login-utils/login.c:563
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr ""
+msgstr "*ĄíĄ°Ą¤ĄóĄČĄéĄ¤¤¬Âż¤ą¤®¤Ţ¤ą* (%d) %s ¤«¤é %s ¤Ř, %s"
-#: login-utils/login.c:533
+#: login-utils/login.c:567
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr ""
+msgstr "ĽşÇÔ¤·¤żĄíĄ°Ą¤ĄóĄ»ĄĂĄ·ĄçĄó %s ¤«¤é %s ¤Ř, %s"
-#: login-utils/login.c:536
+#: login-utils/login.c:570
msgid ""
"\n"
"Login incorrect\n"
@@ -5318,30 +5527,30 @@ msgstr ""
"\n"
"Login ¤¬´Ö°ă¤Ă¤Ć¤¤¤Ţ¤ą\n"
-#: login-utils/login.c:585
+#: login-utils/login.c:619
msgid "Illegal username"
msgstr "ÉÔŔµ¤ĘĄćˇĽĄ¶Ěľ"
-#: login-utils/login.c:628
+#: login-utils/login.c:662
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr "%s ¤ÎĄíĄ°Ą¤Ąó¤Ď¤ł¤ÎĂĽËö¤Ç¤ĎµńČݤµ¤ě¤Ţ¤·¤żˇŁ\n"
-#: login-utils/login.c:633
+#: login-utils/login.c:667
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr ""
+msgstr "ĄíĄ°Ą¤Ąó %s ¤ňµńŔ䡢%s ¤«¤é TTY %s ľĺ¤Ç"
-#: login-utils/login.c:637
+#: login-utils/login.c:671
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr ""
+msgstr "ĄíĄ°Ą¤Ąó %s ¤ňµńŔ䡢TTY %s ľĺ¤Ç"
-#: login-utils/login.c:689
+#: login-utils/login.c:723
msgid "Login incorrect\n"
msgstr "Login ¤¬´Ö°ă¤Ă¤Ć¤¤¤Ţ¤ą\n"
-#: login-utils/login.c:711
+#: login-utils/login.c:745
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
@@ -5349,100 +5558,100 @@ msgstr ""
"´ű¤ËĄíĄ°Ą¤Ąó¤·¤Ć¤¤¤ëĄćˇĽĄ¶ˇĽżô¤¬Âż¤ą¤®¤Ţ¤ąˇŁ\n"
"¤Ţ¤ż¸ĺ¤Ç»î¤·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ\n"
-#: login-utils/login.c:715
+#: login-utils/login.c:749
msgid "You have too many processes running.\n"
msgstr "¤˘¤Ę¤ż¤¬ĽÂąÔ¤·¤Ć¤¤¤ëĄ×ĄíĄ»Ąą¤¬Âż¤ą¤®¤Ţ¤ąˇŁ\n"
-#: login-utils/login.c:761
+#: login-utils/login.c:795
msgid "Warning: no Kerberos tickets issued\n"
msgstr "·Ůąđ: Kerberos ĄÁĄ±ĄĂĄČ¤¬ČŻąÔ¤µ¤ě¤Ţ¤»¤ó\n"
-#: login-utils/login.c:773
+#: login-utils/login.c:807
msgid "Sorry -- your password has expired.\n"
msgstr "»ÄÇ°¤Ç¤ą¤¬ -- ¤˘¤Ę¤ż¤ÎĄŃĄąĄďˇĽĄÉ¤Ď´ü¸ÂŔÚ¤ě¤Ç¤ąˇŁ\n"
-#: login-utils/login.c:779
+#: login-utils/login.c:813
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr "·Ůąđ: ¤˘¤Ę¤ż¤ÎĄŃĄąĄďˇĽĄÉ¤Ď %s %d, %d ¤Ë´ü¸Â¤¬ŔÚ¤ě¤Ţ¤ą\n"
-#: login-utils/login.c:787
+#: login-utils/login.c:821
msgid "Sorry -- your account has expired.\n"
msgstr "»ÄÇ°¤Ç¤ą¤¬ -- ¤˘¤Ę¤ż¤ÎĄ˘Ą«Ą¦ĄóĄČ¤Ď´ü¸ÂŔÚ¤ě¤Ç¤ąˇŁ\n"
-#: login-utils/login.c:793
+#: login-utils/login.c:827
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr "·Ůąđ: ¤˘¤Ę¤ż¤ÎĄ˘Ą«Ą¦ĄóĄČ¤Ď %s %d, %d ¤Ë´ü¸Â¤¬ŔÚ¤ě¤Ţ¤ą\n"
-#: login-utils/login.c:1025
+#: login-utils/login.c:1061
#, c-format
msgid "DIALUP AT %s BY %s"
-msgstr ""
+msgstr "ĄŔĄ¤Ą˘ĄëĄ˘ĄĂĄ×¤Ç %s ¤Ëˇ˘%s ¤Ë¤č¤ë"
-#: login-utils/login.c:1032
+#: login-utils/login.c:1068
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
-msgstr ""
+msgstr "%s ¤Ë ROOT ¤¬ĄíĄ°Ą¤Ąóˇ˘%s ¤«¤é"
-#: login-utils/login.c:1035
+#: login-utils/login.c:1071
#, c-format
msgid "ROOT LOGIN ON %s"
-msgstr ""
+msgstr "%s ¤Ë ROOT ¤¬ĄíĄ°Ą¤Ąó"
-#: login-utils/login.c:1038
+#: login-utils/login.c:1074
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
-msgstr ""
+msgstr "%s ¤Ë %s ¤¬ĄíĄ°Ą¤Ąóˇ˘%s ¤«¤é"
-#: login-utils/login.c:1041
+#: login-utils/login.c:1077
#, c-format
msgid "LOGIN ON %s BY %s"
-msgstr ""
+msgstr "%s ¤Ë %s ¤¬ĄíĄ°Ą¤Ąó"
-#: login-utils/login.c:1052
+#: login-utils/login.c:1089
#, c-format
msgid "You have %smail.\n"
-msgstr "¤˘¤Ę¤ż¤Ë%dĄáĄ¤Ąë¤¬ĆϤ¤¤Ć¤¤¤Ţ¤ąˇŁ\n"
+msgstr "%sĄáĄ¤Ąë¤¬ĆϤ¤¤Ć¤¤¤Ţ¤ąˇŁ\n"
-#: login-utils/login.c:1053
+#: login-utils/login.c:1090
msgid "new "
-msgstr "ż·¤ż¤Ę"
+msgstr "ż·¤ż¤Ë"
#. error in fork()
-#: login-utils/login.c:1071
+#: login-utils/login.c:1108
#, c-format
msgid "login: failure forking: %s"
msgstr "login: fork ¤ËĽşÇÔ: %s"
-#: login-utils/login.c:1086
+#: login-utils/login.c:1123
msgid "setuid() failed"
msgstr "setuid() ¤ËĽşÇÔ"
-#: login-utils/login.c:1092
+#: login-utils/login.c:1129
#, c-format
msgid "No directory %s!\n"
msgstr "ĄÇĄŁĄěĄŻĄČĄę %s ¤¬¤˘¤ę¤Ţ¤»¤óˇŞ\n"
-#: login-utils/login.c:1096
+#: login-utils/login.c:1133
msgid "Logging in with home = \"/\".\n"
msgstr "ĄŰˇĽĄŕĄÇĄŁĄěĄŻĄČĄę \"/\" ¤ÇĄíĄ°Ą¤Ąó¤·¤Ţ¤ąˇŁ\n"
-#: login-utils/login.c:1104
+#: login-utils/login.c:1141
msgid "login: no memory for shell script.\n"
msgstr "login: Ą·Ą§ĄëĄąĄŻĄęĄ×ĄČÍѤΥáĄâĄę¤¬¤˘¤ę¤Ţ¤»¤óˇŁ\n"
-#: login-utils/login.c:1132
+#: login-utils/login.c:1169
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr "login: Ą·Ą§ĄëĄąĄŻĄęĄ×ĄČ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤ż: %s\n"
-#: login-utils/login.c:1135
+#: login-utils/login.c:1172
#, c-format
msgid "login: no shell: %s.\n"
msgstr "login: Ą·Ą§Ąë¤¬¤˘¤ę¤Ţ¤»¤ó: %s.\n"
-#: login-utils/login.c:1151
+#: login-utils/login.c:1188
#, c-format
msgid ""
"\n"
@@ -5451,73 +5660,73 @@ msgstr ""
"\n"
"%s ĄíĄ°Ą¤Ąó: "
-#: login-utils/login.c:1162
+#: login-utils/login.c:1199
msgid "login name much too long.\n"
msgstr "ĄíĄ°Ą¤ĄóĚľ¤¬Äą¤ą¤®¤Ţ¤ąˇŁ\n"
-#: login-utils/login.c:1163
+#: login-utils/login.c:1200
msgid "NAME too long"
msgstr "ĚľÁ°¤¬Äą¤ą¤®¤Ţ¤ą"
-#: login-utils/login.c:1170
+#: login-utils/login.c:1207
msgid "login names may not start with '-'.\n"
msgstr "ĄíĄ°Ą¤ĄóĚľ¤Ď '-' ¤Ç»Ď¤Ţ¤Ă¤Ć¤¤¤Ć¤Ď¤¤¤±¤Ţ¤»¤óˇŁ\n"
-#: login-utils/login.c:1180
+#: login-utils/login.c:1217
msgid "too many bare linefeeds.\n"
msgstr "ąÔÁ÷¤ę(linefeed) ¤¬Âż¤ą¤®¤Ţ¤ąˇŁ\n"
-#: login-utils/login.c:1181
+#: login-utils/login.c:1218
msgid "EXCESSIVE linefeeds"
-msgstr ""
+msgstr "˛áÂç¤ĘąÔÁ÷¤ę(linefeed)"
-#: login-utils/login.c:1192
+#: login-utils/login.c:1229
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr "%d Éøĺ¤ËĄíĄ°Ą¤Ąó¤Î»ţ´ÖŔÚ¤ě\n"
-#: login-utils/login.c:1292
+#: login-utils/login.c:1329
#, c-format
msgid "Last login: %.*s "
msgstr "şÇ˝ŞĄíĄ°Ą¤Ąó: %.*s "
-#: login-utils/login.c:1296
+#: login-utils/login.c:1333
#, c-format
msgid "from %.*s\n"
msgstr " %.*s ¤«¤é\n"
-#: login-utils/login.c:1299
+#: login-utils/login.c:1336
#, c-format
msgid "on %.*s\n"
msgstr " %.*s ľĺ\n"
-#: login-utils/login.c:1322
+#: login-utils/login.c:1359
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
-msgstr ""
+msgstr "%s ¤«¤é¤ÎĄíĄ°Ą¤Ąó¤¬ĽşÇÔ, %s"
-#: login-utils/login.c:1325
+#: login-utils/login.c:1362
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
-msgstr ""
+msgstr "%s ¤Ç¤ÎĄíĄ°Ą¤Ąó¤¬ĽşÇÔ, %s"
-#: login-utils/login.c:1329
+#: login-utils/login.c:1366
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr ""
+msgstr "%d ˛ó %s ¤«¤é¤ÎĄíĄ°Ą¤Ąó¤¬ĽşÇÔ, %s"
-#: login-utils/login.c:1332
+#: login-utils/login.c:1369
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr ""
+msgstr "%d ˛ó %s ¤Ç¤ÎĄíĄ°Ą¤Ąó¤¬ĽşÇÔ, %s"
#: login-utils/mesg.c:89
msgid "is y\n"
-msgstr ""
+msgstr "¤Ď y ¤Ç¤ą\n"
#: login-utils/mesg.c:92
msgid "is n\n"
-msgstr ""
+msgstr "¤Ď n ¤Ç¤ą\n"
#: login-utils/mesg.c:112
msgid "usage: mesg [y | n]\n"
@@ -5693,20 +5902,20 @@ msgstr "ĚŔĆü¤Ë¤Ę¤Ă¤Ć¤·¤Ţ¤¤¤Ţ¤ą¤¬ˇ˘¤˝¤ě¤Ţ¤ÇÂԤƤʤ¤¤Ç¤·¤çˇ©\n"
#: login-utils/shutdown.c:271
msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "ĄáĄóĄĆĄĘĄóĄąÍŃ -- bounce, bouce"
#: login-utils/shutdown.c:275
#, c-format
msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr ""
+msgstr "timeout = %d, quiet = %d, reboot = %d\n"
#: login-utils/shutdown.c:300
msgid "The system is being shut down within 5 minutes"
-msgstr ""
+msgstr "Ą·ĄąĄĆĄŕ¤Ď 5 ʬ°ĘĆâ¤ËĽ×ĂǤµ¤ě¤Ţ¤ą"
#: login-utils/shutdown.c:304
msgid "Login is therefore prohibited."
-msgstr ""
+msgstr "ĄíĄ°Ą¤Ąó¤Ď¤˝¤ě¸Î¶Ř»ß¤µ¤ě¤Ć¤¤¤Ţ¤ąˇŁ"
#: login-utils/shutdown.c:325
#, c-format
@@ -5728,7 +5937,7 @@ msgid ""
"Why am I still alive after reboot?"
msgstr ""
"\n"
-"¤Ę¤ĽĄęĄÖˇĽĄČ¤·¤ż¤Î¤Ëˇ˘Ą·ĄăĄĂĄČĄŔĄ¦ĄóĄ×ĄíĄ»Ąą¤¬Ŕ¸¤­¤Ć¤¤¤ë¤ó¤Ŕˇ©"
+"¤Ę¤ó¤ÇĄęĄÖˇĽĄČ¤·¤ż¤Î¤Ëˇ˘˛¶¤¬¤Ţ¤ŔŔ¸¤­¤Ć¤¤¤ë¤ó¤Ŕ¤čˇ©"
#: login-utils/shutdown.c:379
msgid ""
@@ -5736,7 +5945,7 @@ msgid ""
"Now you can turn off the power..."
msgstr ""
"\n"
-"¤µ¤Ćˇ˘ĹŸ»¤ňŔڤ뤳¤Č¤¬¤Ç¤­¤Ţ¤ą¤č..."
+"¤µ¤˘ˇ˘ĹŸ»¤ňŔڤäƤ⤤¤¤¤Ç¤ą¤č..."
#: login-utils/shutdown.c:394
msgid "Calling kernel power-off facility...\n"
@@ -5760,30 +5969,30 @@ msgstr "ĽÂąÔĄ¨ĄéˇĽ\t%s\n"
#: login-utils/shutdown.c:431
#, c-format
msgid "URGENT: broadcast message from %s:"
-msgstr ""
+msgstr "¶ŰµŢ: %s ¤«¤é¤ÎĄáĄĂĄ»ˇĽĄ¸:"
#: login-utils/shutdown.c:437
msgid "System going down IMMEDIATELY!\n"
-msgstr ""
+msgstr "Ą·ĄąĄĆĄŕ¤Ď*şŁ¤ą¤°¤Ë*˝ŞÎ»¤·¤Ţ¤ąˇŞ\n"
#: login-utils/shutdown.c:440
#, c-format
msgid "System going down in %d hour%s %d minutes"
-msgstr ""
+msgstr "Ą·ĄąĄĆĄŕ¤Ď %d »ţ´Ö%s%d ʬ¤Ç˝ŞÎ»¤·¤Ţ¤ą"
#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
msgid "s"
-msgstr ""
+msgstr " "
#: login-utils/shutdown.c:443
#, c-format
msgid "System going down in %d minute%s\n"
-msgstr ""
+msgstr "Ą·ĄąĄĆĄŕ¤Ď %d%sʬ¤Ç˝ŞÎ»¤·¤Ţ¤ą\n"
#: login-utils/shutdown.c:449
#, c-format
msgid "\t... %s ...\n"
-msgstr ""
+msgstr "\t... %s ...\n"
#: login-utils/shutdown.c:506
msgid "Cannot fork for swapoff. Shrug!"
@@ -5817,15 +6026,15 @@ msgstr "shutdown: %s ¤ňĄ˘ĄóĄŢĄ¦ĄóĄČ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤ż\n"
#: login-utils/simpleinit.c:79
msgid "Booting to single user mode.\n"
-msgstr ""
+msgstr "Ą·ĄóĄ°ĄëĄćˇĽĄ¶ĄâˇĽĄÉ¤ÇĄÖˇĽĄČ¤·¤Ţ¤ąˇŁ\n"
#: login-utils/simpleinit.c:83
msgid "exec of single user shell failed\n"
-msgstr ""
+msgstr "Ą·ĄóĄ°ĄëĄćˇĽĄ¶Ą·Ą§Ąë¤ÎĽÂąÔ¤ËĽşÇÔ¤·¤Ţ¤·¤ż\n"
#: login-utils/simpleinit.c:87
msgid "fork of single user shell failed\n"
-msgstr ""
+msgstr "Ą·ĄóĄ°ĄëĄćˇĽĄ¶Ą·Ą§Ąë¤Î fork ¤ËĽşÇÔ¤·¤Ţ¤·¤ż\n"
#: login-utils/simpleinit.c:226
msgid ""
@@ -5845,13 +6054,13 @@ msgstr "rc ĄŐĄˇĄ¤Ąë¤ÎĄŞˇĽĄ×Ąó¤ËĽşÇÔ\n"
#: login-utils/simpleinit.c:261
msgid "fork of rc shell failed\n"
-msgstr ""
+msgstr "rc Ą·Ą§Ąë¤Î fork ¤ËĽşÇÔ¤·¤Ţ¤·¤ż\n"
#: login-utils/simpleinit.c:273
msgid "fork failed\n"
msgstr "fork ¤¬ĽşÇÔ\n"
-#: login-utils/simpleinit.c:302 text-utils/more.c:1548
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
msgid "exec failed\n"
msgstr "ĽÂąÔ¤ËĽşÇÔ\n"
@@ -5861,11 +6070,11 @@ msgstr "inittab ¤ňł«¤±¤Ţ¤»¤ó\n"
#: login-utils/simpleinit.c:362
msgid "no TERM or cannot stat tty\n"
-msgstr ""
+msgstr "ĂĽËö¤¬¤Ę¤¤¤« tty ¤ÎľőÂÖ¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó\n"
#: login-utils/ttymsg.c:81
msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr ""
+msgstr "iov ¤¬Âż¤ą¤®¤Ţ¤ą (wall/ttymsg.c ¤ÎĄłˇĽĄÉ¤ňĘŃąą¤·¤Ć¤Ż¤Ŕ¤µ¤¤)"
#: login-utils/ttymsg.c:91
msgid "excessively long line arg"
@@ -5878,12 +6087,12 @@ msgstr "»ŇĄ×ĄíĄ»Ąą¤ňµŻĆ°¤Ç¤­¤Ţ¤»¤ó"
#: login-utils/ttymsg.c:149
#, c-format
msgid "fork: %s"
-msgstr ""
+msgstr "fork: %s"
#: login-utils/ttymsg.c:177
#, c-format
msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: *ÉÔŔµ¤ĘĄ¨ĄéˇĽ*"
#: login-utils/vipw.c:149
#, c-format
@@ -5920,32 +6129,32 @@ msgstr "%s: %s ¤ĎĘŃąą¤µ¤ě¤Ţ¤»¤ó¤Ç¤·¤ż\n"
msgid "%s: no changes made\n"
msgstr "%s: ĘŃąą¤µ¤ě¤Ţ¤»¤ó¤Ç¤·¤ż\n"
-#: login-utils/wall.c:106
+#: login-utils/wall.c:103
#, c-format
msgid "usage: %s [file]\n"
msgstr "»Č¤¤Ęý: %s [ĄŐĄˇĄ¤Ąë]\n"
-#: login-utils/wall.c:154
+#: login-utils/wall.c:151
#, c-format
msgid "%s: can't open temporary file.\n"
msgstr "%s: °ě»ţĄŐĄˇĄ¤Ąë¤ňĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: login-utils/wall.c:181
+#: login-utils/wall.c:178
#, c-format
msgid "Broadcast Message from %s@%s"
msgstr "%s@%s ¤«¤éή¤ě¤Ć¤­¤żĄáĄĂĄ»ˇĽĄ¸"
-#: login-utils/wall.c:191
+#: login-utils/wall.c:188
#, c-format
msgid "%s: can't read %s.\n"
msgstr "%s: %s ¤ňĆɤá¤Ţ¤»¤óˇŁ\n"
-#: login-utils/wall.c:216
+#: login-utils/wall.c:213
#, c-format
msgid "%s: can't stat temporary file.\n"
msgstr "%s: °ě»ţĄŐĄˇĄ¤Ąë¤ÎľđĘó¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: login-utils/wall.c:225
+#: login-utils/wall.c:222
#, c-format
msgid "%s: can't read temporary file.\n"
msgstr "%s: °ě»ţĄŐĄˇĄ¤Ąë¤ňĆɤá¤Ţ¤»¤óˇŁ\n"
@@ -5970,7 +6179,7 @@ msgstr "»Č¤¤Ęý: %s [+˝ńĽ°] [Ćü ·î ÇŻ]\n"
#. handle St. Tib's Day
#: misc-utils/ddate.c:230
msgid "St. Tib's Day"
-msgstr ""
+msgstr "Ŕ» Tib ¤ÎĆü"
#: misc-utils/kill.c:199
#, c-format
@@ -6015,12 +6224,9 @@ msgstr "logger: ̤ĂΤÎÍĄŔčĹŮ: %s.\n"
#: misc-utils/logger.c:280
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:170 misc-utils/setterm.c:1153 text-utils/more.c:1862
-#: text-utils/more.c:1873
-msgid "Out of memory"
-msgstr "ĄáĄâĄę¤¬Â­¤ę¤Ţ¤»¤ó"
+msgstr ""
+"»Č¤¤Ęý: logger [-is] [-f ĄŐĄˇĄ¤Ąë] [-p ÍĄŔčĹŮ] [-t ĄżĄ°] [-u Ą˝Ą±ĄĂĄČ] [ "
+"ĄáĄĂĄ»ˇĽĄ¸ ... ]\n"
#: misc-utils/look.c:340
msgid "usage: look [-dfa] [-t char] string [file]\n"
@@ -6044,7 +6250,7 @@ msgstr "namei: Ą«ĄěĄóĄČĄÇĄŁĄěĄŻĄČĄę¤ËĄ˘ĄŻĄ»Ąą¤Ç¤­¤Ţ¤»¤ó -- %s\n"
#: misc-utils/namei.c:118
#, c-format
msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: %s \n"
+msgstr "namei: %s ¤Ë chkdir ¤Ç¤­¤Ţ¤»¤ó - %s (%d)\n"
#: misc-utils/namei.c:128
msgid "usage: namei [-mx] pathname [pathname ...]\n"
@@ -6066,7 +6272,7 @@ msgstr " ? %s ĄÇĄŁĄěĄŻĄČĄę¤Ë°ÜĆ°¤Ç¤­¤Ţ¤»¤ó -- %s (%d)\n"
#: misc-utils/namei.c:248
#, c-format
msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? Ą·ĄóĄÜĄęĄĂĄŻĄęĄóĄŻĆɤ߼č¤ęĂć¤ËĚäÂ꤬µŻ¤­¤Ţ¤·¤ż -- %s (%d)\n"
+msgstr " ? Ą·ĄóĄÜĄęĄĂĄŻĄęĄóĄŻ %s Ćɤ߼č¤ęĂć¤ËĚäÂ꤬µŻ¤­¤Ţ¤·¤ż - %s (%d)\n"
#: misc-utils/namei.c:258
msgid " *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"
@@ -6077,21 +6283,21 @@ msgstr " *** Ą·ĄóĄÜĄęĄĂĄŻĄęĄóĄŻżô¤¬ UNIX ¤ÎŔ©¸Â¤ň±Ű¤¨¤Ţ¤·¤ż ***"
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr "namei: ĄŐĄˇĄ¤Ąë %2$s ¤Ďˇ˘Ě¤ĂΤΥեˇĄ¤ĄëĄżĄ¤Ą× 0%1$06o ¤Ç¤ą\n"
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
msgid "usage: script [-a] [file]\n"
msgstr "»Č¤¤Ęý: script [-a] [ĄŐĄˇĄ¤Ąë]\n"
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, c-format
msgid "Script started, file is %s\n"
msgstr "ĄąĄŻĄęĄ×ĄČ¤ňł«»Ď¤·¤Ţ¤·¤żˇ˘ĄŐĄˇĄ¤Ąë¤Ď %s ¤Ç¤ą\n"
-#: misc-utils/script.c:197
+#: misc-utils/script.c:198
#, c-format
msgid "Script started on %s"
msgstr "ĄąĄŻĄęĄ×ĄČ¤Ď %s ¤Ëł«»Ď¤·¤Ţ¤·¤ż"
-#: misc-utils/script.c:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
@@ -6100,246 +6306,226 @@ msgstr ""
"\n"
"ĄąĄŻĄęĄ×ĄČ¤Ď %s ¤Ë˝ŞÎ»¤·¤Ţ¤·¤ż"
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr "ĄąĄŻĄęĄ×ĄČ¤ň˝ŞÎ»¤·¤Ţ¤·¤żˇ˘ĄŐĄˇĄ¤Ąë¤Ď %s ¤Ç¤ą\n"
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr "openpty ¤¬ĽşÇÔ\n"
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
msgid "Out of pty's\n"
msgstr "ÍřÍѤǤ­¤ë pty ¤¬¤˘¤ę¤Ţ¤»¤ó\n"
#. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:713
#, c-format
msgid "%s: Argument error, usage\n"
msgstr "%s: °úżôĄ¨ĄéˇĽˇ˘»Č¤¤Ęý¤Ď\n"
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:716
msgid " [ -term terminal_name ]\n"
msgstr " [ -term ĂĽËöĚľ ]\n"
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:717
msgid " [ -reset ]\n"
-msgstr ""
+msgstr " [ -reset ]\n"
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:718
msgid " [ -initialize ]\n"
-msgstr ""
+msgstr " [ -initialize ]\n"
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:719
msgid " [ -cursor [on|off] ]\n"
-msgstr ""
+msgstr " [ -cursor [on|off] ]\n"
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:721
msgid " [ -snow [on|off] ]\n"
msgstr " [ -snow [on|off] ]\n"
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:722
msgid " [ -softscroll [on|off] ]\n"
-msgstr ""
+msgstr " [ -softscroll [on|off] ]\n"
-#: misc-utils/setterm.c:755
-msgid " [ -keyboard pc|olivetti|dutch|extended ]\n"
-msgstr ""
-
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:724
msgid " [ -repeat [on|off] ]\n"
-msgstr ""
+msgstr " [ -repeat [on|off] ]\n"
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:725
msgid " [ -appcursorkeys [on|off] ]\n"
-msgstr ""
+msgstr " [ -appcursorkeys [on|off] ]\n"
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:726
msgid " [ -linewrap [on|off] ]\n"
-msgstr ""
+msgstr " [ -linewrap [on|off] ]\n"
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:727
msgid " [ -default ]\n"
msgstr " [ -default ]\n"
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:728
msgid " [ -foreground black|blue|green|cyan"
-msgstr ""
+msgstr " [ -foreground black|blue|green|cyan"
-#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
msgid "|red|magenta|yellow|white|default ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white|default ]\n"
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:730
msgid " [ -background black|blue|green|cyan"
-msgstr ""
+msgstr " [ -background black|blue|green|cyan"
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:732
msgid " [ -ulcolor black|grey|blue|green|cyan"
-msgstr ""
+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
+#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
+#: misc-utils/setterm.c:739
msgid "|red|magenta|yellow|white ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white ]\n"
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:734
msgid " [ -ulcolor bright blue|green|cyan"
-msgstr ""
+msgstr " [ -ulcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:736
msgid " [ -hbcolor black|grey|blue|green|cyan"
-msgstr ""
+msgstr " [ -hbcolor black|grey|blue|green|cyan"
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:738
msgid " [ -hbcolor bright blue|green|cyan"
-msgstr ""
+msgstr " [ -hbcolor bright blue|green|cyan"
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:741
msgid " [ -standout [ attr ] ]\n"
msgstr " [ -standout [ attr ] ]\n"
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:743
msgid " [ -inversescreen [on|off] ]\n"
-msgstr ""
+msgstr " [ -inversescreen [on|off] ]\n"
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:744
msgid " [ -bold [on|off] ]\n"
-msgstr ""
+msgstr " [ -bold [on|off] ]\n"
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:745
msgid " [ -half-bright [on|off] ]\n"
-msgstr ""
+msgstr " [ -half-bright [on|off] ]\n"
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:746
msgid " [ -blink [on|off] ]\n"
-msgstr ""
+msgstr " [ -blink [on|off] ]\n"
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:747
msgid " [ -reverse [on|off] ]\n"
-msgstr ""
+msgstr " [ -reverse [on|off] ]\n"
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:748
msgid " [ -underline [on|off] ]\n"
-msgstr ""
+msgstr " [ -underline [on|off] ]\n"
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:749
msgid " [ -store ]\n"
msgstr " [ -store ]\n"
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:750
msgid " [ -clear [all|rest] ]\n"
-msgstr ""
+msgstr " [ -clear [all|rest] ]\n"
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:751
msgid " [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -tabs [ ĄżĄÖ1 ĄżĄÖ2 ĄżĄÖ3 ... ] ] (ĄżĄÖżô = 1-160)\n"
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:752
msgid " [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n"
msgstr " [ -clrtabs [ ĄżĄÖ1 ĄżĄÖ2 ĄżĄÖ3 ... ] ] (ĄżĄÖżô = 1-160)\n"
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:753
msgid " [ -regtabs [1-160] ]\n"
-msgstr ""
+msgstr " [ -regtabs [1-160] ]\n"
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:754
msgid " [ -blank [0-60] ]\n"
-msgstr ""
+msgstr " [ -blank [0-60] ]\n"
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:755
msgid " [ -dump [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr " [ -dump [1-NR_CONSOLES] ]\n"
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:756
msgid " [ -append [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr " [ -append [1-NR_CONSOLES] ]\n"
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:757
msgid " [ -file dumpfilename ]\n"
msgstr " [ -file ĄŔĄóĄ×ĄŐĄˇĄ¤ĄëĚľ ]\n"
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:758
msgid " [ -msg [on|off] ]\n"
-msgstr ""
+msgstr " [ -msg [on|off] ]\n"
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:759
msgid " [ -msglevel [0-8] ]\n"
-msgstr ""
+msgstr " [ -msglevel [0-8] ]\n"
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:760
msgid " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-msgstr ""
+msgstr " [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:761
msgid " [ -powerdown [0-60] ]\n"
-msgstr ""
+msgstr " [ -powerdown [0-60] ]\n"
-#: misc-utils/setterm.c:795
+#: misc-utils/setterm.c:762
msgid " [ -blength [0-2000] ]\n"
-msgstr ""
+msgstr " [ -blength [0-2000] ]\n"
-#: misc-utils/setterm.c:796
+#: misc-utils/setterm.c:763
msgid " [ -bfreq freqnumber ]\n"
msgstr " [ -bfreq freqnumber ]\n"
-#: misc-utils/setterm.c:841
-msgid "keyboard.pc"
-msgstr ""
-
-#: misc-utils/setterm.c:844
-msgid "keyboard.olivetti"
-msgstr ""
-
-#: misc-utils/setterm.c:847
-msgid "keyboard.dutch"
-msgstr ""
-
-#: misc-utils/setterm.c:850
-msgid "keyboard.extended"
-msgstr ""
-
-#: misc-utils/setterm.c:884
+#: misc-utils/setterm.c:831
msgid "snow.on"
-msgstr ""
+msgstr "snow.on"
-#: misc-utils/setterm.c:886
+#: misc-utils/setterm.c:833
msgid "snow.off"
-msgstr ""
+msgstr "snow.off"
-#: misc-utils/setterm.c:892
+#: misc-utils/setterm.c:839
msgid "softscroll.on"
-msgstr ""
+msgstr "softscroll.on"
-#: misc-utils/setterm.c:894
+#: misc-utils/setterm.c:841
msgid "softscroll.off"
-msgstr ""
+msgstr "softscroll.off"
-#: misc-utils/setterm.c:1069
+#: misc-utils/setterm.c:1016
msgid "cannot (un)set powersave mode\n"
msgstr "ĄŃĄďˇĽĄ»ˇĽĄÖĄâˇĽĄÉ¤ËŔßÄę(Ëô¤Ď˛ň˝ü)¤Ç¤­¤Ţ¤»¤ó\n"
-#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
+#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
#, c-format
msgid "klogctl error: %s\n"
msgstr "klogctl Ą¨ĄéˇĽ: %s\n"
-#: misc-utils/setterm.c:1157
+#: misc-utils/setterm.c:1104
#, c-format
msgid "Error reading %s\n"
msgstr "%s ¤ÎĆÉąţ¤ßĄ¨ĄéˇĽ\n"
-#: misc-utils/setterm.c:1172
+#: misc-utils/setterm.c:1119
msgid "Error writing screendump\n"
msgstr "ĄąĄŻĄęˇĽĄóĄŔĄóĄ×˝ń¤­ąţ¤ßĄ¨ĄéˇĽ\n"
-#: misc-utils/setterm.c:1186
+#: misc-utils/setterm.c:1133
#, c-format
msgid "couldn't read %s, and cannot ioctl dump\n"
msgstr "%s ¤ňĆɤá¤Ţ¤»¤óˇ˘¤˝¤·¤Ć ioctl ĄŔĄóĄ×¤¬¤Ç¤­¤Ţ¤»¤ó\n"
-#: misc-utils/setterm.c:1251
+#: misc-utils/setterm.c:1198
#, c-format
msgid "%s: $TERM is not defined.\n"
msgstr "%s: $TERM ¤¬ÄęµÁ¤µ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
@@ -6404,7 +6590,7 @@ msgstr "write: %s ¤ĎĘŁżôĄíĄ°Ą¤Ąó¤·¤Ć¤¤¤Ţ¤ą -- %s ¤Ë write ¤·¤Ţ¤ą\n"
#: misc-utils/write.c:325
#, c-format
msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "ĄáĄĂĄ»ˇĽĄ¸ from %s@%s on %s at %s ..."
#: mount/fstab.c:116
#, c-format
@@ -6424,59 +6610,59 @@ 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:358
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr "ĄíĄĂĄŻĄŐĄˇĄ¤Ąë %s ¤ňşîŔ®¤Ç¤­¤Ţ¤»¤ó: %s (-n ĄŐĄéĄ°¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤)"
-#: mount/fstab.c:370
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr "ĄíĄĂĄŻĄŐĄˇĄ¤Ąë %s ¤ňĄęĄóĄŻ¤Ç¤­¤Ţ¤»¤ó: %s (-n ĄŐĄéĄ°¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤)"
-#: mount/fstab.c:382
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr "ĄíĄĂĄŻĄŐĄˇĄ¤Ąë %s ¤ňł«¤±¤Ţ¤»¤ó: %s (-n ĄŐĄéĄ°¤ň»Č¤Ă¤Ć¤Ż¤Ŕ¤µ¤¤)"
-#: mount/fstab.c:397
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr "ĄíĄĂĄŻĄŐĄˇĄ¤Ąë %s ¤ňĄíĄĂĄŻ¤Ç¤­¤Ţ¤»¤ó: %s\n"
-#: mount/fstab.c:408
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr "ĄíĄĂĄŻĄŐĄˇĄ¤Ąë %s ¤ňĄíĄĂĄŻ¤Ç¤­¤Ţ¤»¤ó: %s"
-#: mount/fstab.c:410
+#: mount/fstab.c:427
msgid "timed out"
msgstr "ĄżĄ¤ĄŕĄ˘Ą¦ĄČ"
-#: mount/fstab.c:455 mount/fstab.c:463
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr "%s ¤ňł«¤±¤Ţ¤»¤ó (%s) -- mtab ¤Ďąąż·¤µ¤ě¤Ţ¤»¤ó"
-#: mount/fstab.c:488
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr "mount: ·Ůąđ: şĆĄŢĄ¦ĄóĄČ¤Ç¤ÎĄŢĄ¦ĄóĄČşŃĄÇĄĐĄ¤Ąą¤ÎĘŃąą¤Ď¤Ç¤­¤Ţ¤»¤ó\n"
-#: mount/fstab.c:493
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr "mount: ·Ůąđ: şĆĄŢĄ¦ĄóĄČ¤Ç¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ÎĘŃąą¤Ď¤Ç¤­¤Ţ¤»¤ó\n"
-#: mount/fstab.c:501 mount/fstab.c:507
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr "%s ¤Ř¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ: %s"
-#: mount/fstab.c:514
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr "%s ¤ÎĄâˇĽĄÉĘŃąąĄ¨ĄéˇĽ: %s\n"
-#: mount/fstab.c:521
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr "%s ¤ÎĚľÁ°¤ň %s ¤ËĘŃąą¤Ç¤­¤Ţ¤»¤ó: %s\n"
@@ -6540,16 +6726,16 @@ msgstr "mount: ¶ő¤¤¤Ć¤¤¤ë loop ĄÇĄĐĄ¤Ąą¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó"
msgid "Unsupported encryption type %s\n"
msgstr "%s ĄżĄ¤Ą×¤Î°Ĺąć˛˝¤ĎĄµĄÝˇĽĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
-#: mount/lomount.c:210 mount/losetup.c:125
+#: mount/lomount.c:210 mount/losetup.c:126
msgid "Init (up to 16 hex digits): "
msgstr "˝é´ü˛˝ (16 żĘżô¤ÇşÇÂç 16 ʸ»ú¤Ţ¤Ç): "
-#: mount/lomount.c:217 mount/losetup.c:132
+#: mount/lomount.c:217 mount/losetup.c:133
#, c-format
msgid "Non-hex digit '%c'.\n"
msgstr "16 żĘżô¤Ç¤Ď¤Ę¤¤Ę¸»ú '%c'ˇŁ\n"
-#: mount/lomount.c:223 mount/losetup.c:138
+#: mount/lomount.c:223 mount/losetup.c:140
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr "°Ĺąć˛˝Ą·ĄąĄĆĄŕ %d ¤Î¸°ĽčĆŔĘýˡ¤¬˛ň¤ę¤Ţ¤»¤ó\n"
@@ -6579,7 +6765,7 @@ msgstr ""
msgid "Cannot get loop info"
msgstr "loop ¤ÎľđĘó¤ňĽčĆŔ¤Ç¤­¤Ţ¤»¤ó"
-#: mount/losetup.c:174
+#: mount/losetup.c:176
#, c-format
msgid ""
"usage:\n"
@@ -6592,7 +6778,7 @@ msgstr ""
" %s -d loopĄÇĄĐĄ¤Ąą # şď˝ü\n"
" %s [ -e °Ĺąć˛˝ ] [ -o ĄŞĄŐĄ»ĄĂĄČ ] loopĄÇĄĐĄ¤Ąą ĄŐĄˇĄ¤Ąë # ŔßÄę\n"
-#: mount/losetup.c:231
+#: mount/losetup.c:234
msgid "No loop support was available at compile time. Please recompile.\n"
msgstr ""
"ĄłĄóĄŃĄ¤Ąë»ţ¤Ë loop "
@@ -6612,131 +6798,136 @@ msgstr "[mntent]: %2$s ¤Î %1$d ąÔĚܤĎÉÔŔµ¤Ç¤ą%3$s\n"
msgid "; rest of file ignored"
msgstr "-- ̵»ë¤·¤Ţ¤ą"
-#: mount/mount.c:320
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: mtab ¤Ë¤č¤ë¤Čˇ˘%s ¤Ď %s ¤ËĄŢĄ¦ĄóĄČşŃ¤Ç¤ą"
-#: mount/mount.c:323
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: mtab ¤Ë¤č¤ë¤Čˇ˘%s ¤Ď %s ¤ËĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ţ¤ą"
-#: mount/mount.c:344
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: %s ¤ň˝ń¤­ąţ¤ßÍŃ¤ËĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó: %s"
-#: mount/mount.c:359 mount/mount.c:608
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: %s ¤Î˝ń¤­ąţ¤ßĄ¨ĄéˇĽ: %s"
-#: mount/mount.c:366
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: %s ¤ÎĄâˇĽĄÉĘŃąąĄ¨ĄéˇĽ: %s"
-#: mount/mount.c:440
+#: mount/mount.c:473
msgid "mount failed"
msgstr "ĄŢĄ¦ĄóĄČ¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
-#: mount/mount.c:442
+#: mount/mount.c:475
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: %s ¤ň %s ¤ËĄŢĄ¦ĄóĄČ¤Ç¤­¤ë¤Î¤Ď root ¤Ŕ¤±¤Ç¤ą"
-#: mount/mount.c:467
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
msgstr "mount: loop ĄÇĄĐĄ¤Ąą¤¬ 2 ˛ó»ŘÄꤵ¤ě¤Ţ¤·¤ż"
-#: mount/mount.c:473
+#: mount/mount.c:509
msgid "mount: type specified twice"
msgstr "mount: ĄżĄ¤Ą×¤¬ 2 ˛ó»ŘÄꤵ¤ě¤Ţ¤·¤ż"
-#: mount/mount.c:485
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: loop ĄÇĄĐĄ¤Ąą¤ÎŔßÄę¤ňĄąĄ­ĄĂĄ×¤·¤Ţ¤ą\n"
-#: mount/mount.c:494
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: loop ĄÇĄĐĄ¤Ąą %s ¤ň»Č¤¤¤Ţ¤ą\n"
-#: mount/mount.c:498
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr "mount: loop ĄÇĄĐĄ¤Ąą¤ÎŔßÄę¤ËĽşÇÔ¤·¤Ţ¤·¤ż\n"
-#: mount/mount.c:502
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr "mount: loop ĄÇĄĐĄ¤Ąą¤ÎŔßÄę¤ËŔ®¸ů¤·¤Ţ¤·¤ż\n"
-#: mount/mount.c:515
+#: mount/mount.c:551
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
"mount: ¤ł¤ÎĄĐˇĽĄ¸ĄçĄó¤Ď 'nfs' ĄżĄ¤Ą×¤ÎĄµĄÝˇĽĄČ¤Ę¤·¤ÇĄłĄóĄŃĄ¤Ąë¤µ¤ě¤Ć¤¤¤Ţ¤ą"
-#: mount/mount.c:565 mount/mount.c:990
+#: mount/mount.c:601 mount/mount.c:1030
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: fork ¤Ç¤­¤Ţ¤»¤ó: %s"
-#: mount/mount.c:603
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: %s ¤¬ĄŞˇĽĄ×Ąó¤Ç¤­¤Ţ¤»¤ó: %s"
-#: mount/mount.c:631
+#: mount/mount.c:668
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr "mount: none ¤¬»ŘÄꤵ¤ě¤Ţ¤·¤ż¤¬ˇ˘ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ň·čÄę¤Ç¤­¤Ţ¤»¤ó"
+
+#: mount/mount.c:671
msgid "mount: you must specify the filesystem type"
msgstr "mount: ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤ň»ŘÄꤹ¤ëɬÍפ¬¤˘¤ę¤Ţ¤ą"
-#: mount/mount.c:638 mount/mount.c:673
+#: mount/mount.c:678 mount/mount.c:713
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: ĄŢĄ¦ĄóĄČĄÝĄ¤ĄóĄČ %s ¤ĎĄÇĄŁĄěĄŻĄČĄę¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
-#: mount/mount.c:640
+#: mount/mount.c:680
msgid "mount: permission denied"
msgstr "mount: µö˛Ä¤¬¤˘¤ę¤Ţ¤»¤ó"
-#: mount/mount.c:642
+#: mount/mount.c:682
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:646 mount/mount.c:650
+#: mount/mount.c:686 mount/mount.c:690
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s ¤Ď»ČÍŃĂć¤Ç¤ą"
#. no
#. yes, don't mention it
-#: mount/mount.c:652
+#: mount/mount.c:692
msgid "mount: proc already mounted"
msgstr "mount: proc ¤ĎĄŢĄ¦ĄóĄČşŃ¤Ç¤ą"
-#: mount/mount.c:654
+#: mount/mount.c:694
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s ¤Ď ĄŢĄ¦ĄóĄČşŃ¤« %s ¤¬»ČÍŃĂć¤Ç¤ą"
-#: mount/mount.c:660
+#: mount/mount.c:700
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: ĄŢĄ¦ĄóĄČĄÝĄ¤ĄóĄČ %s ¤¬Â¸şß¤·¤Ţ¤»¤ó"
-#: mount/mount.c:662
+#: mount/mount.c:702
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: ĄŢĄ¦ĄóĄČĄÝĄ¤ĄóĄČ %s ¤Ď¤É¤ł¤â¤µ¤·¤Ć¤¤¤Ę¤¤Ą·ĄóĄÜĄęĄĂĄŻĄęĄóĄŻ¤Ç¤ą"
-#: mount/mount.c:665
+#: mount/mount.c:705
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: ĄąĄÚĄ·ĄăĄëĄÇĄĐĄ¤Ąą %s ¤¬Â¸şß¤·¤Ţ¤»¤ó"
-#: mount/mount.c:675
+#: mount/mount.c:715
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -6745,12 +6936,12 @@ msgstr ""
"mount: ĄąĄÚĄ·ĄăĄëĄÇĄĐĄ¤Ąą %s ¤¬Â¸şß¤·¤Ţ¤»¤ó\n"
" (ĄŃĄą¤ÎĄÇĄŁĄěĄŻĄČĄę¤¬¤˘¤ę¤Ţ¤»¤ó)\n"
-#: mount/mount.c:687
+#: mount/mount.c:727
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s ¤Ď¤Ţ¤ŔĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ę¤¤¤«ˇ˘ÉÔŔµ¤ĘĄŞĄ×Ą·ĄçĄó¤Ç¤ą"
-#: mount/mount.c:689
+#: mount/mount.c:729
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -6760,35 +6951,35 @@ msgstr ""
" %s ¤ÎĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤¬ÉÔŔµˇ˘°ż¤¤¤ĎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕ¤ÎĄŢĄ¦ĄóĄČ\n"
" ¤¬Âż¤ą¤®¤Ţ¤ą"
-#: mount/mount.c:704
+#: mount/mount.c:744
msgid "mount table full"
msgstr "ĄŢĄ¦ĄóĄČĄĆˇĽĄÖĄë¤¬¤¤¤Ă¤Ń¤¤¤Ç¤ą"
-#: mount/mount.c:706
+#: mount/mount.c:746
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: ĄąˇĽĄŃˇĽĄÖĄíĄĂĄŻ¤ňĆɤá¤Ţ¤»¤ó"
-#: mount/mount.c:709
+#: mount/mount.c:749
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr "mount: %s ¤¬´Ö°ă¤Ă¤żĄáĄ¸ĄăˇĽËô¤ĎĄŢĄ¤ĄĘˇĽČÖąć¤Ë¤Ę¤Ă¤Ć¤¤¤Ţ¤ą"
-#: mount/mount.c:714
+#: mount/mount.c:754
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą× %s ¤ĎĄ«ˇĽĄÍĄë¤¬ĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ţ¤»¤ó"
-#: mount/mount.c:726
+#: mount/mount.c:766
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: ¤Ş¤˝¤é¤Ż¤˘¤Ę¤ż¤Ď %s ¤ň°ŐĚŁ¤·¤ż¤«¤Ă¤ż¤Î¤Ç¤·¤ç¤¦"
-#: mount/mount.c:728
+#: mount/mount.c:768
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: ¿ʬ¤˘¤Ę¤ż¤Ď iso9660 ¤ň»ŘÄꤷ¤ż¤«¤Ă¤ż¤Î¤Ç¤Ďˇ©"
-#: mount/mount.c:731
+#: mount/mount.c:771
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -6796,12 +6987,12 @@ msgstr ""
" %s ¤¬ĄµĄÝˇĽĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó"
#. strange ...
-#: mount/mount.c:736
+#: mount/mount.c:776
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s ¤ĎĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤óˇ˘¤Ŕ¤«¤é stat ¤¬ĽşÇÔˇ©"
-#: mount/mount.c:738
+#: mount/mount.c:778
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -6810,76 +7001,76 @@ msgstr ""
"mount: ¤ł¤ÎĄ«ˇĽĄÍĄë¤Ď %s ¤ňĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Č¤·¤ĆǧĽ±¤·¤Ţ¤»¤ó\n"
" (¿ʬˇ˘`insmod ĄÉĄéĄ¤ĄĐ' ¤·¤Ę¤¤¤Č¤¤¤±¤Ę¤¤¤Î¤Ç¤Ďˇ©)"
-#: mount/mount.c:741
+#: mount/mount.c:781
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
"mount: %s ¤ĎĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó (¿ʬ `-o loop' ¤Č¤ä¤Ă¤Ć¤ß¤ż¤éˇ©)"
-#: mount/mount.c:744
+#: mount/mount.c:784
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s ¤ĎĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
-#: mount/mount.c:747
+#: mount/mount.c:787
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s ¤ĎŔµľď¤ĘĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
-#: mount/mount.c:751
+#: mount/mount.c:791
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr "mount: ĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą %s ¤Ď¤˝¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕľĺ¤Çµö˛Ä¤µ¤ě¤Ţ¤»¤ó"
-#: mount/mount.c:767
+#: mount/mount.c:807
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s ¤Ď˝ń¤­ąţ¤ß¶Ř»ß¤Ç¤ąˇ˘ĆÉąţ¤ßŔěÍѤǥޥ¦ĄóĄČ¤·¤Ţ¤ą"
-#: mount/mount.c:768
+#: mount/mount.c:808
msgid "block device "
msgstr "ĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą "
-#: mount/mount.c:854
+#: mount/mount.c:894
#, c-format
msgid "mount: consider mounting %s by %s\n"
msgstr "mount: %s ¤ň %s ¤ÇĄŢĄ¦ĄóĄČ¤ą¤ë¤ł¤Č¤ňąÍ¤¨¤Ć¤ß¤Ć¤Ż¤Ŕ¤µ¤¤\n"
-#: mount/mount.c:855
+#: mount/mount.c:895
msgid "UUID"
-msgstr ""
+msgstr "UUID"
-#: mount/mount.c:855
+#: mount/mount.c:895
msgid "label"
msgstr "ĄéĄŮĄë"
-#: mount/mount.c:857 mount/mount.c:1173
+#: mount/mount.c:897 mount/mount.c:1213
msgid "mount: no such partition found"
msgstr "mount: ¤˝¤Î¤č¤¦¤ĘĄŃˇĽĄĆĄŁĄ·ĄçĄó¤Ď¸«¤Ä¤«¤ę¤Ţ¤»¤ó"
-#: mount/mount.c:865
+#: mount/mount.c:905
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount: ĄżĄ¤Ą×¤¬Íż¤¨¤é¤ě¤Ć¤¤¤Ţ¤»¤ó -- ĄłĄíĄó¤¬¤˘¤ë¤Î¤Ç nfs ¤ÎÍͤǤą¤¬\n"
#.
#. * Retry in the background.
#.
-#: mount/mount.c:881
+#: mount/mount.c:921
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: ĄĐĄĂĄŻĄ°ĄéĄ¦ĄóĄÉ \"%s\"\n"
-#: mount/mount.c:892
+#: mount/mount.c:932
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: Äü¤á¤Ţ¤·¤ż \"%s\"\n"
-#: mount/mount.c:941
+#: mount/mount.c:981
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s ¤Ď %s ¤ËĄŢĄ¦ĄóĄČşŃ¤Ç¤ą\n"
-#: mount/mount.c:1052
+#: mount/mount.c:1092
msgid ""
"Usage: mount [-hV]\n"
" mount -a [-nfFrsvw] [-t vfstypes]\n"
@@ -6894,49 +7085,49 @@ msgstr ""
"node\n"
" ĄąĄÚĄ·ĄăĄëĄÇĄĐĄ¤Ąą¤Ď -L ĄéĄŮĄë Ëô¤Ď -U uuid ¤Ç»ŘĽ¨¤Ç¤­¤Ţ¤ąˇŁ\n"
-#: mount/mount.c:1158
+#: mount/mount.c:1198
msgid "mount: only root can do that"
msgstr "mount: root ¤Ŕ¤±¤¬¤˝¤ě¤ňąÔ¤Ę¤¨¤Ţ¤ą"
-#: mount/mount.c:1163
+#: mount/mount.c:1203
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s ¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó -- şîŔ®¤·¤Ţ¤ą..\n"
-#: mount/mount.c:1175
+#: mount/mount.c:1215
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: %s ¤ňĄŢĄ¦ĄóĄČ¤·¤Ţ¤ą\n"
-#: mount/mount.c:1184
+#: mount/mount.c:1224
msgid "not mounted anything"
msgstr "˛ż¤âĄŢĄ¦ĄóĄČ¤·¤Ţ¤»¤ó¤Ç¤·¤ż"
-#: mount/mount.c:1197
+#: mount/mount.c:1237
#, c-format
msgid "mount: cannot find %s in %s"
-msgstr "mount: %2$s Ćâ¤Ë %2$s ¤ň¸«¤Ä¤±¤é¤ě¤Ţ¤»¤ó"
+msgstr "mount: %2$s Ćâ¤Ë %1$s ¤ň¸«¤Ä¤±¤é¤ě¤Ţ¤»¤ó"
-#: mount/mount.c:1211
+#: mount/mount.c:1251
#, c-format
msgid "mount: can't find %s in %s or %s"
-msgstr "mount: %2$s ¤ä %3$s Ćâ¤Ë %s ¤ň¸«¤Ä¤±¤é¤ě¤Ţ¤»¤ó"
+msgstr "mount: %2$s ¤ä %3$s Ćâ¤Ë %1$s ¤ň¸«¤Ä¤±¤é¤ě¤Ţ¤»¤ó"
#: mount/mount_by_label.c:141
msgid "mount: bad UUID"
-msgstr ""
+msgstr "mount: ÉÔŔµ¤Ę UUID"
-#: mount/mount_guess_fstype.c:187
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: %s ¤Ř¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×¤Î»ŘÄ꤬¤˘¤ę¤Ţ¤»¤ó\n"
-#: mount/mount_guess_fstype.c:190
+#: mount/mount_guess_fstype.c:201
#, c-format
msgid " I will try type %s\n"
msgstr " ĄżĄ¤Ą× %s ¤ň»î¤·¤Ć¤ß¤Ţ¤ą\n"
-#: mount/mount_guess_fstype.c:192
+#: mount/mount_guess_fstype.c:203
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " %s Ëô¤Ď %s ¤ÎĄżĄ¤Ą×¤ň»î¤·¤Ć¤ß¤Ţ¤ą\n"
@@ -7004,11 +7195,11 @@ msgstr "TCP ·ĐÍł¤Î NFS ¤ĎĄµĄÝˇĽĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤óˇŁ\n"
#: mount/nfsmount.c:546
msgid "nfs socket"
-msgstr ""
+msgstr "nfs Ą˝Ą±ĄĂĄČ"
#: mount/nfsmount.c:550
msgid "nfs bindresvport"
-msgstr ""
+msgstr "nfs bindresvport"
#: mount/nfsmount.c:561
msgid "used portmapper to find NFS port\n"
@@ -7021,7 +7212,7 @@ msgstr "nfs ĄÇˇĽĄâĄó¤Î¤ż¤á¤Ë %d Č֥ݡĽĄČ¤ňÍřÍŃ\n"
#: mount/nfsmount.c:576
msgid "nfs connect"
-msgstr ""
+msgstr "nfs ŔÜÂł"
#: mount/nfsmount.c:665
#, c-format
@@ -7034,7 +7225,7 @@ msgstr "ĄáĄâĄę¤¬ÉÔ˝˝Ę¬¤Ç¤ą"
#: mount/sundries.c:65
msgid "bug in xstrndup call"
-msgstr ""
+msgstr "xstrndup ¸Ć¤Ó˝Đ¤·¤ÎĄĐĄ°"
#: mount/swapon.c:51
#, c-format
@@ -7075,95 +7266,95 @@ msgstr "swapon: ĄŐĄˇĄ¤Ąë %s ¤ňĄąĄ­ĄĂĄ× -- ĄŰˇĽĄë¤ň¸ˇ˝ĐˇŁ\n"
msgid "%s: cannot open %s: %s\n"
msgstr "%s: %s ¤ňł«¤±¤Ţ¤»¤ó: %s\n"
-#: mount/umount.c:65
+#: mount/umount.c:69
msgid "umount: compiled without support for -f\n"
msgstr "mount: -f ĄŞĄ×Ą·ĄçĄó¤ÎĄµĄÝˇĽĄČ̵¤·¤ÇĄłĄóĄŃĄ¤Ąë¤µ¤ě¤Ć¤¤¤Ţ¤ą\n"
-#: mount/umount.c:115
+#: mount/umount.c:121
#, c-format
msgid "host: %s, directory: %s\n"
msgstr "ĄŰĄąĄČ: %s, ĄÇĄŁĄěĄŻĄČĄę: %s\n"
-#: mount/umount.c:132
+#: mount/umount.c:138
#, c-format
msgid "umount: can't get address for %s\n"
msgstr "umount: %s ¤ÎĄ˘ĄÉĄěĄą¤¬ĽčĆŔ¤Ç¤­¤Ţ¤»¤ó\n"
-#: mount/umount.c:137
+#: mount/umount.c:143
msgid "umount: got bad hostp->h_length\n"
msgstr "umount: ÉÔŔµ¤Ę hostp->h_length ĂͤňĽčĆŔ¤·¤Ţ¤·¤ż\n"
-#: mount/umount.c:175
+#: mount/umount.c:181
#, c-format
msgid "umount: %s: invalid block device"
msgstr "umount: %s ¤ĎÉÔŔµ¤ĘĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤Ç¤ą"
-#: mount/umount.c:177
+#: mount/umount.c:183
#, c-format
msgid "umount: %s: not mounted"
msgstr "umount: %s: ĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó"
-#: mount/umount.c:179
+#: mount/umount.c:185
#, 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:183
+#: mount/umount.c:189
#, c-format
msgid "umount: %s: device is busy"
msgstr "umount: %s: ĄÇĄĐĄ¤Ąą¤ň»ČÍŃĂć¤Ç¤ą"
-#: mount/umount.c:185
+#: mount/umount.c:191
#, c-format
msgid "umount: %s: not found"
msgstr "umount: %s: ¸«¤Ä¤«¤ę¤Ţ¤»¤ó"
-#: mount/umount.c:187
+#: mount/umount.c:193
#, c-format
msgid "umount: %s: must be superuser to umount"
msgstr "umount: %s: Ą˘ĄóĄŢĄ¦ĄóĄČ¤ą¤ë¤Ë¤ĎĄąˇĽĄŃˇĽĄćˇĽĄ¶¤Ç¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó"
-#: mount/umount.c:189
+#: mount/umount.c:195
#, c-format
msgid "umount: %s: block devices not permitted on fs"
msgstr "umount: %s: ĄÖĄíĄĂĄŻĄÇĄĐĄ¤Ąą¤ĎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕľĺ¤Çµö˛Ä¤µ¤ě¤Ţ¤»¤ó"
-#: mount/umount.c:191
+#: mount/umount.c:197
#, c-format
msgid "umount: %s: %s"
msgstr "umount: %s: %s"
-#: mount/umount.c:235
+#: mount/umount.c:241
msgid "no umount2, trying umount...\n"
msgstr "umount2 ¤¬¤˘¤ę¤Ţ¤»¤óˇ˘umount ¤·¤Ć¤ß¤Ţ¤ą...\n"
-#: mount/umount.c:248
+#: mount/umount.c:254
#, c-format
msgid "could not umount %s - trying %s instead\n"
msgstr "%s ¤ňĄ˘ĄóĄŢĄ¦ĄóĄČ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤ż -- Âĺ¤ę¤Ë %s ¤ň»Č¤Ă¤Ć¤ß¤Ţ¤ą\n"
-#: mount/umount.c:264
+#: mount/umount.c:270
#, c-format
msgid "umount: %s busy - remounted read-only\n"
msgstr "umount: %s ¤Ď»ČÍŃĂć¤Ç¤ą -- ĆÉąţ¤ßŔěÍѤȤ·¤ĆşĆĄŢĄ¦ĄóĄČ¤·¤Ţ¤ą\n"
-#: mount/umount.c:272
+#: mount/umount.c:278
#, c-format
msgid "umount: could not remount %s read-only\n"
msgstr "umount: %s ¤ňĆÉąţ¤ßŔěÍѤǺƥޥ¦ĄóĄČ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤ż\n"
-#: mount/umount.c:280
+#: mount/umount.c:286
#, c-format
msgid "%s umounted\n"
msgstr "%s ¤ĎĄ˘ĄóĄŢĄ¦ĄóĄČ¤µ¤ě¤Ţ¤·¤ż\n"
-#: mount/umount.c:363
+#: mount/umount.c:369
msgid "umount: cannot find list of filesystems to unmount"
msgstr "umount: Ą˘ĄóĄŢĄ¦ĄóĄČ¤Î¤ż¤á¤ÎĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄęĄąĄČ¤ň¸«¤Ä¤±¤é¤ě¤Ţ¤»¤ó"
-#: mount/umount.c:392
+#: mount/umount.c:398
msgid ""
"Usage: umount [-hV]\n"
" umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7173,47 +7364,47 @@ msgstr ""
" umount -a [-f] [-r] [-n] [-v] [-t ĄŐĄˇĄ¤ĄëĄ·ĄąĄĆĄŕĄżĄ¤Ą×]\n"
" umount [-f] [-r] [-n] [-v] special | node...\n"
-#: mount/umount.c:453
+#: mount/umount.c:459
msgid "umount: only root can do that"
msgstr "umount: ¤˝¤ě¤¬˝ĐÍč¤ë¤Î¤Ď root ¤Ŕ¤±¤Ç¤ą"
-#: mount/umount.c:468
+#: mount/umount.c:474
#, c-format
msgid "Trying to umount %s\n"
msgstr "%s ¤ňĄ˘ĄóĄŢĄ¦ĄóĄČ¤·¤Ţ¤ą\n"
-#: mount/umount.c:472
+#: mount/umount.c:478
#, c-format
msgid "Could not find %s in mtab\n"
msgstr "mtab ¤Ë %s ¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
-#: mount/umount.c:476
+#: mount/umount.c:482
#, c-format
msgid "umount: %s is not mounted (according to mtab)"
msgstr "umount: %s ĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó (mtab ¤Ë¤č¤ë¤Č)"
-#: mount/umount.c:478
+#: mount/umount.c:484
#, c-format
msgid "umount: it seems %s is mounted multiple times"
msgstr "umount: %s ¤ĎĘŁżôĄŢĄ¦ĄóĄČ¤µ¤ě¤Ć¤¤¤ë¤č¤¦¤Ç¤ą"
-#: mount/umount.c:480
+#: mount/umount.c:496
#, c-format
msgid "umount: %s is not in the fstab (and you are not root)"
msgstr ""
"umount: %s ¤Ď fstab ¤Ë¤˘¤ę¤Ţ¤»¤ó (¤µ¤é¤Ëˇ˘¤˘¤Ę¤ż¤Ď root ¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó)"
-#: mount/umount.c:486
+#: mount/umount.c:499
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr "umount: %s ¤Ď fstab ¤Č°ěĂפ·¤Ę¤¤ĄŢĄ¦ĄóĄČ¤Ç¤ą"
-#: mount/umount.c:505
+#: mount/umount.c:520
#, c-format
msgid "umount: only root can unmount %s from %s"
msgstr "umount: %s ¤ň %s ¤«¤éĄ˘ĄóĄŢĄ¦ĄóĄČ¤Ç¤­¤ë¤Î¤Ď root ¤Ŕ¤±¤Ç¤ą"
-#: mount/umount.c:515
+#: mount/umount.c:531
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr "umount: %s ¤ň %s ¤«¤éĄ˘ĄóĄŢĄ¦ĄóĄČ¤Ç¤­¤ë¤Î¤Ď %s ¤Ŕ¤±¤Ç¤ą"
@@ -7289,7 +7480,7 @@ msgstr "%s ¤ňł«¤±¤Ţ¤»¤ó: %s\n"
#: sys-utils/cytune.c:264
#, c-format
msgid "Can't set %s to threshold %d: %s\n"
-msgstr "%s ¤ň¤·¤­¤¤ĂÍ %s ¤ËŔßÄę¤Ç¤­¤Ţ¤»¤ó: %s\n"
+msgstr "%s ¤ň¤·¤­¤¤ĂÍ %d ¤ËŔßÄę¤Ç¤­¤Ţ¤»¤ó: %s\n"
#: sys-utils/cytune.c:282
#, c-format
@@ -7309,7 +7500,7 @@ msgstr "%s ¤Ř¤ÎĄżĄ¤ĄŕĄ˘Ą¦ĄČ¤¬ĽčĆŔ¤Ç¤­¤Ţ¤»¤ó: %s\n"
#: sys-utils/cytune.c:309
#, c-format
msgid "%s: %ld %s threshold and %ld %s timeout\n"
-msgstr "%s: %s ¤·¤­¤¤ĂÍ %ld µÚ¤Ó %s ĄżĄ¤ĄŕĄ˘Ą¦ĄČ %ld\n"
+msgstr "%1$s: %3$s ¤·¤­¤¤ĂÍ %2$ld µÚ¤Ó %5$s ĄżĄ¤ĄŕĄ˘Ą¦ĄČ %4$ld\n"
#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "current"
@@ -7335,17 +7526,17 @@ msgstr "%s ¤Ç CYGETMON ¤¬ČŻąÔ¤Ç¤­¤Ţ¤»¤ó: %s\n"
#: sys-utils/cytune.c:421
#, c-format
msgid "%s: %lu ints, %lu/%lu chars; "
-msgstr ""
+msgstr "%s: %lu ints, %lu/%lu chars; "
#: sys-utils/cytune.c:422
#, c-format
msgid "fifo: %lu thresh, %lu tmout, "
-msgstr ""
+msgstr "fifo: %lu thresh, %lu tmout, "
#: sys-utils/cytune.c:423
#, c-format
msgid "%lu max, %lu now\n"
-msgstr ""
+msgstr "%lu ¤¬şÇÂ硢¸˝şß %lu\n"
#: sys-utils/cytune.c:428
#, c-format
@@ -7514,12 +7705,12 @@ msgstr "------ ¶¦Í­ĄáĄâĄęĄ»Ą°ĄáĄóĄČ şîŔ®ĽÔ/˝ęÍ­ĽÔ --------\n"
#: sys-utils/ipcs.c:264 sys-utils/ipcs.c:370 sys-utils/ipcs.c:462
#, c-format
msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:271 sys-utils/ipcs.c:276
#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:377
msgid "shmid"
-msgstr ""
+msgstr "shmid"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:282 sys-utils/ipcs.c:371
#: sys-utils/ipcs.c:386 sys-utils/ipcs.c:463 sys-utils/ipcs.c:480
@@ -7528,19 +7719,19 @@ msgstr "¸˘¸Â"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
msgid "cuid"
-msgstr ""
+msgstr "cuid"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
msgid "cgid"
-msgstr ""
+msgstr "cgid"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
msgid "uid"
-msgstr ""
+msgstr "uid"
#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:463
msgid "gid"
-msgstr ""
+msgstr "gid"
#: sys-utils/ipcs.c:269
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
@@ -7549,7 +7740,7 @@ msgstr "------ Ą·Ą§Ą˘ˇĽĄÉĄáĄâĄę ·ëąç/ʬΥ/ĘŃąą˛óżô --------\n"
#: sys-utils/ipcs.c:270
#, c-format
msgid "%-10s%-10s %-20s%-20s%-20s\n"
-msgstr ""
+msgstr "%-10s%-10s %-20s%-20s%-20s\n"
#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:276 sys-utils/ipcs.c:282
#: sys-utils/ipcs.c:377 sys-utils/ipcs.c:386 sys-utils/ipcs.c:469
@@ -7576,15 +7767,15 @@ msgstr "------ Ą·Ą§Ą˘ˇĽĄÉĄáĄâĄę şîŔ®ĽÔ/Äľ¶á¤ÎĚżÎá --------\n"
#: sys-utils/ipcs.c:276 sys-utils/ipcs.c:474
#, c-format
msgid "%-10s%-10s%-10s%-10s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s\n"
#: sys-utils/ipcs.c:276
msgid "cpid"
-msgstr ""
+msgstr "cpid"
#: sys-utils/ipcs.c:276
msgid "lpid"
-msgstr ""
+msgstr "lpid"
#: sys-utils/ipcs.c:280
msgid "------ Shared Memory Segments --------\n"
@@ -7593,11 +7784,11 @@ msgstr "------ Ą·Ą§Ą˘ˇĽĄÉĄáĄâĄęĄ»Ą°ĄáĄóĄČ --------\n"
#: sys-utils/ipcs.c:281
#, c-format
msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:386 sys-utils/ipcs.c:479
msgid "key"
-msgstr ""
+msgstr "Ą­ˇĽ"
#: sys-utils/ipcs.c:282
msgid "bytes"
@@ -7605,7 +7796,7 @@ msgstr "ĄĐĄ¤ĄČ"
#: sys-utils/ipcs.c:282
msgid "nattch"
-msgstr ""
+msgstr "nattch"
#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:386
msgid "status"
@@ -7678,7 +7869,7 @@ msgstr "------ Ą»ĄŢĄŐĄ©ÇŰÎó şîŔ®ĽÔ/˝ęÍ­ĽÔ --------\n"
#: sys-utils/ipcs.c:371 sys-utils/ipcs.c:386
msgid "semid"
-msgstr ""
+msgstr "semid"
#: sys-utils/ipcs.c:375
msgid "------ Shared Memory Operation/Change Times --------\n"
@@ -7687,15 +7878,15 @@ msgstr "------ Ą·Ą§Ą˘ˇĽĄÉĄáĄâĄę ĚżÎá/ĘŃąą˛óżô --------\n"
#: sys-utils/ipcs.c:376
#, c-format
msgid "%-8s%-10s %-26.24s %-26.24s\n"
-msgstr ""
+msgstr "%-8s%-10s %-26.24s %-26.24s\n"
#: sys-utils/ipcs.c:377
msgid "last-op"
-msgstr ""
+msgstr "last-op"
#: sys-utils/ipcs.c:377
msgid "last-changed"
-msgstr ""
+msgstr "last-changed"
#: sys-utils/ipcs.c:384
msgid "------ Semaphore Arrays --------\n"
@@ -7704,11 +7895,11 @@ msgstr "------ Ą»ĄŢĄŐĄ©ÇŰÎó --------\n"
#: sys-utils/ipcs.c:385
#, c-format
msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
#: sys-utils/ipcs.c:386
msgid "nsems"
-msgstr ""
+msgstr "nsems"
#: sys-utils/ipcs.c:447
msgid "------ Messages: Limits --------\n"
@@ -7755,7 +7946,7 @@ msgstr "------ ĄáĄĂĄ»ˇĽĄ¸Ą­ĄĺˇĽ: şîŔ®ĽÔ/˝ęÍ­ĽÔ --------\n"
#: sys-utils/ipcs.c:463 sys-utils/ipcs.c:469 sys-utils/ipcs.c:474
#: sys-utils/ipcs.c:479
msgid "msqid"
-msgstr ""
+msgstr "msqid"
#: sys-utils/ipcs.c:467
msgid "------ Message Queues Send/Recv/Change Times --------\n"
@@ -7764,7 +7955,7 @@ msgstr "------ ĄáĄĂĄ»ˇĽĄ¸Ą­ĄĺˇĽ Á÷ż®/Ľőż®/ĘŃąą˛óżô --------\n"
#: sys-utils/ipcs.c:468
#, c-format
msgid "%-8s%-10s %-20s%-20s%-20s\n"
-msgstr ""
+msgstr "%-8s%-10s %-20s%-20s%-20s\n"
#: sys-utils/ipcs.c:469
msgid "send"
@@ -7784,11 +7975,11 @@ msgstr "------ ĄáĄĂĄ»ˇĽĄ¸Ą­ĄĺˇĽ PIDs --------\n"
#: sys-utils/ipcs.c:474
msgid "lspid"
-msgstr ""
+msgstr "lspid"
#: sys-utils/ipcs.c:474
msgid "lrpid"
-msgstr ""
+msgstr "lrpid"
#: sys-utils/ipcs.c:478
msgid "------ Message Queues --------\n"
@@ -7797,7 +7988,7 @@ msgstr "------ ĄáĄĂĄ»ˇĽĄ¸Ą­ĄĺˇĽ --------\n"
#: sys-utils/ipcs.c:479
#, c-format
msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
#: sys-utils/ipcs.c:480
msgid "used-bytes"
@@ -7819,7 +8010,7 @@ msgstr ""
#: sys-utils/ipcs.c:540
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
#: sys-utils/ipcs.c:542
#, c-format
@@ -7829,12 +8020,12 @@ msgstr "ĄâˇĽĄÉ=%#o\tĄ˘ĄŻĄ»Ąą¸˘=%#o\n"
#: sys-utils/ipcs.c:543
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-msgstr ""
+msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
#: sys-utils/ipcs.c:546
#, c-format
msgid "att_time=%s"
-msgstr ""
+msgstr "att_time=%s"
#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:598
msgid "Not set\n"
@@ -7843,7 +8034,7 @@ msgstr "Ą»ĄĂĄČ¤µ¤ě¤Ć¤¤¤Ţ¤»¤ó\n"
#: sys-utils/ipcs.c:548
#, c-format
msgid "det_time=%s"
-msgstr ""
+msgstr "det_time=%s"
#: sys-utils/ipcs.c:550
#, c-format
@@ -7862,12 +8053,12 @@ msgstr ""
#: sys-utils/ipcs.c:567
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
#: sys-utils/ipcs.c:569
#, c-format
msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
-msgstr ""
+msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
#: sys-utils/ipcs.c:572
#, c-format
@@ -7890,7 +8081,7 @@ msgstr ""
#: sys-utils/ipcs.c:593
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-msgstr ""
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
#: sys-utils/ipcs.c:595
#, c-format
@@ -7900,26 +8091,26 @@ msgstr "ĄâˇĽĄÉ=%#o, Ą˘ĄŻĄ»Ąą¸˘=%#o\n"
#: sys-utils/ipcs.c:596
#, c-format
msgid "nsems = %d\n"
-msgstr ""
+msgstr "nsems = %d\n"
#: sys-utils/ipcs.c:597
#, c-format
msgid "otime = %s"
-msgstr ""
+msgstr "otime = %s"
#: sys-utils/ipcs.c:599
#, c-format
msgid "ctime = %s"
-msgstr ""
+msgstr "ctime = %s"
#: sys-utils/ipcs.c:601
#, c-format
msgid "%-10s%-10s%-10s%-10s%-10s\n"
-msgstr ""
+msgstr "%-10s%-10s%-10s%-10s%-10s\n"
#: sys-utils/ipcs.c:601
msgid "semnum"
-msgstr ""
+msgstr "semnum"
#: sys-utils/ipcs.c:601
msgid "value"
@@ -7927,75 +8118,78 @@ msgstr "ĂÍ"
#: sys-utils/ipcs.c:601
msgid "ncount"
-msgstr ""
+msgstr "ncount"
#: sys-utils/ipcs.c:602
msgid "zcount"
-msgstr ""
+msgstr "zcount"
#: sys-utils/ipcs.c:602
msgid "pid"
-msgstr ""
+msgstr "pid"
#: sys-utils/rdev.c:68
msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr ""
+"»Č¤¤Ęý: rdev [ -rsv ] [ -o ĄŞĄŐĄ»ĄĂĄČ ] [ Ą¤ĄáˇĽĄ¸ [ ĂÍ [ ĄŞĄŐĄ»ĄĂĄČ ] ] ]"
#: sys-utils/rdev.c:69
msgid ""
" rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
+msgstr " rdev /dev/fd0 (or rdev /linux, etc.) ¸˝şß¤ÎĄëˇĽĄČĄÇĄĐĄ¤Ąą¤ňÉ˝Ľ¨"
#: sys-utils/rdev.c:70
msgid " rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2"
-msgstr ""
+msgstr " rdev /dev/fd0 /dev/hda2 ĄëˇĽĄČ¤ň /dev/hda2 ¤ËŔßÄę"
#: sys-utils/rdev.c:71
msgid " rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)"
-msgstr ""
+msgstr " rdev -R /dev/fd0 1 ĄëˇĽĄČĄŐĄéĄ°¤ňŔßÄę (ĆÉąţŔěÍŃľőÂÖ)"
#: sys-utils/rdev.c:72
msgid " rdev -s /dev/fd0 /dev/hda2 set the SWAP device"
-msgstr ""
+msgstr " rdev -s /dev/fd0 /dev/hda2 ĄąĄďĄĂĄ×ĄÇĄĐĄ¤Ąą¤ňŔßÄę"
#: sys-utils/rdev.c:73
msgid " rdev -r /dev/fd0 627 set the RAMDISK size"
-msgstr ""
+msgstr " rdev -r /dev/fd0 627 RAM ĄÇĄŁĄąĄŻĄµĄ¤Ąş¤ňŔßÄę"
#: sys-utils/rdev.c:74
msgid " rdev -v /dev/fd0 1 set the bootup VIDEOMODE"
-msgstr ""
+msgstr " rdev -v /dev/fd0 1 ĄÖˇĽĄČ»ţ¤ÎĄÓĄÇĄŞĄâˇĽĄÉ¤ňŔßÄę"
#: sys-utils/rdev.c:75
msgid " rdev -o N ... use the byte offset N"
-msgstr ""
+msgstr " rdev -o N ... ĄĐĄ¤ĄČĄŞĄŐĄ»ĄĂĄČ N ¤ňÍřÍŃ"
#: sys-utils/rdev.c:76
msgid " rootflags ... same as rdev -R"
-msgstr ""
+msgstr " rootflags ... rdev -R ¤ČƱ¤¸"
#: sys-utils/rdev.c:77
msgid " swapdev ... same as rdev -s"
-msgstr ""
+msgstr " swapdev ... rdev -s ¤ČƱ¤¸"
#: sys-utils/rdev.c:78
msgid " ramsize ... same as rdev -r"
-msgstr ""
+msgstr " ramsize ... rdev -r ¤ČƱ¤¸"
#: sys-utils/rdev.c:79
msgid " vidmode ... same as rdev -v"
-msgstr ""
+msgstr " vidmode ... rdev -v ¤ČƱ¤¸"
#: sys-utils/rdev.c:80
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:81
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr ""
+" ĄëˇĽĄČ¤ňĆÉąţŔěÍŃĄŢĄ¦ĄóĄČ¤ą¤ë¤Ë¤Ď -R 1 ¤ňˇ˘-R 0 ¤ÇĆɤ߽ń¤­ĄŢĄ¦ĄóĄČˇŁ"
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -8016,38 +8210,40 @@ msgstr ""
"\t -r ¤ą¤Ů¤Ć¤ÎĄ«Ą¦ĄóĄż¤ňĄęĄ»ĄĂĄČ¤ą¤ë (root ¤Î¤ß)\n"
"\t -V ĄĐˇĽĄ¸ĄçĄóľđĘó¤ňÉ˝Ľ¨¤·¤Ć˝ŞÎ»¤ą¤ë\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
msgstr "%s ĄĐˇĽĄ¸ĄçĄó %s\n"
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
-msgstr ""
+msgstr "¤Ę¤ó¤Ç¤â\n"
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr "ĄµĄóĄ×ĄęĄóĄ°ĄąĄĆĄĂĄ×: %i\n"
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr "%s: %s(%i): ´Ö°ă¤Ă¤żĄŢĄĂĄ×ąÔ\n"
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
msgstr "%s: %s ¤Ë \"_stext\" ¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
-#: sys-utils/readprofile.c:221
+#: sys-utils/readprofile.c:226
msgid "total"
msgstr "ąç·×"
#: sys-utils/renice.c:67
msgid ""
"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr "»Č¤¤Ęý: renice ÍĄŔčĹŮ [ [ -p ] Ą×ĄíĄ»ĄąID ] [ [ -g ] Ą×ĄíĄ»ĄąĄ°ĄëˇĽĄ×] [ [ -u ĄćˇĽĄ¶ ]\n"
+msgstr ""
+"»Č¤¤Ęý: renice ÍĄŔčĹŮ [ [ -p ] Ą×ĄíĄ»ĄąID ] [ [ -g ] Ą×ĄíĄ»ĄąĄ°ĄëˇĽĄ×] [ [ "
+"-u ĄćˇĽĄ¶ ]\n"
#: sys-utils/renice.c:94
#, c-format
@@ -8061,11 +8257,11 @@ msgstr "renice: %s: ÉÔŔµ¤ĘĂͤǤą\n"
#: sys-utils/renice.c:121
msgid "getpriority"
-msgstr ""
+msgstr "getpriority"
#: sys-utils/renice.c:126
msgid "setpriority"
-msgstr ""
+msgstr "setpriority"
#: sys-utils/renice.c:129
#, c-format
@@ -8077,7 +8273,7 @@ msgstr "%d: ¸Ĺ¤¤ÍĄŔčĹŮ¤Ď %dˇ˘ż·¤ż¤ĘÍĄŔčĹŮ¤Ď %d ¤Ç¤ą\n"
msgid "usage: %s program [arg ...]\n"
msgstr "»Č¤¤Ęý: %s Ą×ĄíĄ°ĄéĄŕ [ °úżô ...]\n"
-#: sys-utils/tunelp.c:76
+#: sys-utils/tunelp.c:74
#, c-format
msgid ""
"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8088,94 +8284,94 @@ msgstr ""
" -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
" -T [on|off] ]\n"
-#: sys-utils/tunelp.c:92
+#: sys-utils/tunelp.c:90
msgid "malloc error"
msgstr "malloc Ą¨ĄéˇĽ"
-#: sys-utils/tunelp.c:103
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
msgstr "sscanf Ą¨ĄéˇĽ"
-#: sys-utils/tunelp.c:236
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
msgstr "%s: %s ¤Ď lp ĄÇĄĐĄ¤Ąą¤Ç¤Ď¤˘¤ę¤Ţ¤»¤óˇŁ\n"
-#: sys-utils/tunelp.c:257
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
msgstr "%s ¤ÎľőÂÖ¤Ď %d ¤Ç¤ą"
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:261
msgid ", busy"
msgstr ", ĄÓĄ¸ˇĽ"
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:262
msgid ", ready"
msgstr ", ˝ŕČ÷¤Ç¤­¤Ć¤¤¤Ţ¤ą"
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
msgstr ", Íѻ椬¤˘¤ę¤Ţ¤»¤ó"
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:264
msgid ", on-line"
msgstr ", ¤Ä¤Ę¤¬¤Ă¤Ć¤¤¤Ţ¤ą"
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:265
msgid ", error"
msgstr ", Ą¨ĄéˇĽ"
-#: sys-utils/tunelp.c:279
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
-msgstr ""
+msgstr "LPGETIRQ Ą¨ĄéˇĽ"
-#: sys-utils/tunelp.c:285
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
msgstr "%s ¤Ď IRQ %d ¤ň»Č¤¤¤Ţ¤ą\n"
-#: sys-utils/tunelp.c:287
+#: sys-utils/tunelp.c:290
#, c-format
msgid "%s using polling\n"
msgstr "%s ¤ĎĄÝˇĽĄęĄóĄ°¤ňąÔ¤¤¤Ţ¤ą\n"
-#: text-utils/col.c:150
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
msgstr "col: ÉÔŔµ¤Ę -l ¤Î°úżô %s ¤Ç¤ąˇŁ\n"
-#: text-utils/col.c:511
+#: text-utils/col.c:516
msgid "usage: col [-bfx] [-l nline]\n"
msgstr "»Č¤¤Ęý: col [-bfx] [-l ąÔżô]\n"
-#: text-utils/col.c:517
+#: text-utils/col.c:522
msgid "col: write error.\n"
msgstr "col: ˝ń¤­ąţ¤ßĄ¨ĄéˇĽˇŁ\n"
-#: text-utils/col.c:524
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
msgstr "col: ·Ůąđ: %sĄĐĄĂĄŻĄ˘ĄĂĄ×¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "past first line"
msgstr "şÇ˝é¤ÎąÔ°ĘÁ°¤ň"
-#: text-utils/col.c:525
+#: text-utils/col.c:530
msgid "-- line already flushed"
msgstr "ąÔ¤Ď´ű¤Ë˝ń¤­ąţ¤Ţ¤ě¤ż¤Î¤Ç"
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "»Č¤¤Ęý: %s [ - ] [ -2 ] [ ĄŐĄˇĄ¤Ąë ... ]\n"
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
msgstr "ąÔ¤¬Äą¤ą¤®¤Ţ¤ą"
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "»Č¤¤Ęý: column [-tx] [-c Ą«ĄéĄŕżô] [ĄŐĄˇĄ¤Ąë ...]\n"
@@ -8193,12 +8389,12 @@ msgid ""
msgstr ""
"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-#: text-utils/more.c:328
+#: text-utils/more.c:329
#, c-format
msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
msgstr "»Č¤¤Ęý: %s [-dfln] [+ąÔČÖąć | +/ĄŃĄżˇĽĄó] ĚľÁ°1 ĚľÁ°2 ...\n"
-#: text-utils/more.c:503
+#: text-utils/more.c:504
#, c-format
msgid ""
"\n"
@@ -8210,7 +8406,7 @@ msgstr ""
"\n"
#. simple ELF detection
-#: text-utils/more.c:542
+#: text-utils/more.c:543
#, c-format
msgid ""
"\n"
@@ -8221,85 +8417,90 @@ msgstr ""
"******** %s: ĄĆĄ­ĄąĄČĄŐĄˇĄ¤Ąë¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó ********\n"
"\n"
-#: text-utils/more.c:646
+#: text-utils/more.c:647
msgid "[Use q or Q to quit]"
msgstr "[˝ŞÎ»¤ą¤ë¤Ë¤Ď q ¤« Q ¤ň˛ˇ¤·¤Ć˛Ľ¤µ¤¤]"
-#: text-utils/more.c:832
+#: text-utils/more.c:833
msgid "--More--"
msgstr "--Âł¤±¤ë--"
-#: text-utils/more.c:834
+#: text-utils/more.c:835
#, c-format
msgid "(Next file: %s)"
msgstr "(Ľˇ¤ÎĄŐĄˇĄ¤Ąë: %s)"
-#: text-utils/more.c:840
+#: text-utils/more.c:841
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[ĄąĄÚˇĽĄąĄ­ˇĽ¤ň˛ˇ¤ą¤ČÂł¤­ˇ˘'q' ¤Ç˝ŞÎ»ˇŁ]"
-#: text-utils/more.c:1138
+#: text-utils/more.c:1139
#, c-format
msgid "...back %d page"
msgstr "... %d ĄÚˇĽĄ¸Ěá¤ę¤Ţ¤ą"
-#: text-utils/more.c:1184
+#: text-utils/more.c:1185
#, c-format
msgid "...skipping %d line"
msgstr "...%d ąÔČô¤Đ¤·¤Ţ¤ą"
-#: text-utils/more.c:1225
+#: text-utils/more.c:1226
msgid ""
"\n"
"***Back***\n"
"\n"
msgstr ""
+"\n"
+"***Ěá¤ë***\n"
+"\n"
-#: text-utils/more.c:1263
+#: text-utils/more.c:1264
msgid "Can't open help file"
msgstr "ĄŘĄëĄ×ĄŐĄˇĄ¤Ąë¤ňł«¤±¤Ţ¤»¤ó"
-#: text-utils/more.c:1284 text-utils/more.c:1288
+#: text-utils/more.c:1285 text-utils/more.c:1289
msgid "[Press 'h' for instructions.]"
-msgstr ""
+msgstr "['h' Ą­ˇĽ¤ÇÁŕşîĘýˡ]"
-#: text-utils/more.c:1323
+#: text-utils/more.c:1324
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" %d ąÔ"
-#: text-utils/more.c:1325
+#: text-utils/more.c:1326
#, c-format
msgid "[Not a file] line %d"
msgstr "[ČóĄŐĄˇĄ¤Ąë] %d ąÔ"
-#: text-utils/more.c:1409
+#: text-utils/more.c:1410
msgid " Overflow\n"
-msgstr ""
+msgstr " Â礭¤ą¤®\n"
-#: text-utils/more.c:1456
+#: text-utils/more.c:1457
msgid "...skipping\n"
msgstr "...Čô¤Đ¤·¤Ć¤¤¤Ţ¤ą\n"
-#: text-utils/more.c:1486
+#: text-utils/more.c:1487
msgid "Regular expression botch"
-msgstr ""
+msgstr "Ŕµµ¬É˝¸˝¤¬ĄŢĄş¤¤"
-#: text-utils/more.c:1498
+#: text-utils/more.c:1499
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
+"\n"
+"ĄŃĄżˇĽĄó¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó\n"
-#: text-utils/more.c:1501
+#: text-utils/more.c:1502
msgid "Pattern not found"
-msgstr ""
+msgstr "ĄŃĄżˇĽĄó¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤ó"
-#: text-utils/more.c:1562
+#: text-utils/more.c:1563
msgid "can't fork\n"
msgstr "»ŇĄ×ĄíĄ»Ąą¤ňµŻĆ°¤Ç¤­¤Ţ¤»¤ó\n"
-#: text-utils/more.c:1601
+#: text-utils/more.c:1602
msgid ""
"\n"
"...Skipping "
@@ -8307,25 +8508,25 @@ msgstr ""
"\n"
"...Čô¤Đ¤·¤Ć¤¤¤Ţ¤ą "
-#: text-utils/more.c:1605
+#: text-utils/more.c:1606
msgid "...Skipping "
msgstr "...Čô¤Đ¤·¤Ć¤¤¤Ţ¤ą"
-#: text-utils/more.c:1606
+#: text-utils/more.c:1607
msgid "to file "
msgstr "Ľˇ¤ÎĄŐĄˇĄ¤Ąë "
-#: text-utils/more.c:1606
+#: text-utils/more.c:1607
msgid "back to file "
msgstr "Á°¤ÎĄŐĄˇĄ¤Ąë "
-#: text-utils/more.c:1845
+#: text-utils/more.c:1846
msgid "Line too long"
msgstr "ąÔ¤¬Äą¤ą¤®¤Ţ¤ą"
-#: text-utils/more.c:1889
+#: text-utils/more.c:1890
msgid "No previous command to substitute for"
-msgstr ""
+msgstr "ÂçÂΤΤż¤á¤Î°ĘÁ°¤ÎĄłĄŢĄóĄÉ¤¬¤˘¤ę¤Ţ¤»¤ó"
#: text-utils/odsyntax.c:133
msgid "od: od(1) has been deprecated for hexdump(1).\n"
@@ -8372,37 +8573,37 @@ msgstr "hexdump: ÉÔŔµ¤Ę˝ńĽ° {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: ÉÔŔµ¤ĘĘŃ´ąĄ­ĄăĄéĄŻĄż %%%sˇŁ\n"
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
msgstr "ĄĐĄĂĄŐĄˇ¶ő´Ö¤ňłÎĘݤǤ­¤Ţ¤»¤ó\n"
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
msgstr "»Č¤¤Ęý: rev [ ĄŐĄˇĄ¤Ąë ...]\n"
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
msgstr "»Č¤¤Ęý: %s [ -i ] [ -tĂĽËö ] ĄŐĄˇĄ¤Ąë...\n"
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
msgstr "terminfo ¤ÎĆɤ߹ţ¤ßĂć¤ËĄČĄéĄÖĄëČŻŔ¸"
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
msgstr "̤ĂΤΥ¨ĄąĄ±ˇĽĄ×Ą·ˇĽĄ±ĄóĄą¤¬ĆţÎϤµ¤ě¤Ţ¤·¤ż: %o, %o\n"
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
msgstr "ĄĐĄĂĄŐĄˇ¤ÎłÎĘݤ¬¤Ç¤­¤Ţ¤»¤óˇŁ\n"
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
msgstr "ĆţÎĎąÔ¤¬Äą¤ą¤®¤Ţ¤ąˇŁ\n"
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
msgstr "ĄĐĄĂĄŐĄˇ¤ňłČÂ礹¤ë¤Č¤­¤ËĄáĄâĄę¤¬Â­¤ę¤Ę¤Ż¤Ę¤ę¤Ţ¤·¤żˇŁ\n"
diff --git a/po/nl.po b/po/nl.po
index a22da6087..0c53ffd6e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,13 +6,506 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.9n\n"
-"POT-Creation-Date: 1999-03-20 12:27-0300\n"
+"POT-Creation-Date: 1999-09-25 13:07+0200\n"
"PO-Revision-Date: 1999-02-25 20:46+0100\n"
"Last-Translator: Andries Brouwer <aeb@cwi.nl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
+#: clock/cmos.c:146
+msgid "booted from MILO\n"
+msgstr ""
+
+#: clock/cmos.c:154
+msgid "Ruffian BCD clock\n"
+msgstr ""
+
+#: clock/cmos.c:170
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr ""
+
+#: clock/cmos.c:180
+msgid "funky TOY!\n"
+msgstr ""
+
+#: clock/cmos.c:234
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr ""
+
+#: clock/cmos.c:558
+#, fuzzy, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Kan schijf niet openen"
+
+#: clock/cmos.c:565
+msgid "I failed to get permission because I didnt try.\n"
+msgstr ""
+
+#: clock/cmos.c:568
+#, c-format
+msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
+msgstr ""
+
+#: clock/cmos.c:571
+msgid "Probably you need root privileges.\n"
+msgstr ""
+
+#: clock/hwclock.c:253
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:255
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr ""
+
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop. The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:278
+msgid "Waiting for clock tick...\n"
+msgstr ""
+
+#: clock/hwclock.c:282
+msgid "...got clock tick\n"
+msgstr ""
+
+#: clock/hwclock.c:334
+#, c-format
+msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+
+#: clock/hwclock.c:343
+#, c-format
+msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:369
+#, c-format
+msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgstr ""
+
+#: clock/hwclock.c:395
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:401
+msgid "Clock not changed - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:449
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+
+#: clock/hwclock.c:473
+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 ""
+
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end. We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:485
+#, c-format
+msgid "%s %.6f seconds\n"
+msgstr ""
+
+#: clock/hwclock.c:519
+#, fuzzy
+msgid "No --date option specified.\n"
+msgstr "Maak geen partitie"
+
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:524
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+
+#: clock/hwclock.c:530
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr ""
+
+#: clock/hwclock.c:534
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
+
+#: clock/hwclock.c:540
+#, c-format
+msgid "response from date command = %s\n"
+msgstr ""
+
+#: clock/hwclock.c:542
+#, 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 ""
+
+#: clock/hwclock.c:551
+#, c-format
+msgid ""
+"The date command issued by %s returnedsomething other than an integer where "
+"the convertedtime value was expected.\n"
+"The command was:\n"
+" %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+
+#: clock/hwclock.c:561
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr ""
+
+#: clock/hwclock.c:596
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+
+#: clock/hwclock.c:612
+msgid "Calling settimeofday:\n"
+msgstr ""
+
+#: clock/hwclock.c:613
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr ""
+
+#: clock/hwclock.c:615
+#, c-format
+msgid "\ttz.tz_minuteswest = %ld\n"
+msgstr ""
+
+#: clock/hwclock.c:618
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+
+#: clock/hwclock.c:630
+msgid "Must be superuser to set system clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:632
+msgid "settimeofday() failed"
+msgstr ""
+
+#: clock/hwclock.c:665
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+
+#: clock/hwclock.c:669
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+
+#: clock/hwclock.c:678
+#, c-format
+msgid ""
+"Clock drifted %d 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 ""
+
+#: clock/hwclock.c:729
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr ""
+
+#: clock/hwclock.c:731
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
+
+#: clock/hwclock.c:759
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr ""
+
+#: clock/hwclock.c:760
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+
+#: clock/hwclock.c:784
+msgid "Drift adjustment parameters not updated.\n"
+msgstr ""
+
+#: clock/hwclock.c:825
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+
+#: clock/hwclock.c:849
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:875
+#, c-format
+msgid "Using %s.\n"
+msgstr ""
+
+#: clock/hwclock.c:877
+msgid "No usable clock interface found.\n"
+msgstr ""
+
+#: clock/hwclock.c:965
+#, fuzzy
+msgid "Unable to set system clock.\n"
+msgstr "Kan het bestand '%s' niet positioneren\n"
+
+#: clock/hwclock.c:994
+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 ""
+
+#: clock/hwclock.c:1003
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1005
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr ""
+
+#: clock/hwclock.c:1008
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+
+#: clock/hwclock.c:1011
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:1014
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1094
+#, c-format
+msgid "%s takes no non-option arguments. You supplied %d.\n"
+msgstr ""
+
+#: clock/hwclock.c:1102
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+
+#: clock/hwclock.c:1115
+msgid "No usable set-to time. Cannot set clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1130
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1134
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1150
+msgid ""
+"Cannot access the Hardware Clock via any known method. Use --debug option "
+"to see the details of our search for an access method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1164
+#, c-format
+msgid "%s: %s, errno=%d: %s.\n"
+msgstr ""
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr ""
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr ""
+
+#: clock/kd.c:65 clock/rtc.c:144
+msgid "Timed out waiting for time change.\n"
+msgstr ""
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr ""
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from /dev/tty1"
+msgstr ""
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr ""
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr ""
+
+#: clock/kd.c:161
+#, fuzzy
+msgid "Can't open /dev/tty1"
+msgstr "Kan schijf niet openen"
+
+#: clock/rtc.c:98
+msgid "ioctl() to /dev/rtc to read the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:129
+msgid "Waiting in loop for time from /dev/rtc to change\n"
+msgstr ""
+
+#: clock/rtc.c:165 clock/rtc.c:222
+msgid "open() of /dev/rtc failed"
+msgstr ""
+
+#. This rtc device doesn't have interrupt functions. This is typical
+#. on an Alpha, where the Hardware Clock interrupts are used by the
+#. kernel for the system clock, so aren't at the user's disposal.
+#.
+#: clock/rtc.c:182
+msgid "/dev/rtc does not have interrupt functions. "
+msgstr ""
+
+#: clock/rtc.c:191
+msgid "read() to /dev/rtc to wait for clock tick failed"
+msgstr ""
+
+#: clock/rtc.c:199
+msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+msgstr ""
+
+#: clock/rtc.c:202
+msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+msgstr ""
+
+#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
+#, fuzzy
+msgid "Unable to open /dev/rtc"
+msgstr "Kan het bestand '%s' niet openen\n"
+
+#: clock/rtc.c:268
+msgid "ioctl() to /dev/rtc to set the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:272
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr ""
+
+#: clock/rtc.c:302
+msgid "Open of /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:320 clock/rtc.c:365
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file /dev/rtc. This file does not "
+"exist on this system.\n"
+msgstr ""
+
+#: clock/rtc.c:331
+msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:337
+#, c-format
+msgid "we have read epoch %ld from /dev/rtc 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.
+#: clock/rtc.c:357
+#, c-format
+msgid "The epoch value may not be less than 1900. You requested %ld\n"
+msgstr ""
+
+#: clock/rtc.c:374
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgstr ""
+
+#: clock/rtc.c:379
+msgid ""
+"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
+"ioctl.\n"
+msgstr ""
+
+#: clock/rtc.c:382
+msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+msgstr ""
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr ""
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr ""
+
+#: clock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr ""
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr ""
+
#: disk-utils/fdformat.c:33
msgid "Formatting ... "
msgstr "Aan het formatteren ... "
@@ -70,40 +563,45 @@ msgstr "Dubbel"
msgid "Single"
msgstr "Enkel"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:198
+#, fuzzy, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "aanroep: %s [ -n ] apparaat\n"
+
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr "%s is gemount.\t "
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr "Wilt u echt doorgaan"
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr "controle afgebroken.\n"
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
msgstr "Zone nr < EERSTEZONE in het bestand `"
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
msgstr "Zone nr >= ZONES in het bestand `"
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
msgstr "Blok verwijderen"
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
msgid "Read error: unable to seek to block in file '"
msgstr "Leesfout: ik kan niet positioneren in bestand '"
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
msgid "Read error: bad block in file '"
msgstr "Leesfout: slecht blok in bestand '"
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
@@ -111,188 +609,307 @@ msgstr ""
"Interne fout: probeer een slecht blok te beschrijven\n"
"Schrijfopdracht genegeerd\n"
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
msgstr "Schrijffout: slecht blok in bestand '"
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:525
+#, fuzzy
+msgid "Unable to write inode map"
+msgstr "Kan het bestand '%s' niet schrijven\n"
+
+#: disk-utils/fsck.minix.c:527
+#, fuzzy
+msgid "Unable to write zone map"
+msgstr "Kan het bestand '%s' niet schrijven\n"
+
+#: disk-utils/fsck.minix.c:529
+#, fuzzy
+msgid "Unable to write inodes"
+msgstr "Kan het bestand '%s' niet schrijven\n"
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:560
+#, fuzzy
+msgid "unable to read super block"
+msgstr "Kan het bestand '%s' niet lezen\n"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:593
+#, fuzzy
+msgid "Unable to allocate buffer for inode map"
+msgstr "Kan niet meer geheugen krijgen\n"
+
+#: disk-utils/fsck.minix.c:601
+#, fuzzy
+msgid "Unable to allocate buffer for inodes"
+msgstr "Kan niet meer geheugen krijgen\n"
+
+#: disk-utils/fsck.minix.c:604
+#, fuzzy
+msgid "Unable to allocate buffer for inode count"
+msgstr "Kan niet meer geheugen krijgen\n"
+
#: disk-utils/fsck.minix.c:607
+#, fuzzy
+msgid "Unable to allocate buffer for zone count"
+msgstr "Kan niet meer geheugen krijgen\n"
+
+#: disk-utils/fsck.minix.c:609
+#, fuzzy
+msgid "Unable to read inode map"
+msgstr "Kan het bestand '%s' niet lezen\n"
+
+#: disk-utils/fsck.minix.c:611
+#, fuzzy
+msgid "Unable to read zone map"
+msgstr "Kan het bestand '%s' niet lezen\n"
+
+#: disk-utils/fsck.minix.c:613
+#, fuzzy
+msgid "Unable to read inodes"
+msgstr "Kan het bestand '%s' niet lezen\n"
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr "Waarschuwing: Eerstezone != Norm_eerstezone\n"
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
#, c-format
msgid "%ld inodes\n"
msgstr "%ld inodes\n"
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
#, c-format
msgid "%ld blocks\n"
msgstr "%ld blokken\n"
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
#, c-format
msgid "Zonesize=%d\n"
msgstr "Zonegrootte=%d\n"
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr ""
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
"\n"
msgstr ""
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
msgstr ""
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
msgstr ""
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr ""
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
msgstr ""
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
msgstr ""
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
msgstr ""
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
msgstr ""
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+#, fuzzy
+msgid "internal error"
+msgstr "Interne fout"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
msgstr ""
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
msgstr ""
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
msgstr ""
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
#, c-format
msgid "Inode %d not used, marked used in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
msgstr ""
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
msgstr ""
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
#, c-format
msgid "Zone %d: marked in use, no file uses it."
msgstr ""
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
msgstr ""
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
msgstr ""
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
msgid "Set"
msgstr "Zet op 1"
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr "foute inode grootte"
+
+#: disk-utils/fsck.minix.c:1257
+#, fuzzy
+msgid "bad v2 inode size"
+msgstr "foute inode grootte"
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1287
+#, fuzzy, c-format
+msgid "unable to open '%s'"
+msgstr "kan het bestand '%s' niet openen"
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -306,7 +923,7 @@ msgid ""
"%6d files\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
@@ -317,20 +934,22 @@ msgstr ""
msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
msgstr ""
-#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:324 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:221 mount/sundries.c:192
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
msgstr "%s: Geheugen is vol!\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
+#, fuzzy, c-format
+msgid "mkfs version %s (%s)\n"
msgstr "mkfs versie "
#: disk-utils/mkfs.minix.c:186
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Aanroep: %s [-c | -l bestand] [-nXX] [-iXX] /dev/naam [blokkenaantal]\n"
+msgstr ""
+"Aanroep: %s [-c | -l bestand] [-nXX] [-iXX] /dev/naam [blokkenaantal]\n"
#: disk-utils/mkfs.minix.c:210
#, c-format
@@ -349,10 +968,6 @@ msgstr ""
msgid "seek failed in write_tables"
msgstr ""
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
msgstr ""
@@ -365,10 +980,6 @@ msgstr ""
msgid "unable to write inodes"
msgstr ""
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:292
msgid "write failed in write_block"
msgstr ""
@@ -406,7 +1017,7 @@ msgstr ""
msgid "Weird values in do_check: probably bugs\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:585
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
msgid "seek failed in check_blocks"
msgstr ""
@@ -427,10 +1038,6 @@ msgstr "1 slecht blok\n"
msgid "can't open file of bad blocks"
msgstr "kan het slechte-blokken-bestand niet openen"
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
-msgid "bad inode size"
-msgstr "foute inode grootte"
-
#: disk-utils/mkfs.minix.c:669
#, c-format
msgid "%s: not compiled with minix v2 support\n"
@@ -455,42 +1062,72 @@ msgstr ""
msgid "will not try to make filesystem on '%s'"
msgstr ""
-#: disk-utils/mkswap.c:99
+#: disk-utils/mkswap.c:101
#, c-format
msgid "Assuming pages of size %d\n"
msgstr ""
-#: disk-utils/mkswap.c:191
-#, c-format
-msgid "%d bad page%s\n"
+#: disk-utils/mkswap.c:185
+#, fuzzy, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
msgstr ""
+"Aanroep: %s [-c | -l bestand] [-nXX] [-iXX] /dev/naam [blokkenaantal]\n"
-#: disk-utils/mkswap.c:191 login-utils/shutdown.c:433
-#: login-utils/shutdown.c:436
-msgid "s"
+#: disk-utils/mkswap.c:208
+#, fuzzy
+msgid "too many bad pages"
+msgstr "Slechte primaire partitie"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1153
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
msgstr ""
-#: disk-utils/mkswap.c:294
+#: disk-utils/mkswap.c:239
+#, fuzzy
+msgid "one bad page\n"
+msgstr "1 slecht blok\n"
+
+#: disk-utils/mkswap.c:241
+#, fuzzy, c-format
+msgid "%d bad pages\n"
+msgstr "%ld slechte blokken\n"
+
+#: disk-utils/mkswap.c:345
#, c-format
msgid "%s: error: Nowhere to set up swap on?\n"
msgstr ""
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:354
+#, c-format
+msgid "%s: error: size %ld is larger than device size %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr ""
-#: disk-utils/mkswap.c:319
+#: disk-utils/mkswap.c:378
#, c-format
msgid "%s: error: swap area needs to be at least %ldkB\n"
msgstr ""
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:397
#, c-format
msgid "%s: warning: truncating swap area to %ldkB\n"
msgstr ""
-#: disk-utils/mkswap.c:353
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -499,11 +1136,29 @@ msgid ""
"the -f option to force it.\n"
msgstr ""
-#: disk-utils/mkswap.c:378
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr ""
+#: disk-utils/mkswap.c:455
+#, fuzzy
+msgid "unable to rewind swap-device"
+msgstr "kan het bestand '%s' niet openen"
+
+#: disk-utils/mkswap.c:458
+#, fuzzy
+msgid "unable to write signature page"
+msgstr "Kan het bestand '%s' niet schrijven\n"
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr ""
+
#: disk-utils/setfdprm.c:30
#, c-format
msgid "Invalid number: %s\n"
@@ -540,46 +1195,46 @@ msgstr ""
msgid " %s [ -c | -y | -n ] dev\n"
msgstr ""
-#: fdisk/cfdisk.c:349 fdisk/cfdisk.c:1764
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr "Onbruikbaar"
-#: fdisk/cfdisk.c:351 fdisk/cfdisk.c:1766
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
msgid "Free Space"
msgstr "Vrij"
-#: fdisk/cfdisk.c:354
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr "Linux ext2"
#. also Solaris
-#: fdisk/cfdisk.c:356 fdisk/i386_sys_types.c:53
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr "Linux"
-#: fdisk/cfdisk.c:359
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr "OS/2 HPFS"
-#: fdisk/cfdisk.c:361
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr "OS/2 IFS"
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr "NTFS"
-#: fdisk/cfdisk.c:376
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr "De schijfinhoud is gewijzigd.\n"
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:423
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
"Herstart het systeem om er zeker van te zijn dat de partitietabel correct "
"aangepast is\n"
-#: fdisk/cfdisk.c:380
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -590,708 +1245,754 @@ msgstr ""
"WAARSCHUWING: Mocht U DOS 6.x partities hebben aangemaakt of gewijzigd,\n"
"lees dan de cfdisk man pagina - vaak is nog een dd commando nodig.\n"
-#: fdisk/cfdisk.c:475
+#: fdisk/cfdisk.c:521
msgid "FATAL ERROR"
msgstr "FATALE FOUT"
-#: fdisk/cfdisk.c:484
-msgid "Press any key to exit fdisk"
+#: fdisk/cfdisk.c:530
+#, fuzzy
+msgid "Press any key to exit cfdisk"
msgstr "Druk op een toets om fdisk te verlaten"
-#: fdisk/cfdisk.c:520 fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
msgid "Cannot seek on disk drive"
msgstr "Positioneeropdracht faalde"
-#: fdisk/cfdisk.c:522
+#: fdisk/cfdisk.c:568
msgid "Cannot read disk drive"
msgstr "Leesopdracht faalde"
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:576
msgid "Cannot write disk drive"
msgstr "Schrijfopdracht faalde"
-#: fdisk/cfdisk.c:767
+#: fdisk/cfdisk.c:815
msgid "Too many partitions"
msgstr "Te veel partities"
-#: fdisk/cfdisk.c:772
+#: fdisk/cfdisk.c:820
msgid "Partition begins before sector 0"
msgstr "Partitie begint voor sector 0"
-#: fdisk/cfdisk.c:777
+#: fdisk/cfdisk.c:825
msgid "Partition ends before sector 0"
msgstr "Partitie eindigt voor sector 0"
-#: fdisk/cfdisk.c:782
+#: fdisk/cfdisk.c:830
msgid "Partition begins after end-of-disk"
msgstr "Partitie begint voorbij het einde van de schijf"
-#: fdisk/cfdisk.c:787
+#: fdisk/cfdisk.c:835
msgid "Partition ends after end-of-disk"
msgstr "Partitie eindigt voorbij het einde van de schijf"
-#: fdisk/cfdisk.c:835
+#: fdisk/cfdisk.c:859
+msgid "logical partitions not in disk order"
+msgstr ""
+
+#: fdisk/cfdisk.c:862
+#, fuzzy
+msgid "logical partitions overlap"
+msgstr "Slechte logische partitie"
+
+#: fdisk/cfdisk.c:864
+#, fuzzy
+msgid "enlarged logical partitions overlap"
+msgstr "Slechte logische partitie"
+
+#: fdisk/cfdisk.c:894
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr "!!!! Interne cfdisk fout - logische partitie niet in uitgebreide??"
-#: fdisk/cfdisk.c:846 fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
"Ik kan hier geen logische partitie maken -- dan zouden er twee uitgebreide "
"partities komen"
-#: fdisk/cfdisk.c:1002
+#: fdisk/cfdisk.c:1067
msgid "Menu item too long. Menu may look odd."
msgstr "Menuelement te lang. Misschien ziet het menu er vreemd uit."
-#: fdisk/cfdisk.c:1051
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr "Menu zonder aangegeven richting. Laat ik horizontaal nemen."
-#: fdisk/cfdisk.c:1166
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr "Niet herkende toets"
-#: fdisk/cfdisk.c:1189
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Sla een toets aan om verder te gaan"
-#: fdisk/cfdisk.c:1236 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2261
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "Primaire"
-#: fdisk/cfdisk.c:1236
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "Maak een nieuwe primaire partitie"
-#: fdisk/cfdisk.c:1237 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2260
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "Logische"
-#: fdisk/cfdisk.c:1237
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "Maak een nieuwe logische partitie"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291 fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Breek af"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "Maak geen partitie"
-#: fdisk/cfdisk.c:1254
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "Interne fout"
-#: fdisk/cfdisk.c:1257
+#: fdisk/cfdisk.c:1344
msgid "Size (in MB): "
msgstr "Grootte (in MB)"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "Begin"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "Zet de partitie aan het begin van de vrije ruimte"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "Einde"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr "Zet de partitie aan het eind van de vrije ruimte"
-#: fdisk/cfdisk.c:1308
+#: fdisk/cfdisk.c:1397
msgid "No room to create the extended partition"
msgstr "Geen ruimte voor een uitgebreide partitie"
-#: fdisk/cfdisk.c:1354
+#: fdisk/cfdisk.c:1436
+#, fuzzy
+msgid "Bad signature on partition table"
+msgstr "Geef alleen de partitietabel"
+
+#: fdisk/cfdisk.c:1474
+msgid "You specified more cylinders than fit on disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:1504
msgid "Cannot open disk drive"
msgstr "Kan schijf niet openen"
-#: fdisk/cfdisk.c:1356 fdisk/cfdisk.c:1546
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
msgid "Opened disk read-only - you have no permission to write"
msgstr "Kan de schijf alleen lezen - heb geen permissie om te schrijven"
-#: fdisk/cfdisk.c:1386
-msgid "Cannot read disk drive geometry"
-msgstr "Opvragen van de schijfgeometrie faalde"
+#: fdisk/cfdisk.c:1527
+#, fuzzy
+msgid "Cannot get disk size"
+msgstr "Leesopdracht faalde"
-#: fdisk/cfdisk.c:1408
+#. avoid snprintf - it does not exist on ancient systems
+#: fdisk/cfdisk.c:1553
msgid "Bad primary partition"
msgstr "Slechte primaire partitie"
-#: fdisk/cfdisk.c:1438
+#. avoid snprintf
+#: fdisk/cfdisk.c:1584
msgid "Bad logical partition"
msgstr "Slechte logische partitie"
-#: fdisk/cfdisk.c:1558
+#: fdisk/cfdisk.c:1699
msgid "Warning!! This may destroy data on your disk!"
msgstr "Waarschuwing!! Dit kan gegevens op uw schijf vernietigen!"
-#: fdisk/cfdisk.c:1562
+#: fdisk/cfdisk.c:1703
msgid "Are you sure you want write the partition table to disk? (yes or no): "
msgstr ""
"Weet U zeker dat de partitietabel weggeschreven moet worden? (ja of nee): "
-#: fdisk/cfdisk.c:1571
+#: fdisk/cfdisk.c:1709
+msgid "no"
+msgstr ""
+
+#: fdisk/cfdisk.c:1710
msgid "Did not write partition table to disk"
msgstr "Heb de partitietabel niet naar schijf geschreven"
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1712
+msgid "yes"
+msgstr ""
+
+#: fdisk/cfdisk.c:1715
msgid "Please enter `yes' or `no'"
msgstr "Antwoord `ja' of `nee'"
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1719
msgid "Writing partition table to disk..."
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1612
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
msgid "Wrote partition table to disk"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/cfdisk.c:1610
+#: fdisk/cfdisk.c:1746
msgid ""
"Wrote partition table, but re-read table failed. Reboot to update table."
msgstr "Partitietabel is weggeschreven, maar het teruglezen faalde. Reboot."
-#: fdisk/cfdisk.c:1620
+#: fdisk/cfdisk.c:1756
msgid ""
"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
msgstr ""
"Er is niet precies 1 startbare primaire partitie. DOS MBR kan dit niet "
"booten."
-#: fdisk/cfdisk.c:1678 fdisk/cfdisk.c:1796 fdisk/cfdisk.c:1888
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
msgstr "Geef een bestandsnaam of Enter om uitvoer naar het scherm te krijgen"
-#: fdisk/cfdisk.c:1686 fdisk/cfdisk.c:1804 fdisk/cfdisk.c:1896
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
#, c-format
msgid "Cannot open file '%s'"
msgstr "Kan het bestand '%s' niet openen"
-#: fdisk/cfdisk.c:1697
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Schijf: %s\n"
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr ""
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr ""
-#: fdisk/cfdisk.c:1726
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr " Geen "
-#: fdisk/cfdisk.c:1728
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr ""
-#: fdisk/cfdisk.c:1730
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr " Primaire"
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr " Logische"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1770 fdisk/fdisk.c:1045 fdisk/fdisk.c:1194
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:644 fdisk/sfdisk.c:551
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr "Onbekend"
-#: fdisk/cfdisk.c:1776
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr ""
-#: fdisk/cfdisk.c:1778 fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr "Onbekend (%02X)"
-#: fdisk/cfdisk.c:1780
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr "Geen (%02X)"
-#: fdisk/cfdisk.c:1815 fdisk/cfdisk.c:1907
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr "Partitietabel voor %s\n"
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr " Eerste Laatste\n"
-#: fdisk/cfdisk.c:1818
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
" # Type Sector Sector Offset Lengte Filesysteem type (ID) "
"Vlaggen\n"
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
msgstr ""
-#: fdisk/cfdisk.c:1909
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr " ---Start--- ---End--- Start Aantal\n"
-#: fdisk/cfdisk.c:1910
+#: fdisk/cfdisk.c:2038
msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
msgstr " # Vlaggen Kop Sect Cyl ID Kop Sect Cyl Sector Sectoren\n"
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
msgstr ""
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2072
msgid "Raw"
msgstr "Ruw"
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2072
msgid "Print the table using raw data format"
msgstr "Geef de tabel in ruw formaat"
-#: fdisk/cfdisk.c:1945 fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr "Sectoren"
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr "Geef de tabel geordend naar sectoren"
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr "Tabel"
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr "Geef geen tabel"
-#: fdisk/cfdisk.c:1976
-msgid "Help Screen for cfdisk "
+#: fdisk/cfdisk.c:2103
+#, fuzzy
+msgid "Help Screen for cfdisk"
msgstr "Hulpscherm voor cfdisk"
-#: fdisk/cfdisk.c:1978
+#: fdisk/cfdisk.c:2105
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr "Dit is cfdisk, een schijfpartitieprogramma dat U in staat stelt"
-#: fdisk/cfdisk.c:1979
+#: fdisk/cfdisk.c:2106
msgid "allows you to create, delete and modify partitions on your hard"
msgstr "partities te maken, te verwijderen en te veranderen op uw harde"
-#: fdisk/cfdisk.c:1980
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr "schijf"
-#: fdisk/cfdisk.c:1982
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
+#: fdisk/cfdisk.c:2109
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
msgstr ""
-#: fdisk/cfdisk.c:1984
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr "Commando Betekenis"
-#: fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
msgstr ""
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
msgstr " b Maak de huidige partitie (wel/niet) startbaar"
-#: fdisk/cfdisk.c:1987
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
msgstr " d Verwijder de huidige partitie"
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr " g Verander het aantal cylinders, koppen, sectoren/spoor"
-#: fdisk/cfdisk.c:1989
+#: fdisk/cfdisk.c:2116
msgid " WARNING: This option should only be used by people who"
msgstr " WAARSCHUWING: Dit is alleen voor experts."
-#: fdisk/cfdisk.c:1990
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr ""
-#: fdisk/cfdisk.c:1991
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:1992
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:1993
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr ""
-#: fdisk/cfdisk.c:1994
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr ""
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
msgstr ""
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:2123
msgid " p Print partition table to the screen or to a file"
msgstr ""
-#: fdisk/cfdisk.c:1997
+#: fdisk/cfdisk.c:2124
msgid " There are several different formats for the partition"
msgstr ""
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr ""
-#: fdisk/cfdisk.c:1999
+#: fdisk/cfdisk.c:2126
msgid " r - Raw data (exactly what would be written to disk)"
msgstr ""
-#: fdisk/cfdisk.c:2000
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr ""
-#: fdisk/cfdisk.c:2001
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr ""
-#: fdisk/cfdisk.c:2002
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr ""
-#: fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
msgstr ""
-#: fdisk/cfdisk.c:2004
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
msgstr ""
-#: fdisk/cfdisk.c:2005
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2132
+msgid " Rotates through MB, sectors and cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2006
+#: fdisk/cfdisk.c:2133
msgid " W Write partition table to disk (must enter upper case W)"
msgstr ""
-#: fdisk/cfdisk.c:2007
+#: fdisk/cfdisk.c:2134
msgid " Since this might destroy data on the disk, you must"
msgstr ""
-#: fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:2135
msgid " either confirm or deny the write by entering `yes' or"
msgstr ""
-#: fdisk/cfdisk.c:2009
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr ""
-#: fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
msgstr ""
-#: fdisk/cfdisk.c:2011
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
msgstr ""
-#: fdisk/cfdisk.c:2012
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr ""
-#: fdisk/cfdisk.c:2013
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2142
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr ""
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr ""
-#: fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2350 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2048
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
msgstr ""
-#: fdisk/cfdisk.c:2049 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr ""
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
msgstr ""
-#: fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
msgstr ""
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr ""
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr ""
-#: fdisk/cfdisk.c:2064
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr ""
-#: fdisk/cfdisk.c:2071 fdisk/cfdisk.c:2614
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
msgid "Illegal cylinders value"
msgstr ""
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr ""
-#: fdisk/cfdisk.c:2084 fdisk/cfdisk.c:2621
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
msgid "Illegal heads value"
msgstr ""
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr ""
-#: fdisk/cfdisk.c:2097 fdisk/cfdisk.c:2628
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
msgid "Illegal sectors value"
msgstr ""
-#: fdisk/cfdisk.c:2196
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr ""
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2348
msgid "Cannot change FS Type to empty"
msgstr ""
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2350
msgid "Cannot change FS Type to extended"
msgstr ""
-#: fdisk/cfdisk.c:2238 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr ""
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
msgstr ""
-#: fdisk/cfdisk.c:2243 fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
msgstr ""
-#: fdisk/cfdisk.c:2251 fdisk/cfdisk.c:2254
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
msgstr ""
-#: fdisk/cfdisk.c:2262
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr ""
-#: fdisk/cfdisk.c:2336
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "Schijf: %s"
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr ""
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "%d koppen %d sectoren/spoor %d cylinders"
-#: fdisk/cfdisk.c:2342
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "Naam"
-#: fdisk/cfdisk.c:2343
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "Vlaggen"
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "type"
-#: fdisk/cfdisk.c:2345
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "FS type"
-#: fdisk/cfdisk.c:2346
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr ""
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr " sectoren"
-#: fdisk/cfdisk.c:2352
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "Grootte (MB)"
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2494
+#, fuzzy
+msgid "Size (GB)"
+msgstr "Grootte (MB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "Startbaar"
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr ""
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
msgstr ""
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr ""
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
msgstr ""
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr ""
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
msgstr ""
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr ""
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2553
msgid "Maximize disk usage of the current partition (experts only)"
msgstr ""
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr ""
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr ""
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr ""
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2555
msgid "Print partition table to the screen or to a file"
msgstr ""
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr ""
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr ""
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr ""
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2557
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr ""
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr ""
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2558
msgid "Change units of the partition size display (MB, sect, cyl)"
msgstr ""
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr ""
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2559
msgid "Write partition table to disk (this might destroy data)"
msgstr ""
-#: fdisk/cfdisk.c:2463
+#: fdisk/cfdisk.c:2605
msgid "Cannot make this partition bootable"
msgstr ""
-#: fdisk/cfdisk.c:2473
+#: fdisk/cfdisk.c:2615
msgid "Cannot delete an empty partition"
msgstr ""
-#: fdisk/cfdisk.c:2493 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
msgid "Cannot maximize this partition"
msgstr ""
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2645
msgid "This partition is unusable"
msgstr ""
-#: fdisk/cfdisk.c:2505
+#: fdisk/cfdisk.c:2647
msgid "This partition is already in use"
msgstr ""
-#: fdisk/cfdisk.c:2522
+#: fdisk/cfdisk.c:2664
msgid "Cannot change the type of an empty partition"
msgstr ""
-#: fdisk/cfdisk.c:2547 fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
msgid "No more partitions"
msgstr ""
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2704
msgid "Illegal command"
msgstr ""
-#: fdisk/cfdisk.c:2570
+#: fdisk/cfdisk.c:2714
msgid "Copyright (C) 1994-1999 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:2577
+#: fdisk/cfdisk.c:2721
#, c-format
msgid ""
"\n"
@@ -1311,268 +2012,278 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:247
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"
+"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 drives) use 2048-byte sectors\n"
msgstr ""
-#: fdisk/fdisk.c:245
-msgid "A disk block device is needed.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:259
msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
+"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 ""
-#: fdisk/fdisk.c:252
+#: fdisk/fdisk.c:267
+#, c-format
msgid "Unable to open %s\n"
msgstr "Kan het bestand '%s' niet openen\n"
-#: fdisk/fdisk.c:255
+#: fdisk/fdisk.c:270
+#, c-format
msgid "Unable to read %s\n"
msgstr "Kan het bestand '%s' niet lezen\n"
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:273
+#, c-format
msgid "Unable to seek on %s\n"
msgstr "Kan het bestand '%s' niet positioneren\n"
-#: fdisk/fdisk.c:261
+#: fdisk/fdisk.c:276
+#, c-format
msgid "Unable to write %s\n"
msgstr "Kan het bestand '%s' niet schrijven\n"
-#: fdisk/fdisk.c:264
+#: fdisk/fdisk.c:279
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:283
msgid "Unable to allocate any more memory\n"
msgstr "Kan niet meer geheugen krijgen\n"
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:285
msgid "Fatal error\n"
msgstr "Fatale fout\n"
-#: fdisk/fdisk.c:277 fdisk/fdisk.c:296 fdisk/fdisk.c:314 fdisk/fdisk.c:321
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
#, fuzzy
msgid "Command action"
msgstr "Commando Betekenis"
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:297
msgid " a toggle a read only flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:279 fdisk/fdisk.c:323
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
msgid " b edit bsd disklabel"
msgstr ""
-#: fdisk/fdisk.c:280
+#: fdisk/fdisk.c:299
msgid " c toggle the mountable flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:281 fdisk/fdisk.c:300 fdisk/fdisk.c:325
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " d delete a partition"
msgstr " d Verwijder partitie"
-#: fdisk/fdisk.c:282 fdisk/fdisk.c:301 fdisk/fdisk.c:326
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
msgid " l list known partition types"
msgstr " l geef alle bekende partitietypen"
#. sun
-#: fdisk/fdisk.c:283 fdisk/fdisk.c:302 fdisk/fdisk.c:315 fdisk/fdisk.c:327
-#: fdisk/fdisk.c:352 fdisk/fdisk.c:369 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
msgid " m print this menu"
msgstr ""
-#: fdisk/fdisk.c:284 fdisk/fdisk.c:303 fdisk/fdisk.c:328
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
msgid " n add a new partition"
msgstr " n maak een nieuwe partitie"
-#: fdisk/fdisk.c:285 fdisk/fdisk.c:304 fdisk/fdisk.c:316 fdisk/fdisk.c:329
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
#, fuzzy
msgid " o create a new empty DOS partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:286 fdisk/fdisk.c:305 fdisk/fdisk.c:330 fdisk/fdisk.c:353
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
#, fuzzy
msgid " p print the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:287 fdisk/fdisk.c:306 fdisk/fdisk.c:317 fdisk/fdisk.c:331
-#: fdisk/fdisk.c:354 fdisk/fdisk.c:371 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
msgid " q quit without saving changes"
msgstr ""
-#: fdisk/fdisk.c:288 fdisk/fdisk.c:307 fdisk/fdisk.c:318 fdisk/fdisk.c:332
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
msgid " s create a new empty Sun disklabel"
msgstr ""
#. sun
-#: fdisk/fdisk.c:289 fdisk/fdisk.c:308 fdisk/fdisk.c:333
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
#, fuzzy
msgid " t change a partition's system id"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:290 fdisk/fdisk.c:309 fdisk/fdisk.c:334
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
msgid " u change display/entry units"
msgstr ""
-#: fdisk/fdisk.c:291 fdisk/fdisk.c:310 fdisk/fdisk.c:335 fdisk/fdisk.c:357
-#: fdisk/fdisk.c:374
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
#, fuzzy
msgid " v verify the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:292 fdisk/fdisk.c:311 fdisk/fdisk.c:336 fdisk/fdisk.c:358
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
msgid " w write table to disk and exit"
msgstr ""
-#: fdisk/fdisk.c:293 fdisk/fdisk.c:337
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
msgid " x extra functionality (experts only)"
msgstr ""
-#: fdisk/fdisk.c:297
+#: fdisk/fdisk.c:316
#, fuzzy
msgid " a select bootable partition"
msgstr " d Verwijder de huidige partitie"
#. sgi flavour
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:317
msgid " b edit bootfile entry"
msgstr ""
#. sgi
-#: fdisk/fdisk.c:299
+#: fdisk/fdisk.c:318
#, fuzzy
msgid " c select sgi swap partition"
msgstr " d Verwijder de huidige partitie"
-#: fdisk/fdisk.c:322
+#: fdisk/fdisk.c:341
msgid " a toggle a bootable flag"
msgstr ""
-#: fdisk/fdisk.c:324
+#: fdisk/fdisk.c:343
msgid " c toggle the dos compatibility flag"
msgstr ""
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:364
msgid " a change number of alternate cylinders"
msgstr ""
#. sun
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:364
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
msgid " c change number of cylinders"
msgstr ""
-#: fdisk/fdisk.c:347 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
#, fuzzy
msgid " d print the raw data in the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:348
+#: fdisk/fdisk.c:367
msgid " e change number of extra sectors per cylinder"
msgstr ""
#. sun
-#: fdisk/fdisk.c:349 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
msgid " h change number of heads"
msgstr ""
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:369
msgid " i change interleave factor"
msgstr ""
#. sun
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:370
msgid " o change rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisk.c:355 fdisk/fdisk.c:372 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
msgid " r return to main menu"
msgstr ""
-#: fdisk/fdisk.c:356 fdisk/fdisk.c:373
-msgid " s change number of sectors"
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+msgid " s change number of sectors/track"
msgstr ""
-#: fdisk/fdisk.c:359
+#: fdisk/fdisk.c:378
msgid " y change number of physical cylinders"
msgstr ""
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:382
msgid " b move beginning of data in a partition"
msgstr ""
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:385
#, fuzzy
msgid " e list extended partitions"
msgstr "Geen ruimte voor een uitgebreide partitie"
#. !sun
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:386
#, fuzzy
msgid " g create an IRIX partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:482
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:477
+#: fdisk/fdisk.c:496
msgid "heads"
msgstr ""
-#: fdisk/fdisk.c:479 fdisk/sfdisk.c:825
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
#, fuzzy
msgid "sectors"
msgstr "Sectoren"
-#: fdisk/fdisk.c:481 fdisk/fdiskbsdlabel.c:441 fdisk/sfdisk.c:825
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:441
+#: fdisk/sfdisk.c:842
#, fuzzy
msgid "cylinders"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:485
+#: fdisk/fdisk.c:504
#, c-format
msgid ""
"%s%s.\n"
"You can do this from the extra functions menu.\n"
msgstr ""
-#: fdisk/fdisk.c:486
+#: fdisk/fdisk.c:505
msgid " and "
msgstr ""
-#: fdisk/fdisk.c:520
+#: fdisk/fdisk.c:539
#, fuzzy
msgid "Bad offset in primary extended partition\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:524
+#: fdisk/fdisk.c:546
#, fuzzy, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:567
#, fuzzy, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:553
+#: fdisk/fdisk.c:575
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:579
+#: fdisk/fdisk.c:601
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"
@@ -1580,107 +2291,107 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:615
+#: fdisk/fdisk.c:637
#, fuzzy
msgid "You will not be able to write the partition table.\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:646
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr ""
-#: fdisk/fdisk.c:671
+#: fdisk/fdisk.c:694
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
msgstr ""
-#: fdisk/fdisk.c:687
+#: fdisk/fdisk.c:710
#, fuzzy
msgid "Internal error\n"
msgstr "Interne fout"
-#: fdisk/fdisk.c:697
+#: fdisk/fdisk.c:720
#, fuzzy, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Geen ruimte voor een uitgebreide partitie"
-#: fdisk/fdisk.c:704
+#: fdisk/fdisk.c:727
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
"w(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:725
+#: fdisk/fdisk.c:748
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:762
+#: fdisk/fdisk.c:785
msgid "Hex code (type L to list codes): "
msgstr ""
-#: fdisk/fdisk.c:801
+#: fdisk/fdisk.c:824
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr ""
-#: fdisk/fdisk.c:855
+#: fdisk/fdisk.c:878
#, c-format
msgid "Using default value %d\n"
msgstr ""
-#: fdisk/fdisk.c:859
+#: fdisk/fdisk.c:882
msgid "Value out of range.\n"
msgstr ""
-#: fdisk/fdisk.c:866
+#: fdisk/fdisk.c:889
#, fuzzy
msgid "Partition number"
msgstr "Partitietabel voor %s\n"
-#: fdisk/fdisk.c:874
+#: fdisk/fdisk.c:897
#, fuzzy, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:904
#, fuzzy
msgid "cylinder"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:904
#, fuzzy
msgid "sector"
msgstr "Sectoren"
-#: fdisk/fdisk.c:887
+#: fdisk/fdisk.c:913
#, c-format
-msgid "Changing display/entry units to %ss\n"
+msgid "Changing display/entry units to %s\n"
msgstr ""
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:923
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:910
+#: fdisk/fdisk.c:936
msgid "DOS Compatibility flag is set\n"
msgstr ""
-#: fdisk/fdisk.c:914
+#: fdisk/fdisk.c:940
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:999
+#: fdisk/fdisk.c:1026
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr ""
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1031
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -1688,92 +2399,92 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1013
+#: fdisk/fdisk.c:1040
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1022
+#: fdisk/fdisk.c:1049
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1028
+#: fdisk/fdisk.c:1055
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1042
+#: fdisk/fdisk.c:1069
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1095
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1097 fdisk/fdisk.c:1105 fdisk/fdisk.c:1114 fdisk/fdisk.c:1123
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1098 fdisk/fdisk.c:1106
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1103
+#: fdisk/fdisk.c:1130
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1112
+#: fdisk/fdisk.c:1139
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1115
+#: fdisk/fdisk.c:1142
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1121
+#: fdisk/fdisk.c:1148
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1151
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1131
+#: fdisk/fdisk.c:1158
#, c-format
msgid ""
"\n"
"Disk %s: %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * %d bytes\n"
+"Units = %s of %d * %d bytes\n"
"\n"
msgstr ""
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1168
+#: fdisk/fdisk.c:1195
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisk.c:1169 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:629
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr ""
-#: fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1236
#, c-format
msgid ""
"\n"
@@ -1781,105 +2492,105 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1211
+#: fdisk/fdisk.c:1238
#, fuzzy
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr " # Vlaggen Kop Sect Cyl ID Kop Sect Cyl Sector Sectoren\n"
-#: fdisk/fdisk.c:1250
+#: fdisk/fdisk.c:1277
#, fuzzy, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1280
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1256
+#: fdisk/fdisk.c:1283
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1259
+#: fdisk/fdisk.c:1286
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1263
+#: fdisk/fdisk.c:1290
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1320
#, fuzzy, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:1301
+#: fdisk/fdisk.c:1328
#, fuzzy, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1346
#, fuzzy, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1324
+#: fdisk/fdisk.c:1351
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1330
+#: fdisk/fdisk.c:1357
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1333
+#: fdisk/fdisk.c:1360
#, c-format
msgid "%d unallocated sectors\n"
msgstr ""
-#: fdisk/fdisk.c:1345 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
-#: fdisk/fdisk.c:1366 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr ""
-#: fdisk/fdisk.c:1381 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
msgstr ""
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1440
msgid "No free sectors available\n"
msgstr ""
-#: fdisk/fdisk.c:1417 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr ""
-#: fdisk/fdisk.c:1447
+#: fdisk/fdisk.c:1480
#, fuzzy, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
msgstr "Partitie eindigt voorbij het einde van de schijf"
-#: fdisk/fdisk.c:1484 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:590
msgid "The maximum number of partitions has been created\n"
msgstr ""
-#: fdisk/fdisk.c:1494
+#: fdisk/fdisk.c:1527
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1531
#, c-format
msgid ""
"Command action\n"
@@ -1887,36 +2598,36 @@ msgid ""
" p primary partition (1-4)\n"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1533
msgid "l logical (5 or over)"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1533
msgid "e extended"
msgstr ""
-#: fdisk/fdisk.c:1517
+#: fdisk/fdisk.c:1550
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr ""
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1582
#, fuzzy
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/fdisk.c:1551
+#: fdisk/fdisk.c:1584
#, fuzzy
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:1568
+#: fdisk/fdisk.c:1601
msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:1573
+#: fdisk/fdisk.c:1606
#, fuzzy, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
@@ -1925,7 +2636,7 @@ msgstr ""
"Herstart het systeem om er zeker van te zijn dat de partitietabel correct "
"aangepast is\n"
-#: fdisk/fdisk.c:1579
+#: fdisk/fdisk.c:1612
#, fuzzy
msgid ""
"\n"
@@ -1937,88 +2648,83 @@ msgstr ""
"WAARSCHUWING: Mocht U DOS 6.x partities hebben aangemaakt of gewijzigd,\n"
"lees dan de cfdisk man pagina - vaak is nog een dd commando nodig.\n"
-#: fdisk/fdisk.c:1610
+#: fdisk/fdisk.c:1643
#, fuzzy, c-format
msgid "Device: %s\n"
msgstr "Schijf: %s\n"
-#: fdisk/fdisk.c:1625
+#: fdisk/fdisk.c:1658
#, fuzzy, c-format
msgid "Partition %d has no data area\n"
msgstr "Partitie eindigt voor sector 0"
-#: fdisk/fdisk.c:1631
+#: fdisk/fdisk.c:1664
msgid "New beginning of data"
msgstr ""
-#: fdisk/fdisk.c:1645
+#: fdisk/fdisk.c:1678
msgid "Expert command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:1656
+#: fdisk/fdisk.c:1689
#, fuzzy
msgid "Number of cylinders"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1710
msgid "Number of heads"
msgstr ""
-#: fdisk/fdisk.c:1702
+#: fdisk/fdisk.c:1735
#, fuzzy
msgid "Number of sectors"
msgstr " sectoren"
-#: fdisk/fdisk.c:1705
+#: fdisk/fdisk.c:1738
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:1767
+#: fdisk/fdisk.c:1800
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr ""
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1814
#, fuzzy, c-format
msgid "Cannot open %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1879
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:1839
+#: fdisk/fdisk.c:1882
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:1947
-#, fuzzy, c-format
-msgid "Using %s as default device!\n"
-msgstr "%s: dit apparaat is geen floppy\n"
-
-#: fdisk/fdisk.c:1953
+#: fdisk/fdisk.c:1940
msgid "Command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:1967
+#: fdisk/fdisk.c:1954
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:1969
+#: fdisk/fdisk.c:1956
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:1971
+#: fdisk/fdisk.c:1958
#, fuzzy
msgid "Boot file unchanged\n"
msgstr "De schijfinhoud is gewijzigd.\n"
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2018
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2386,7 +3092,7 @@ msgid "SGI rxlvol"
msgstr ""
#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:52
+#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
msgid "Linux swap"
msgstr ""
@@ -2412,7 +3118,7 @@ msgid ""
"%d cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2421,7 +3127,7 @@ msgstr ""
msgid ""
"\n"
"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2700,15 +3406,15 @@ msgstr "%ld inodes\n"
msgid "Physical cylinders"
msgstr "%ld inodes\n"
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
msgid "Rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
msgid "Interleave factor"
msgstr ""
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:665
+#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
#, fuzzy
msgid "Extra sectors per cylinder"
msgstr "%ld inodes\n"
@@ -2754,19 +3460,19 @@ msgstr ""
#: fdisk/fdisksunlabel.c:547
#, c-format
msgid ""
-"You haven't covered whole disk with 3rd partition, but your value\n"
-"%d %s covers some other partition. Your entry have been changed\n"
+"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 ""
-#: fdisk/fdisksunlabel.c:565
+#: fdisk/fdisksunlabel.c:567
#, 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:578
+#: fdisk/fdisksunlabel.c:580
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -2775,7 +3481,7 @@ msgid ""
"tagged with 82 (Linux swap): "
msgstr ""
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
#, c-format
msgid ""
"\n"
@@ -2783,29 +3489,29 @@ msgid ""
"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:625
#, c-format
msgid ""
"\n"
"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:630
#, c-format
msgid "%*s Flag Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:655
msgid "Number of alternate cylinders"
msgstr ""
-#: fdisk/fdisksunlabel.c:686
+#: fdisk/fdisksunlabel.c:688
msgid "Number of physical cylinders"
msgstr ""
@@ -2902,277 +3608,295 @@ msgid "AST Windows swapfile"
msgstr ""
#: fdisk/i386_sys_types.c:28
-msgid "NEC DOS"
+msgid "Hidden Win95 FAT32"
msgstr ""
#: fdisk/i386_sys_types.c:29
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:32
#, fuzzy
msgid "PartitionMagic recovery"
msgstr "Partitie begint voor sector 0"
-#: fdisk/i386_sys_types.c:30
+#: fdisk/i386_sys_types.c:33
msgid "Venix 80286"
msgstr ""
-#: fdisk/i386_sys_types.c:31
+#: fdisk/i386_sys_types.c:34
msgid "PPC PReP Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:32
+#: fdisk/i386_sys_types.c:35
msgid "SFS"
msgstr ""
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:36
msgid "QNX4.x"
msgstr ""
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:37
msgid "QNX4.x 2nd part"
msgstr ""
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:38
msgid "QNX4.x 3rd part"
msgstr ""
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:39
msgid "OnTrack DM"
msgstr ""
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:40
msgid "OnTrack DM6 Aux1"
msgstr ""
#. (or Novell)
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:41
msgid "CP/M"
msgstr ""
#. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:42
msgid "OnTrack DM6 Aux3"
msgstr ""
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:43
msgid "OnTrackDM6"
msgstr ""
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:44
msgid "EZ-Drive"
msgstr ""
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:45
msgid "Golden Bow"
msgstr ""
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:46
msgid "Priam Edisk"
msgstr ""
#. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:44 fdisk/i386_sys_types.c:73
-#: fdisk/i386_sys_types.c:75 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
#, fuzzy
msgid "SpeedStor"
msgstr "Sectoren"
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:48
msgid "GNU HURD or SysV"
msgstr ""
#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:49
msgid "Novell Netware 286"
msgstr ""
-#: fdisk/i386_sys_types.c:47
+#: fdisk/i386_sys_types.c:50
msgid "Novell Netware 386"
msgstr ""
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:51
msgid "DiskSecure Multi-Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:52
msgid "PC/IX"
msgstr ""
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:53
msgid "Old Minix"
msgstr ""
#. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:54
msgid "Minix / old Linux"
msgstr ""
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:57
msgid "OS/2 hidden C: drive"
msgstr ""
-#: fdisk/i386_sys_types.c:55
+#: fdisk/i386_sys_types.c:58
msgid "Linux extended"
msgstr ""
-#: fdisk/i386_sys_types.c:56 fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
msgid "NTFS volume set"
msgstr ""
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:61
msgid "Amoeba"
msgstr ""
-#: fdisk/i386_sys_types.c:59
+#: fdisk/i386_sys_types.c:62
msgid "Amoeba BBT"
msgstr ""
#. (bad block table)
-#: fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:63
msgid "IBM Thinkpad hibernation"
msgstr ""
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:64
msgid "BSD/386"
msgstr ""
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:65
msgid "OpenBSD"
msgstr ""
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:66
msgid "NeXTSTEP"
msgstr ""
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
msgid "BSDI fs"
msgstr ""
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
msgid "BSDI swap"
msgstr ""
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
msgid "DRDOS/sec (FAT-12)"
msgstr ""
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
msgid "DRDOS/sec (FAT-16 < 32M)"
msgstr ""
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
msgid "DRDOS/sec (FAT-16)"
msgstr ""
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
msgid "Syrinx"
msgstr ""
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
msgid "CP/M / CTOS / ..."
msgstr ""
#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
msgid "DOS access"
msgstr ""
#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
msgid "DOS R/O"
msgstr ""
#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
msgid "BeOS fs"
msgstr ""
#. SpeedStor large partition
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
msgid "DOS secondary"
msgstr ""
#. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:78
+#: fdisk/i386_sys_types.c:81
+msgid "Linux raid autodetect"
+msgstr ""
+
+#. New (2.2.x) raid partition with autodetect
+#. using persistent superblock
+#: fdisk/i386_sys_types.c:83
msgid "LANstep"
msgstr ""
#. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:84
msgid "BBT"
msgstr ""
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:153
+#: fdisk/sfdisk.c:152
#, c-format
msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
msgstr ""
-#: fdisk/sfdisk.c:199
+#: fdisk/sfdisk.c:198
msgid "out of memory - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr ""
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:274
+#: fdisk/sfdisk.c:273
#, c-format
msgid "cannot open partition sector save file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:292
+#: fdisk/sfdisk.c:291
#, c-format
msgid "write error on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, c-format
msgid "cannot stat partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
msgid "partition restore file has wrong size - not restoring\n"
msgstr ""
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:318
msgid "out of memory?\n"
msgstr ""
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, c-format
msgid "cannot open partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:331
+#: fdisk/sfdisk.c:330
#, c-format
msgid "error reading %s\n"
msgstr ""
-#: fdisk/sfdisk.c:338
+#: fdisk/sfdisk.c:337
#, fuzzy, c-format
msgid "cannot open device %s for writing\n"
msgstr "Kan schijf niet openen"
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:407
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3180,698 +3904,680 @@ msgid ""
"[Use the --force option if you really want this]\n"
msgstr ""
-#: fdisk/sfdisk.c:413
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr ""
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:419
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr ""
-#: fdisk/sfdisk.c:423
+#: fdisk/sfdisk.c:431
#, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr ""
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
"This will give problems with all software that uses C/H/S addressing.\n"
msgstr ""
-#: fdisk/sfdisk.c:429
+#: fdisk/sfdisk.c:437
#, c-format
msgid ""
"\n"
-"Disk %s: %lu heads, %lu sectors, %lu cylinders\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:514
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
"0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:558
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:703
+#: fdisk/sfdisk.c:719
#, fuzzy
msgid "Re-reading the partition table ...\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/sfdisk.c:709
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
msgstr ""
-#: fdisk/sfdisk.c:714
+#: fdisk/sfdisk.c:730
#, c-format
msgid "Error closing %s\n"
msgstr ""
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:768
#, fuzzy, c-format
msgid "%s: no such partition\n"
msgstr "Slechte logische partitie"
-#: fdisk/sfdisk.c:775
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:830
#, fuzzy, c-format
msgid "# partition table of %s\n"
msgstr "Partitietabel voor %s\n"
-#: fdisk/sfdisk.c:814
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr ""
-#: fdisk/sfdisk.c:828
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:831
+#: fdisk/sfdisk.c:848
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:836
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:838
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:843
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:903
-#, c-format
-msgid " start=%9lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:904
-#, c-format
-msgid ", size=%8lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:906
-#, c-format
-msgid ", Id=%2x"
-msgstr ""
-
-#: fdisk/sfdisk.c:908
-#, fuzzy
-msgid ", bootable"
-msgstr "Startbaar"
-
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:997
#, c-format
msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:1004
#, c-format
msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:1007
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:989
+#: fdisk/sfdisk.c:1018
msgid "No partitions found\n"
msgstr ""
-#: fdisk/sfdisk.c:1034
+#: fdisk/sfdisk.c:1025
+#, c-format
+msgid ""
+"Warning: The first partition 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 ""
+
+#: fdisk/sfdisk.c:1075
#, fuzzy
msgid "no partition table present.\n"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/sfdisk.c:1036
+#: fdisk/sfdisk.c:1077
#, c-format
msgid "strange, only %d partitions defined.\n"
msgstr ""
-#: fdisk/sfdisk.c:1045
+#: fdisk/sfdisk.c:1086
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
msgstr ""
-#: fdisk/sfdisk.c:1048
+#: fdisk/sfdisk.c:1089
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
msgstr ""
-#: fdisk/sfdisk.c:1051
+#: fdisk/sfdisk.c:1092
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
msgstr ""
-#: fdisk/sfdisk.c:1062
+#: fdisk/sfdisk.c:1103
#, fuzzy, c-format
msgid "Warning: partition %s "
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/sfdisk.c:1063
+#: fdisk/sfdisk.c:1104
#, c-format
msgid "is not contained in partition %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1074
+#: fdisk/sfdisk.c:1115
#, c-format
msgid "Warning: partitions %s "
msgstr ""
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr ""
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1127
#, fuzzy, c-format
msgid "Warning: partition %s contains part of "
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/sfdisk.c:1087
+#: fdisk/sfdisk.c:1128
#, fuzzy, c-format
msgid "the partition table (sector %lu),\n"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/sfdisk.c:1088
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr ""
-#: fdisk/sfdisk.c:1097
+#: fdisk/sfdisk.c:1138
#, c-format
msgid "Warning: partition %s starts at sector 0\n"
msgstr ""
-#: fdisk/sfdisk.c:1101
+#: fdisk/sfdisk.c:1142
#, fuzzy, c-format
msgid "Warning: partition %s extends past end of disk\n"
msgstr "Partitie eindigt voorbij het einde van de schijf"
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr ""
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr ""
-#: fdisk/sfdisk.c:1133
+#: fdisk/sfdisk.c:1174
#, c-format
msgid "Warning: partition %s does not start at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1180
#, c-format
msgid "Warning: partition %s does not end at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1198
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:1164
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
msgstr ""
-#: fdisk/sfdisk.c:1170
+#: fdisk/sfdisk.c:1211
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:1187
+#: fdisk/sfdisk.c:1228
#, c-format
msgid ""
"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1196
+#: fdisk/sfdisk.c:1237
#, c-format
msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1199
+#: fdisk/sfdisk.c:1240
#, c-format
msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1232 fdisk/sfdisk.c:1309
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, c-format
msgid "too many partitions - ignoring those past nr (%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1288
#, fuzzy
msgid "tree of partitions?\n"
msgstr "Maak geen partitie"
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr ""
-#: fdisk/sfdisk.c:1358
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:1378
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1417
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1470
msgid "-n flag was given: Nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:1442
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr ""
-#: fdisk/sfdisk.c:1447
+#: fdisk/sfdisk.c:1488
#, fuzzy, c-format
msgid "Failed writing the partition on %s\n"
msgstr "Heb de partitietabel niet naar schijf geschreven"
-#: fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr ""
-#: fdisk/sfdisk.c:1560
+#: fdisk/sfdisk.c:1601
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1567
+#: fdisk/sfdisk.c:1608
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1573
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1605
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr ""
-#: fdisk/sfdisk.c:1609
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr ""
-#: fdisk/sfdisk.c:1725
+#: fdisk/sfdisk.c:1766
msgid "no room for partition descriptor\n"
msgstr ""
-#: fdisk/sfdisk.c:1758
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1850
msgid "too many input fields\n"
msgstr ""
#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1843
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr ""
-#: fdisk/sfdisk.c:1862
+#: fdisk/sfdisk.c:1903
#, fuzzy
msgid "Illegal type\n"
msgstr "Niet herkende toets"
-#: fdisk/sfdisk.c:1894
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1899
+#: fdisk/sfdisk.c:1940
#, fuzzy
msgid "Warning: empty partition\n"
msgstr "Slechte primaire partitie"
-#: fdisk/sfdisk.c:1913
+#: fdisk/sfdisk.c:1954
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1926
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr ""
-#: fdisk/sfdisk.c:1943 fdisk/sfdisk.c:1956
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr ""
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2008
#, fuzzy
msgid "Extended partition not where expected\n"
msgstr "Zet de partitie aan het eind van de vrije ruimte"
-#: fdisk/sfdisk.c:1999
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr ""
-#: fdisk/sfdisk.c:2021
+#: fdisk/sfdisk.c:2062
#, fuzzy
msgid "too many partitions\n"
msgstr "Slechte primaire partitie"
-#: fdisk/sfdisk.c:2054
+#: fdisk/sfdisk.c:2095
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:2074
+#: fdisk/sfdisk.c:2115
msgid "version"
msgstr ""
-#: fdisk/sfdisk.c:2080
+#: fdisk/sfdisk.c:2121
#, fuzzy, c-format
msgid "Usage: %s [options] device ...\n"
msgstr "aanroep: %s [ -n ] apparaat\n"
-#: fdisk/sfdisk.c:2081
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr ""
-#: fdisk/sfdisk.c:2082
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr ""
-#: fdisk/sfdisk.c:2083
+#: fdisk/sfdisk.c:2124
msgid " -s [or --show-size]: list size of a partition"
msgstr ""
-#: fdisk/sfdisk.c:2084
+#: fdisk/sfdisk.c:2125
msgid " -c [or --id]: print or change partition Id"
msgstr ""
-#: fdisk/sfdisk.c:2085
+#: fdisk/sfdisk.c:2126
msgid " -l [or --list]: list partitions of each device"
msgstr ""
-#: fdisk/sfdisk.c:2086
+#: fdisk/sfdisk.c:2127
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr ""
-#: fdisk/sfdisk.c:2087
+#: fdisk/sfdisk.c:2128
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr ""
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2129
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of "
"sectors/blocks/cylinders/MB"
msgstr ""
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2130
msgid " -T [or --list-types]:list the known partition types"
msgstr ""
-#: fdisk/sfdisk.c:2090
+#: fdisk/sfdisk.c:2131
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr ""
-#: fdisk/sfdisk.c:2091
+#: fdisk/sfdisk.c:2132
msgid " -R [or --re-read]: make kernel reread partition table"
msgstr ""
-#: fdisk/sfdisk.c:2092
+#: fdisk/sfdisk.c:2133
msgid " -N# : change only the partition with number #"
msgstr ""
-#: fdisk/sfdisk.c:2093
+#: fdisk/sfdisk.c:2134
msgid " -n : do not actually write to disk"
msgstr ""
-#: fdisk/sfdisk.c:2094
+#: fdisk/sfdisk.c:2135
msgid ""
" -O file : save the sectors that will be overwritten to file"
msgstr ""
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2136
msgid " -I file : restore these sectors again"
msgstr ""
-#: fdisk/sfdisk.c:2096
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr ""
-#: fdisk/sfdisk.c:2097
+#: fdisk/sfdisk.c:2138
msgid " -? [or --help]: print this message"
msgstr ""
-#: fdisk/sfdisk.c:2098
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr ""
-#: fdisk/sfdisk.c:2099
+#: fdisk/sfdisk.c:2140
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr ""
-#: fdisk/sfdisk.c:2100
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
msgstr ""
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2143
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr ""
-#: fdisk/sfdisk.c:2103
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr ""
-#: fdisk/sfdisk.c:2104
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr ""
-#: fdisk/sfdisk.c:2105
+#: fdisk/sfdisk.c:2146
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr ""
-#: fdisk/sfdisk.c:2106
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr ""
-#: fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr ""
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr ""
-#: fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2150
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr ""
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2156
msgid "Usage:"
msgstr ""
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2157
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr ""
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2158
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2159
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr ""
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr ""
-#: fdisk/sfdisk.c:2360
+#: fdisk/sfdisk.c:2401
#, fuzzy, c-format
msgid "total: %d blocks\n"
msgstr "%ld blokken\n"
-#: fdisk/sfdisk.c:2397
+#: fdisk/sfdisk.c:2438
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr ""
-#: fdisk/sfdisk.c:2399
+#: fdisk/sfdisk.c:2440
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr ""
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2442
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr ""
-#: fdisk/sfdisk.c:2408
+#: fdisk/sfdisk.c:2449
msgid "can specify only one device (except with -l or -s)\n"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
#, fuzzy, c-format
msgid "cannot open %s %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr ""
-#: fdisk/sfdisk.c:2458
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr ""
-#: fdisk/sfdisk.c:2475
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:2478
+#: fdisk/sfdisk.c:2519
#, c-format
msgid "%s: unknown geometry\n"
msgstr ""
-#: fdisk/sfdisk.c:2493
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2570
+#: fdisk/sfdisk.c:2612
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr ""
-#: fdisk/sfdisk.c:2587 fdisk/sfdisk.c:2640 fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
msgid ""
"Done\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:2596
+#: fdisk/sfdisk.c:2638
#, 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:2610
+#: fdisk/sfdisk.c:2652
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr ""
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr ""
-#: fdisk/sfdisk.c:2681
+#: fdisk/sfdisk.c:2723
msgid "This disk is currently in use.\n"
msgstr ""
-#: fdisk/sfdisk.c:2698
+#: fdisk/sfdisk.c:2740
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2701
+#: fdisk/sfdisk.c:2743
#, fuzzy, c-format
msgid "Warning: %s is not a block device\n"
msgstr "%s: dit apparaat is geen floppy\n"
-#: fdisk/sfdisk.c:2706
+#: fdisk/sfdisk.c:2749
msgid "Checking that no-one is using this disk right now ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -3879,88 +4585,88 @@ msgid ""
"--no-reread flag to suppress this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2755
msgid "Use the --force flag to overrule all checks.\n"
msgstr ""
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr ""
-#: fdisk/sfdisk.c:2725
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2772
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr ""
-#: fdisk/sfdisk.c:2737
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
msgstr ""
-#: fdisk/sfdisk.c:2745
+#: fdisk/sfdisk.c:2788
msgid "I don't like this - probably you should answer No\n"
msgstr ""
-#: fdisk/sfdisk.c:2750
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2752
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2757
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
msgstr ""
-#: fdisk/sfdisk.c:2759
+#: fdisk/sfdisk.c:2802
msgid "Quitting - nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2808
#, fuzzy
msgid "Please answer one of y,n,q\n"
msgstr "Antwoord `ja' of `nee'"
-#: fdisk/sfdisk.c:2773
+#: fdisk/sfdisk.c:2816
#, fuzzy
msgid ""
"Successfully wrote the new partition table\n"
"\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/sfdisk.c:2779
+#: fdisk/sfdisk.c:2822
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 ""
-#: games/banner.c:1051
+#: games/banner.c:1048
msgid "usage: banner [-w width]\n"
msgstr ""
-#: games/banner.c:1071
+#: games/banner.c:1068
msgid "Message: "
msgstr ""
-#: games/banner.c:1105
+#: games/banner.c:1102
#, c-format
msgid "The character '%c' is not in my character set"
msgstr ""
-#: games/banner.c:1113
+#: games/banner.c:1110
#, c-format
msgid "Message '%s' is OK\n"
msgstr ""
@@ -4047,146 +4753,146 @@ msgstr ""
msgid "internal error, contact the author."
msgstr ""
-#: login-utils/agetty.c:300
+#: login-utils/agetty.c:303
msgid "calling open_tty\n"
msgstr ""
#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:313
+#: login-utils/agetty.c:316
msgid "calling termio_init\n"
msgstr ""
-#: login-utils/agetty.c:318
+#: login-utils/agetty.c:321
msgid "writing init string\n"
msgstr ""
#. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:328
+#: login-utils/agetty.c:331
msgid "before autobaud\n"
msgstr ""
-#: login-utils/agetty.c:340
+#: login-utils/agetty.c:343
msgid "waiting for cr-lf\n"
msgstr ""
-#: login-utils/agetty.c:344
+#: login-utils/agetty.c:347
#, c-format
msgid "read %c\n"
msgstr ""
#. Read the login name.
-#: login-utils/agetty.c:353
+#: login-utils/agetty.c:356
msgid "reading login name\n"
msgstr ""
-#: login-utils/agetty.c:374
+#: login-utils/agetty.c:377
#, c-format
msgid "%s: can't exec %s: %m"
msgstr ""
-#: login-utils/agetty.c:394
+#: login-utils/agetty.c:397
msgid "can't malloc initstring"
msgstr ""
-#: login-utils/agetty.c:456
+#: login-utils/agetty.c:459
#, c-format
msgid "bad timeout value: %s"
msgstr ""
-#: login-utils/agetty.c:465
+#: login-utils/agetty.c:468
msgid "after getopt loop\n"
msgstr ""
-#: login-utils/agetty.c:483
+#: login-utils/agetty.c:486
msgid "exiting parseargs\n"
msgstr ""
-#: login-utils/agetty.c:496
+#: login-utils/agetty.c:499
msgid "entered parse_speeds\n"
msgstr ""
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:502
#, c-format
msgid "bad speed: %s"
msgstr ""
-#: login-utils/agetty.c:501
+#: login-utils/agetty.c:504
msgid "too many alternate speeds"
msgstr ""
-#: login-utils/agetty.c:503
+#: login-utils/agetty.c:506
msgid "exiting parsespeeds\n"
msgstr ""
-#: login-utils/agetty.c:576
+#: login-utils/agetty.c:579
#, c-format
msgid "%s: open for update: %m"
msgstr ""
-#: login-utils/agetty.c:592
+#: login-utils/agetty.c:595
#, c-format
msgid "%s: no utmp entry"
msgstr ""
-#: login-utils/agetty.c:621
+#: login-utils/agetty.c:624
#, c-format
msgid "/dev: chdir() failed: %m"
msgstr ""
-#: login-utils/agetty.c:625
+#: login-utils/agetty.c:628
#, c-format
msgid "/dev/%s: not a character device"
msgstr ""
#. ignore close(2) errors
-#: login-utils/agetty.c:632
+#: login-utils/agetty.c:635
msgid "open(2)\n"
msgstr ""
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:637
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr ""
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:647
#, c-format
msgid "%s: not open for read/write"
msgstr ""
#. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:648
+#: login-utils/agetty.c:651
msgid "duping\n"
msgstr ""
#. set up stdout and stderr
-#: login-utils/agetty.c:650
+#: login-utils/agetty.c:653
#, c-format
msgid "%s: dup problem: %m"
msgstr ""
-#: login-utils/agetty.c:712
+#: login-utils/agetty.c:723
msgid "term_io 2\n"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:905
msgid "user"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:905
msgid "users"
msgstr ""
-#: login-utils/agetty.c:982
+#: login-utils/agetty.c:993
#, c-format
msgid "%s: read: %m"
msgstr ""
-#: login-utils/agetty.c:1028
+#: login-utils/agetty.c:1039
#, c-format
msgid "%s: input overrun"
msgstr ""
-#: login-utils/agetty.c:1152
+#: login-utils/agetty.c:1163
#, c-format
msgid ""
"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
@@ -4218,7 +4924,7 @@ msgid "can't malloc for grplist"
msgstr ""
#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:424
+#: login-utils/checktty.c:431
#, c-format
msgid "Login on %s from %s denied by default.\n"
msgstr ""
@@ -4227,94 +4933,94 @@ msgstr ""
#. 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:435
+#: login-utils/checktty.c:442
#, c-format
msgid "Login on %s from %s denied.\n"
msgstr ""
-#: login-utils/chfn.c:139 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
msgstr ""
-#: login-utils/chfn.c:146 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
msgstr ""
-#: login-utils/chfn.c:151 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr ""
-#: login-utils/chfn.c:163
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
msgstr ""
-#: login-utils/chfn.c:169 login-utils/chfn.c:173 login-utils/chfn.c:180
-#: login-utils/chfn.c:184 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
msgstr ""
-#: login-utils/chfn.c:193 login-utils/chsh.c:178 login-utils/login.c:650
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:196
-#: mount/lomount.c:202 mount/losetup.c:115 mount/losetup.c:121
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:678
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
+#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
msgid "Password: "
msgstr ""
-#: login-utils/chfn.c:196 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
msgstr ""
-#: login-utils/chfn.c:207
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
msgstr ""
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
msgstr ""
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
msgstr ""
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
msgstr ""
-#: login-utils/chfn.c:381 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
msgstr ""
-#: login-utils/chfn.c:414
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
msgstr ""
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:427
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:492
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr ""
-#: login-utils/chfn.c:495
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
msgstr ""
-#: login-utils/chfn.c:509 login-utils/chsh.c:412 sys-utils/cytune.c:315
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
msgid "malloc failed"
msgstr ""
@@ -4444,271 +5150,266 @@ msgstr ""
msgid "Can't read %s, exiting."
msgstr ""
-#: login-utils/last.c:138
+#: login-utils/last.c:143
msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
msgstr ""
-#: login-utils/last.c:215
-#, c-format
-msgid "last: %s: "
-msgstr ""
-
-#: login-utils/last.c:270
+#: login-utils/last.c:283
msgid " still logged in"
msgstr ""
-#: login-utils/last.c:291
+#: login-utils/last.c:305
#, c-format
msgid ""
"\n"
-"wtmp begins %10.10s %5.5s \n"
+"wtmp begins %s"
msgstr ""
-#: login-utils/last.c:352 login-utils/last.c:372 login-utils/last.c:427
+#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
msgid "last: malloc failure.\n"
msgstr ""
-#: login-utils/last.c:401
+#: login-utils/last.c:416
msgid "last: gethostname"
msgstr ""
-#: login-utils/last.c:454
+#: login-utils/last.c:469
#, c-format
msgid ""
"\n"
"interrupted %10.10s %5.5s \n"
msgstr ""
-#: login-utils/login.c:349
+#: login-utils/login.c:377
msgid "login: -h for super-user only.\n"
msgstr ""
-#: login-utils/login.c:374
+#: login-utils/login.c:402
msgid "usage: login [-fp] [username]\n"
msgstr ""
-#: login-utils/login.c:476
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr ""
-#: login-utils/login.c:478
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr ""
-#: login-utils/login.c:518
+#: login-utils/login.c:546
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:520
+#: login-utils/login.c:548
msgid ""
"Login incorrect\n"
"\n"
msgstr ""
-#: login-utils/login.c:529
+#: login-utils/login.c:557
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:533
+#: login-utils/login.c:561
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:536
+#: login-utils/login.c:564
msgid ""
"\n"
"Login incorrect\n"
msgstr ""
-#: login-utils/login.c:585
+#: login-utils/login.c:613
msgid "Illegal username"
msgstr "Niet-toegestane gebruikersnaam"
-#: login-utils/login.c:628
+#: login-utils/login.c:656
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr ""
-#: login-utils/login.c:633
+#: login-utils/login.c:661
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
msgstr ""
-#: login-utils/login.c:637
+#: login-utils/login.c:665
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
msgstr ""
-#: login-utils/login.c:689
+#: login-utils/login.c:717
msgid "Login incorrect\n"
msgstr ""
-#: login-utils/login.c:711
+#: login-utils/login.c:739
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
msgstr ""
-#: login-utils/login.c:715
+#: login-utils/login.c:743
msgid "You have too many processes running.\n"
msgstr ""
-#: login-utils/login.c:761
+#: login-utils/login.c:789
msgid "Warning: no Kerberos tickets issued\n"
msgstr ""
-#: login-utils/login.c:773
+#: login-utils/login.c:801
msgid "Sorry -- your password has expired.\n"
msgstr ""
-#: login-utils/login.c:779
+#: login-utils/login.c:807
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:787
+#: login-utils/login.c:815
msgid "Sorry -- your account has expired.\n"
msgstr ""
-#: login-utils/login.c:793
+#: login-utils/login.c:821
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:1012
+#: login-utils/login.c:1055
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr ""
-#: login-utils/login.c:1019
+#: login-utils/login.c:1062
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr ""
-#: login-utils/login.c:1022
+#: login-utils/login.c:1065
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr ""
-#: login-utils/login.c:1025
+#: login-utils/login.c:1068
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr ""
-#: login-utils/login.c:1028
+#: login-utils/login.c:1071
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr ""
-#: login-utils/login.c:1039
+#: login-utils/login.c:1083
#, c-format
msgid "You have %smail.\n"
msgstr ""
-#: login-utils/login.c:1040
+#: login-utils/login.c:1084
msgid "new "
msgstr ""
#. error in fork()
-#: login-utils/login.c:1057
+#: login-utils/login.c:1102
#, c-format
msgid "login: failure forking: %s"
msgstr ""
-#: login-utils/login.c:1072
+#: login-utils/login.c:1117
msgid "setuid() failed"
msgstr ""
-#: login-utils/login.c:1078
+#: login-utils/login.c:1123
#, c-format
msgid "No directory %s!\n"
msgstr ""
-#: login-utils/login.c:1082
+#: login-utils/login.c:1127
msgid "Logging in with home = \"/\".\n"
msgstr ""
-#: login-utils/login.c:1090
+#: login-utils/login.c:1135
msgid "login: no memory for shell script.\n"
msgstr ""
-#: login-utils/login.c:1116
+#: login-utils/login.c:1163
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr ""
-#: login-utils/login.c:1119
+#: login-utils/login.c:1166
#, c-format
msgid "login: no shell: %s.\n"
msgstr ""
-#: login-utils/login.c:1135
+#: login-utils/login.c:1182
#, c-format
msgid ""
"\n"
"%s login: "
msgstr ""
-#: login-utils/login.c:1146
+#: login-utils/login.c:1193
msgid "login name much too long.\n"
msgstr ""
-#: login-utils/login.c:1147
+#: login-utils/login.c:1194
msgid "NAME too long"
msgstr ""
-#: login-utils/login.c:1154
+#: login-utils/login.c:1201
msgid "login names may not start with '-'.\n"
msgstr ""
-#: login-utils/login.c:1164
+#: login-utils/login.c:1211
msgid "too many bare linefeeds.\n"
msgstr ""
-#: login-utils/login.c:1165
+#: login-utils/login.c:1212
msgid "EXCESSIVE linefeeds"
msgstr ""
-#: login-utils/login.c:1176
+#: login-utils/login.c:1223
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr ""
-#: login-utils/login.c:1276
+#: login-utils/login.c:1323
#, c-format
msgid "Last login: %.*s "
msgstr ""
-#: login-utils/login.c:1280
+#: login-utils/login.c:1327
#, c-format
msgid "from %.*s\n"
msgstr ""
-#: login-utils/login.c:1283
+#: login-utils/login.c:1330
#, c-format
msgid "on %.*s\n"
msgstr ""
-#: login-utils/login.c:1306
+#: login-utils/login.c:1353
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1309
+#: login-utils/login.c:1356
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
msgstr ""
-#: login-utils/login.c:1313
+#: login-utils/login.c:1360
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1316
+#: login-utils/login.c:1363
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
msgstr ""
@@ -4749,128 +5450,128 @@ msgstr ""
msgid "No shell"
msgstr ""
-#: login-utils/passwd.c:165
+#: login-utils/passwd.c:163
msgid "The password must have at least 6 characters, try again.\n"
msgstr ""
-#: login-utils/passwd.c:178
+#: login-utils/passwd.c:176
msgid "The password must contain characters out of two of the following\n"
msgstr ""
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:177
msgid "classes: upper and lower case letters, digits and non alphanumeric\n"
msgstr ""
-#: login-utils/passwd.c:180
+#: login-utils/passwd.c:178
msgid "characters. See passwd(1) for more information.\n"
msgstr ""
-#: login-utils/passwd.c:185
+#: login-utils/passwd.c:183
msgid "You cannot reuse the old password.\n"
msgstr ""
-#: login-utils/passwd.c:190
+#: login-utils/passwd.c:188
msgid "Please don't use something like your username as password!\n"
msgstr ""
-#: login-utils/passwd.c:201 login-utils/passwd.c:208
+#: login-utils/passwd.c:199 login-utils/passwd.c:206
msgid "Please don't use something like your realname as password!\n"
msgstr ""
-#: login-utils/passwd.c:225
+#: login-utils/passwd.c:223
msgid "Usage: passwd [username [password]]\n"
msgstr ""
-#: login-utils/passwd.c:226
+#: login-utils/passwd.c:224
msgid "Only root may use the one and two argument forms.\n"
msgstr ""
-#: login-utils/passwd.c:282
+#: login-utils/passwd.c:280
msgid "Usage: passwd [-foqsvV] [user [password]]\n"
msgstr ""
-#: login-utils/passwd.c:302
+#: login-utils/passwd.c:301
#, c-format
msgid "Can't exec %s: %s\n"
msgstr ""
-#: login-utils/passwd.c:313
+#: login-utils/passwd.c:312
msgid "Cannot find login name"
msgstr ""
-#: login-utils/passwd.c:320 login-utils/passwd.c:327
+#: login-utils/passwd.c:319 login-utils/passwd.c:326
msgid "Only root can change the password for others.\n"
msgstr ""
-#: login-utils/passwd.c:335
+#: login-utils/passwd.c:334
msgid "Too many arguments.\n"
msgstr ""
-#: login-utils/passwd.c:340
+#: login-utils/passwd.c:339
#, c-format
msgid "Can't find username anywhere. Is `%s' really a user?"
msgstr ""
-#: login-utils/passwd.c:344
+#: login-utils/passwd.c:343
msgid "Sorry, I can only change local passwords. Use yppasswd instead."
msgstr ""
-#: login-utils/passwd.c:350
+#: login-utils/passwd.c:349
msgid "UID and username does not match, imposter!"
msgstr ""
-#: login-utils/passwd.c:355
+#: login-utils/passwd.c:354
#, c-format
msgid "Changing password for %s\n"
msgstr ""
-#: login-utils/passwd.c:359
+#: login-utils/passwd.c:358
msgid "Enter old password: "
msgstr ""
-#: login-utils/passwd.c:361
+#: login-utils/passwd.c:360
msgid "Illegal password, imposter."
msgstr ""
-#: login-utils/passwd.c:373
+#: login-utils/passwd.c:372
msgid "Enter new password: "
msgstr ""
-#: login-utils/passwd.c:375
+#: login-utils/passwd.c:374
msgid "Password not changed."
msgstr ""
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:384
msgid "Re-type new password: "
msgstr ""
-#: login-utils/passwd.c:388
+#: login-utils/passwd.c:387
msgid "You misspelled it. Password not changed."
msgstr ""
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:402
#, c-format
msgid "password changed, user %s"
msgstr ""
-#: login-utils/passwd.c:406
+#: login-utils/passwd.c:405
msgid "ROOT PASSWORD CHANGED"
msgstr ""
-#: login-utils/passwd.c:408
+#: login-utils/passwd.c:407
#, c-format
msgid "password changed by root, user %s"
msgstr ""
-#: login-utils/passwd.c:415
+#: login-utils/passwd.c:414
msgid "calling setpwnam to set password.\n"
msgstr ""
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:418
msgid "Password *NOT* changed. Try again later.\n"
msgstr ""
-#: login-utils/passwd.c:425
+#: login-utils/passwd.c:424
msgid "Password changed.\n"
msgstr ""
@@ -4888,11 +5589,7 @@ msgid "%s: Only root can shut a system down.\n"
msgstr ""
#: login-utils/shutdown.c:219
-msgid "That must be tomorrow, "
-msgstr ""
-
-#: login-utils/shutdown.c:220
-msgid "can't you wait till then?\n"
+msgid "That must be tomorrow, can't you wait till then?\n"
msgstr ""
#: login-utils/shutdown.c:271
@@ -4926,94 +5623,91 @@ msgid "halted"
msgstr ""
#. RB_AUTOBOOT
-#: login-utils/shutdown.c:369
+#: login-utils/shutdown.c:377
msgid ""
"\n"
"Why am I still alive after reboot?"
msgstr ""
-#: login-utils/shutdown.c:371
+#: login-utils/shutdown.c:379
msgid ""
"\n"
"Now you can turn off the power..."
msgstr ""
-#: login-utils/shutdown.c:386
+#: login-utils/shutdown.c:394
msgid "Calling kernel power-off facility...\n"
msgstr ""
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:397
#, c-format
msgid "Error powering off\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:405
#, c-format
msgid "Executing the program \"%s\" ...\n"
msgstr ""
-#: login-utils/shutdown.c:400
+#: login-utils/shutdown.c:408
#, c-format
msgid "Error executing\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:423
+#: login-utils/shutdown.c:431
#, c-format
msgid "URGENT: broadcast message from %s:"
msgstr ""
-#: login-utils/shutdown.c:429
+#: login-utils/shutdown.c:437
msgid "System going down IMMEDIATELY!\n"
msgstr ""
-#: login-utils/shutdown.c:432
+#: login-utils/shutdown.c:440
#, c-format
msgid "System going down in %d hour%s %d minutes"
msgstr ""
-#: login-utils/shutdown.c:435
+#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+msgid "s"
+msgstr ""
+
+#: login-utils/shutdown.c:443
#, c-format
msgid "System going down in %d minute%s\n"
msgstr ""
-#: login-utils/shutdown.c:441
+#: login-utils/shutdown.c:449
#, c-format
msgid "\t... %s ...\n"
msgstr ""
-#: login-utils/shutdown.c:498
-msgid "Cannot fork for swapoff. Shrug!"
-msgstr ""
-
#: login-utils/shutdown.c:506
-msgid "Cannot exec swapoff, "
+msgid "Cannot fork for swapoff. Shrug!"
msgstr ""
-#: login-utils/shutdown.c:507
-msgid "hoping umount will do the trick."
+#: login-utils/shutdown.c:514
+msgid "Cannot exec swapoff, hoping umount will do the trick."
msgstr ""
-#: login-utils/shutdown.c:525
+#: login-utils/shutdown.c:533
msgid "Cannot fork for umount, trying manually."
msgstr ""
-#: login-utils/shutdown.c:531
-msgid "Cannot exec "
-msgstr ""
-
-#: login-utils/shutdown.c:531
-msgid ", trying umount."
+#: login-utils/shutdown.c:542
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
msgstr ""
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:546
msgid "Cannot exec umount, giving up on umount."
msgstr ""
-#: login-utils/shutdown.c:538
+#: login-utils/shutdown.c:551
msgid "Unmounting any remaining filesystems..."
msgstr ""
-#: login-utils/shutdown.c:574
+#: login-utils/shutdown.c:587
#, c-format
msgid "shutdown: Couldn't umount %s\n"
msgstr ""
@@ -5052,7 +5746,7 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:302 text-utils/more.c:1469
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
msgid "exec failed\n"
msgstr ""
@@ -5065,114 +5759,102 @@ msgstr "Kan schijf niet openen"
msgid "no TERM or cannot stat tty\n"
msgstr ""
-#: login-utils/ttymsg.c:79
+#: login-utils/ttymsg.c:81
msgid "too many iov's (change code in wall/ttymsg.c)"
msgstr ""
-#. A slash is an attempt to break security...
-#: login-utils/ttymsg.c:83
-#, c-format
-msgid "'/' in \"%s\""
-msgstr ""
-
-#: login-utils/ttymsg.c:88
+#: login-utils/ttymsg.c:91
msgid "excessively long line arg"
msgstr ""
-#: login-utils/ttymsg.c:142
+#: login-utils/ttymsg.c:145
msgid "cannot fork"
msgstr ""
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:149
#, c-format
msgid "fork: %s"
msgstr ""
-#: login-utils/ttymsg.c:172
+#: login-utils/ttymsg.c:177
#, c-format
msgid "%s: BAD ERROR"
msgstr ""
-#: login-utils/vipw.c:147
+#: login-utils/vipw.c:149
#, c-format
msgid "%s: the %s file is busy.\n"
msgstr ""
-#: login-utils/vipw.c:163
+#: login-utils/vipw.c:165
#, c-format
msgid "%s: the %s file is busy (%s present)\n"
msgstr ""
-#: login-utils/vipw.c:168
+#: login-utils/vipw.c:171
#, c-format
msgid "%s: can't link %s: %s\n"
msgstr ""
-#: login-utils/vipw.c:188
+#: login-utils/vipw.c:193
#, c-format
msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
msgstr ""
-#: login-utils/vipw.c:212
+#: login-utils/vipw.c:217
#, c-format
msgid "%s: Cannot fork\n"
msgstr ""
-#: login-utils/vipw.c:252
+#: login-utils/vipw.c:257
#, fuzzy, c-format
msgid "%s: %s unchanged\n"
msgstr "De schijfinhoud is gewijzigd.\n"
-#: login-utils/vipw.c:295
+#: login-utils/vipw.c:300
#, c-format
msgid "%s: no changes made\n"
msgstr ""
-#: login-utils/wall.c:104
-msgid "usage: wall [file]\n"
-msgstr ""
+#: login-utils/wall.c:103
+#, fuzzy, c-format
+msgid "usage: %s [file]\n"
+msgstr "aanroep: %s [ -n ] apparaat\n"
-#: login-utils/wall.c:115
-#, c-format
-msgid "wall: cannot read %s.\n"
-msgstr ""
+#: login-utils/wall.c:151
+#, fuzzy, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "Kan het bestand '%s' niet openen"
-#: login-utils/wall.c:132
+#: login-utils/wall.c:178
#, c-format
-msgid "wall: %s\n"
+msgid "Broadcast Message from %s@%s"
msgstr ""
-#: login-utils/wall.c:154
-msgid "wall: can't open temporary file.\n"
-msgstr ""
+#: login-utils/wall.c:188
+#, fuzzy, c-format
+msgid "%s: can't read %s.\n"
+msgstr "Kan het bestand '%s' niet openen"
-#: login-utils/wall.c:181
+#: login-utils/wall.c:213
#, c-format
-msgid "Broadcast Message from %s@%s"
+msgid "%s: can't stat temporary file.\n"
msgstr ""
-#: login-utils/wall.c:191
+#: login-utils/wall.c:222
#, c-format
-msgid "wall: can't read %s.\n"
-msgstr ""
-
-#: login-utils/wall.c:216
-msgid "wall: can't stat temporary file.\n"
-msgstr ""
-
-#: login-utils/wall.c:225
-msgid "wall: can't read temporary file.\n"
+msgid "%s: can't read temporary file.\n"
msgstr ""
-#: misc-utils/cal.c:198
+#: misc-utils/cal.c:184
msgid "illegal month value: use 1-12"
msgstr ""
-#: misc-utils/cal.c:202
+#: misc-utils/cal.c:188
msgid "illegal year value: use 1-9999"
msgstr ""
-#: misc-utils/cal.c:498
+#: misc-utils/cal.c:484
msgid "usage: cal [-mjy] [[month] year]\n"
msgstr ""
@@ -5211,44 +5893,36 @@ msgstr ""
msgid " %s -l [ signal ]\n"
msgstr ""
-#: misc-utils/logger.c:135
+#: misc-utils/logger.c:144
#, c-format
msgid "logger: %s: %s.\n"
msgstr ""
-#: misc-utils/logger.c:232
+#: misc-utils/logger.c:241
#, c-format
msgid "logger: unknown facility name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:244
+#: misc-utils/logger.c:253
#, c-format
msgid "logger: unknown priority name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:271
-msgid "logger: [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-
-#: misc-utils/look.c:170 misc-utils/setterm.c:1153 text-utils/more.c:1782
-#: text-utils/more.c:1793
-msgid "Out of memory"
+#: misc-utils/logger.c:280
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr ""
#: misc-utils/look.c:340
msgid "usage: look [-dfa] [-t char] string [file]\n"
msgstr ""
-#: misc-utils/look.c:365
-msgid "look: "
-msgstr ""
-
-#: misc-utils/mcookie.c:95 misc-utils/mcookie.c:120
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
#, fuzzy, c-format
msgid "Could not open %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: misc-utils/mcookie.c:103 misc-utils/mcookie.c:117
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
#, c-format
msgid "Got %d bytes from %s\n"
msgstr ""
@@ -5294,37 +5968,37 @@ msgstr ""
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr ""
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
msgid "usage: script [-a] [file]\n"
msgstr ""
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, c-format
msgid "Script started, file is %s\n"
msgstr ""
-#: misc-utils/script.c:197
+#: misc-utils/script.c:198
#, c-format
msgid "Script started on %s"
msgstr ""
-#: misc-utils/script.c:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
"Script done on %s"
msgstr ""
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr ""
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr ""
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
msgid "Out of pty's\n"
msgstr ""
@@ -5334,11 +6008,6 @@ msgstr ""
msgid "%s: Argument error, usage\n"
msgstr ""
-#: misc-utils/setterm.c:747
-#, c-format
-msgid "%s\n"
-msgstr ""
-
#: misc-utils/setterm.c:748
msgid " [ -term terminal_name ]\n"
msgstr ""
@@ -5584,154 +6253,149 @@ msgstr ""
msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
msgstr ""
-#: misc-utils/write.c:101
+#: misc-utils/write.c:99
msgid "write: can't find your tty's name\n"
msgstr ""
-#: misc-utils/write.c:112
+#: misc-utils/write.c:110
msgid "write: you have write permission turned off.\n"
msgstr ""
-#: misc-utils/write.c:133
+#: misc-utils/write.c:131
#, c-format
msgid "write: %s is not logged in on %s.\n"
msgstr ""
-#: misc-utils/write.c:141
+#: misc-utils/write.c:139
#, c-format
msgid "write: %s has messages disabled on %s\n"
msgstr ""
-#: misc-utils/write.c:148
+#: misc-utils/write.c:146
msgid "usage: write user [tty]\n"
msgstr ""
-#: misc-utils/write.c:247
+#: misc-utils/write.c:245
#, c-format
msgid "write: %s is not logged in\n"
msgstr ""
-#: misc-utils/write.c:256
+#: misc-utils/write.c:254
#, c-format
msgid "write: %s has messages disabled\n"
msgstr ""
-#: misc-utils/write.c:260
+#: misc-utils/write.c:258
#, c-format
msgid "write: %s is logged in more than once; writing to %s\n"
msgstr ""
-#: misc-utils/write.c:327
+#: misc-utils/write.c:325
#, c-format
msgid "Message from %s@%s on %s at %s ..."
msgstr ""
-#: mount/fstab.c:113
+#: mount/fstab.c:116
#, c-format
msgid "warning: error reading %s: %s"
msgstr ""
-#: mount/fstab.c:140 mount/fstab.c:162
+#: mount/fstab.c:143 mount/fstab.c:166
#, c-format
msgid "warning: can't open %s: %s"
msgstr ""
-#: mount/fstab.c:144
+#: mount/fstab.c:147
#, c-format
msgid "mount: could not open %s - using %s instead\n"
msgstr ""
-#. MOUNTLOCK_LINKTARGET does not exist (as a file)
+#. 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:346
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:358
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:369
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:383
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr ""
-#: mount/fstab.c:392
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr ""
-#: mount/fstab.c:394
+#: mount/fstab.c:427
msgid "timed out"
msgstr ""
-#: mount/fstab.c:438
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr ""
-#: mount/fstab.c:445
-#, c-format
-msgid "can't open %s (%s) - mtab not updated"
-msgstr ""
-
-#: mount/fstab.c:470
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr ""
-#: mount/fstab.c:475
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr ""
-#: mount/fstab.c:482 mount/fstab.c:486
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr ""
-#: mount/fstab.c:491
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr ""
-#: mount/fstab.c:496
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr ""
-#: mount/lomount.c:75
+#: mount/lomount.c:78
#, c-format
msgid "loop: can't open device %s: %s\n"
msgstr ""
-#: mount/lomount.c:80
+#: mount/lomount.c:84
#, c-format
msgid "loop: can't get info on device %s: %s\n"
msgstr ""
-#: mount/lomount.c:85 mount/losetup.c:74
+#: mount/lomount.c:89 mount/losetup.c:74
#, c-format
msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
msgstr ""
-#: mount/lomount.c:139
+#: mount/lomount.c:143
msgid "mount: could not find any device /dev/loop#"
msgstr ""
-#: mount/lomount.c:143
+#: mount/lomount.c:147
msgid ""
"mount: Could not find any loop device.\n"
" Maybe /dev/loop# has a wrong major number?"
msgstr ""
-#: mount/lomount.c:147
+#: mount/lomount.c:151
#, c-format
msgid ""
"mount: Could not find any loop device, and, according to %s,\n"
@@ -5739,52 +6403,52 @@ msgid ""
" (If so, then recompile or `insmod loop.o'.)"
msgstr ""
-#: mount/lomount.c:152
+#: mount/lomount.c:156
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/lomount.c:156
+#: mount/lomount.c:160
msgid "mount: could not find any free loop device"
msgstr ""
-#: mount/lomount.c:187 mount/losetup.c:106
+#: mount/lomount.c:191 mount/losetup.c:106
#, c-format
msgid "Unsupported encryption type %s\n"
msgstr ""
-#: mount/lomount.c:206 mount/losetup.c:125
+#: mount/lomount.c:210 mount/losetup.c:125
msgid "Init (up to 16 hex digits): "
msgstr ""
-#: mount/lomount.c:213 mount/losetup.c:132
+#: mount/lomount.c:217 mount/losetup.c:132
#, c-format
msgid "Non-hex digit '%c'.\n"
msgstr ""
-#: mount/lomount.c:219 mount/losetup.c:138
+#: mount/lomount.c:223 mount/losetup.c:138
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr ""
-#: mount/lomount.c:235
+#: mount/lomount.c:239
#, c-format
msgid "set_loop(%s,%s,%d): success\n"
msgstr ""
-#: mount/lomount.c:245
+#: mount/lomount.c:250
#, c-format
msgid "loop: can't delete device %s: %s\n"
msgstr ""
-#: mount/lomount.c:255
+#: mount/lomount.c:260
#, c-format
msgid "del_loop(%s): success\n"
msgstr ""
-#: mount/lomount.c:263
+#: mount/lomount.c:268
msgid "This mount was compiled without loop support. Please recompile.\n"
msgstr ""
@@ -5810,298 +6474,305 @@ msgstr ""
msgid "[mntent]: warning: no final newline at the end of %s\n"
msgstr ""
-#: mount/mntent.c:214
+#: mount/mntent.c:216
#, c-format
msgid "[mntent]: line %d in %s is bad%s\n"
msgstr ""
-#: mount/mntent.c:217
+#: mount/mntent.c:219
msgid "; rest of file ignored"
msgstr ""
-#: mount/mount.c:319
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:322
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:342
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:355 mount/mount.c:597
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:360
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:434
+#: mount/mount.c:473
msgid "mount failed"
msgstr ""
-#: mount/mount.c:436
+#: mount/mount.c:475
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr ""
-#: mount/mount.c:461
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:467
+#: mount/mount.c:509
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:479
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:488
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:492
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:496
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:509
+#: mount/mount.c:551
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
-#: mount/mount.c:557 mount/mount.c:969
+#: mount/mount.c:601 mount/mount.c:1026
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:593
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:619
+#: mount/mount.c:667
msgid "mount: you must specify the filesystem type"
msgstr ""
-#: mount/mount.c:626 mount/mount.c:660
+#: mount/mount.c:674 mount/mount.c:709
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:628
+#: mount/mount.c:676
msgid "mount: permission denied"
msgstr ""
-#: mount/mount.c:630
+#: mount/mount.c:678
msgid "mount: must be superuser to use mount"
msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:634 mount/mount.c:638
+#: mount/mount.c:682 mount/mount.c:686
#, c-format
msgid "mount: %s is busy"
msgstr ""
#. no
#. yes, don't mention it
-#: mount/mount.c:640
+#: mount/mount.c:688
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:642
+#: mount/mount.c:690
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:648
+#: mount/mount.c:696
#, c-format
msgid "mount: mount point %s does not exist"
msgstr ""
-#: mount/mount.c:650
+#: mount/mount.c:698
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:653
+#: mount/mount.c:701
#, c-format
msgid "mount: special device %s does not exist"
msgstr ""
-#: mount/mount.c:666
+#: mount/mount.c:711
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+" (a path prefix is not a directory)\n"
+msgstr ""
+
+#: mount/mount.c:723
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:668
+#: mount/mount.c:725
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" or too many mounted file systems"
msgstr ""
-#: mount/mount.c:683
+#: mount/mount.c:740
msgid "mount table full"
msgstr ""
-#: mount/mount.c:685
+#: mount/mount.c:742
#, c-format
msgid "mount: %s: can't read superblock"
msgstr ""
-#: mount/mount.c:688
+#: mount/mount.c:745
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr ""
-#: mount/mount.c:693
+#: mount/mount.c:750
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
-#: mount/mount.c:705
+#: mount/mount.c:762
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:707
+#: mount/mount.c:764
msgid "mount: maybe you meant iso9660 ?"
msgstr ""
-#: mount/mount.c:710
+#: mount/mount.c:767
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
#. strange ...
-#: mount/mount.c:715
+#: mount/mount.c:772
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:717
+#: mount/mount.c:774
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
" (maybe `insmod driver'?)"
msgstr ""
-#: mount/mount.c:720
+#: mount/mount.c:777
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:723
+#: mount/mount.c:780
#, c-format
msgid "mount: %s is not a block device"
msgstr ""
-#: mount/mount.c:726
+#: mount/mount.c:783
#, c-format
msgid "mount: %s is not a valid block device"
msgstr ""
-#: mount/mount.c:730
+#: mount/mount.c:787
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr ""
-#: mount/mount.c:747
+#: mount/mount.c:803
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:748
+#: mount/mount.c:804
msgid "block device "
msgstr ""
-#: mount/mount.c:834
+#: mount/mount.c:890
#, c-format
msgid "mount: consider mounting %s by %s\n"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:891
msgid "UUID"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:891
#, fuzzy
msgid "label"
msgstr "Tabel"
-#: mount/mount.c:837 mount/mount.c:1151
+#: mount/mount.c:893 mount/mount.c:1209
msgid "mount: no such partition found"
msgstr ""
-#: mount/mount.c:845
+#: mount/mount.c:901
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
#.
#. * Retry in the background.
#.
-#: mount/mount.c:861
+#: mount/mount.c:917
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr ""
-#: mount/mount.c:872
+#: mount/mount.c:928
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr ""
-#: mount/mount.c:921
+#: mount/mount.c:977
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1030
+#: mount/mount.c:1088
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 ."
+" A special device can be indicated by -L label or -U uuid .\n"
msgstr ""
-#: mount/mount.c:1136
+#: mount/mount.c:1194
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:1141
+#: mount/mount.c:1199
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1153
+#: mount/mount.c:1211
#, c-format
msgid "mount: mounting %s\n"
msgstr ""
-#: mount/mount.c:1162
+#: mount/mount.c:1220
msgid "not mounted anything"
msgstr ""
-#: mount/mount.c:1175
+#: mount/mount.c:1233
#, c-format
msgid "mount: cannot find %s in %s"
msgstr ""
-#: mount/mount.c:1189
+#: mount/mount.c:1247
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr ""
@@ -6110,17 +6781,17 @@ msgstr ""
msgid "mount: bad UUID"
msgstr ""
-#: mount/mount_guess_fstype.c:186
+#: mount/mount_guess_fstype.c:195
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:189
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:191
+#: mount/mount_guess_fstype.c:200
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
@@ -6172,10 +6843,6 @@ msgstr ""
msgid "unknown nfs mount option: %s%s\n"
msgstr ""
-#: mount/nfsmount.c:349
-msgid "no"
-msgstr ""
-
#: mount/nfsmount.c:426
msgid "mount: got bad hp->h_length?\n"
msgstr ""
@@ -6223,7 +6890,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr ""
-#: mount/swapon.c:49
+#: mount/swapon.c:51
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -6232,27 +6899,27 @@ msgid ""
" %s [-s]\n"
msgstr ""
-#: mount/swapon.c:86
+#: mount/swapon.c:88
#, c-format
msgid "%s on %s\n"
msgstr ""
-#: mount/swapon.c:90
+#: mount/swapon.c:93
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr ""
-#: mount/swapon.c:95
+#: mount/swapon.c:100
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
msgstr ""
-#: mount/swapon.c:103
+#: mount/swapon.c:108
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr ""
-#: mount/swapon.c:204
+#: mount/swapon.c:213
#, fuzzy, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "Kan het bestand '%s' niet openen"
@@ -6376,22 +7043,22 @@ msgstr ""
msgid "umount: it seems %s is mounted multiple times"
msgstr ""
-#: mount/umount.c:480
+#: mount/umount.c:490
#, c-format
msgid "umount: %s is not in the fstab (and you are not root)"
msgstr ""
-#: mount/umount.c:486
+#: mount/umount.c:493
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr ""
-#: mount/umount.c:505
+#: mount/umount.c:514
#, c-format
msgid "umount: only root can unmount %s from %s"
msgstr ""
-#: mount/umount.c:515
+#: mount/umount.c:525
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr ""
@@ -6404,14 +7071,14 @@ msgstr ""
msgid "Usage: ctrlaltdel hard|soft\n"
msgstr ""
-#: sys-utils/cytune.c:116
+#: sys-utils/cytune.c:118
#, 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 ""
-#: sys-utils/cytune.c:127
+#: sys-utils/cytune.c:129
#, c-format
msgid ""
"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -6419,117 +7086,117 @@ msgid ""
"and the maximum transfer rate in characters/second was %f\n"
msgstr ""
-#: sys-utils/cytune.c:194
+#: sys-utils/cytune.c:196
#, c-format
msgid "Invalid interval value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:202
+#: sys-utils/cytune.c:204
#, c-format
msgid "Invalid set value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:210
+#: sys-utils/cytune.c:212
#, c-format
msgid "Invalid default value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:218
+#: sys-utils/cytune.c:220
#, c-format
msgid "Invalid set time value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:226
+#: sys-utils/cytune.c:228
#, c-format
msgid "Invalid default time value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:243
+#: sys-utils/cytune.c:245
#, c-format
msgid ""
"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
"[-g|-G] file [file...]\n"
msgstr ""
-#: sys-utils/cytune.c:254 sys-utils/cytune.c:270 sys-utils/cytune.c:287
-#: sys-utils/cytune.c:332
+#: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
+#: sys-utils/cytune.c:342
#, fuzzy, c-format
msgid "Can't open %s: %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: sys-utils/cytune.c:260
+#: sys-utils/cytune.c:264
#, c-format
msgid "Can't set %s to threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:276
+#: sys-utils/cytune.c:282
#, c-format
msgid "Can't set %s to time threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:291 sys-utils/cytune.c:342 sys-utils/cytune.c:370
+#: sys-utils/cytune.c:299 sys-utils/cytune.c:354 sys-utils/cytune.c:385
#, c-format
msgid "Can't get threshold for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:296 sys-utils/cytune.c:347 sys-utils/cytune.c:375
+#: sys-utils/cytune.c:305 sys-utils/cytune.c:360 sys-utils/cytune.c:391
#, c-format
msgid "Can't get timeout for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:300
+#: sys-utils/cytune.c:309
#, c-format
msgid "%s: %ld %s threshold and %ld %s timeout\n"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "current"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "default"
msgstr ""
-#: sys-utils/cytune.c:321
+#: sys-utils/cytune.c:330
msgid "Can't set signal handler"
msgstr ""
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:356
+#: sys-utils/cytune.c:334 sys-utils/cytune.c:369
msgid "gettimeofday failed"
msgstr ""
-#: sys-utils/cytune.c:336 sys-utils/cytune.c:365
+#: sys-utils/cytune.c:347 sys-utils/cytune.c:379
#, c-format
msgid "Can't issue CYGETMON on %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:405
+#: sys-utils/cytune.c:421
#, c-format
msgid "%s: %lu ints, %lu/%lu chars; "
msgstr ""
-#: sys-utils/cytune.c:406
+#: sys-utils/cytune.c:422
#, c-format
msgid "fifo: %lu thresh, %lu tmout, "
msgstr ""
-#: sys-utils/cytune.c:407
+#: sys-utils/cytune.c:423
#, c-format
msgid "%lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:428
#, c-format
msgid " %f int/sec; %f rec, %f send (char/sec)\n"
msgstr ""
-#: sys-utils/cytune.c:417
+#: sys-utils/cytune.c:433
#, c-format
msgid ""
"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:422
+#: sys-utils/cytune.c:438
#, c-format
msgid " %f int/sec; %f rec (char/sec)\n"
msgstr ""
@@ -7090,21 +7757,6 @@ msgstr ""
msgid "pid"
msgstr ""
-#: sys-utils/kbdrate.c:126
-#, c-format
-msgid "util-linux kbdrate %s \n"
-msgstr ""
-
-#: sys-utils/kbdrate.c:159 sys-utils/kbdrate.c:206
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d mS)\n"
-msgstr ""
-
-#: sys-utils/kbdrate.c:182
-#, fuzzy
-msgid "Cannot open /dev/port"
-msgstr "Kan schijf niet openen"
-
#: sys-utils/rdev.c:68
msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr ""
@@ -7163,7 +7815,7 @@ msgstr ""
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr ""
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -7176,49 +7828,46 @@ msgid ""
"\t -V print version and exit\n"
msgstr ""
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
msgstr ""
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
msgstr ""
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr ""
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr ""
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
msgstr ""
-#: sys-utils/readprofile.c:221
+#: sys-utils/readprofile.c:226
#, fuzzy
msgid "total"
msgstr "Startbaar"
-#: sys-utils/renice.c:66
-msgid "usage: renice priority [ [ -p ] pids ] "
-msgstr ""
-
#: sys-utils/renice.c:67
-msgid "[ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
msgstr ""
-#: sys-utils/renice.c:93
+#: sys-utils/renice.c:94
#, c-format
msgid "renice: %s: unknown user\n"
msgstr ""
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:102
#, c-format
msgid "renice: %s: bad value\n"
msgstr ""
@@ -7241,101 +7890,102 @@ msgstr ""
msgid "usage: %s program [arg ...]\n"
msgstr ""
-#: sys-utils/tunelp.c:77
+#: sys-utils/tunelp.c:74
#, 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"
+" -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+" -T [on|off] ]\n"
msgstr ""
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
msgid "malloc error"
msgstr ""
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
msgstr ""
-#: sys-utils/tunelp.c:140
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
msgstr ""
-#: sys-utils/tunelp.c:239
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
msgstr ""
-#: sys-utils/tunelp.c:240
+#: sys-utils/tunelp.c:261
msgid ", busy"
msgstr ""
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:262
msgid ", ready"
msgstr ""
-#: sys-utils/tunelp.c:242
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
msgstr ""
-#: sys-utils/tunelp.c:243
+#: sys-utils/tunelp.c:264
msgid ", on-line"
msgstr ""
-#: sys-utils/tunelp.c:244
+#: sys-utils/tunelp.c:265
msgid ", error"
msgstr ""
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
msgstr ""
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
msgstr ""
-#: sys-utils/tunelp.c:269
+#: sys-utils/tunelp.c:290
#, c-format
msgid "%s using polling\n"
msgstr ""
-#: text-utils/col.c:154
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
msgstr ""
-#: text-utils/col.c:515
+#: text-utils/col.c:516
msgid "usage: col [-bfx] [-l nline]\n"
msgstr ""
-#: text-utils/col.c:521
+#: text-utils/col.c:522
msgid "col: write error.\n"
msgstr ""
-#: text-utils/col.c:528
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
msgstr ""
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "past first line"
msgstr ""
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "-- line already flushed"
msgstr ""
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr ""
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
msgstr ""
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr ""
@@ -7352,15 +8002,12 @@ msgid ""
"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
msgstr ""
-#: text-utils/more.c:247
-msgid "usage: "
-msgstr ""
-
-#: text-utils/more.c:249
-msgid " [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+#: text-utils/more.c:329
+#, c-format
+msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
msgstr ""
-#: text-utils/more.c:423
+#: text-utils/more.c:504
#, c-format
msgid ""
"\n"
@@ -7369,7 +8016,7 @@ msgid ""
msgstr ""
#. simple ELF detection
-#: text-utils/more.c:462
+#: text-utils/more.c:543
#, c-format
msgid ""
"\n"
@@ -7377,109 +8024,109 @@ msgid ""
"\n"
msgstr ""
-#: text-utils/more.c:566
+#: text-utils/more.c:647
msgid "[Use q or Q to quit]"
msgstr ""
-#: text-utils/more.c:752
+#: text-utils/more.c:833
msgid "--More--"
msgstr ""
-#: text-utils/more.c:754
+#: text-utils/more.c:835
#, c-format
msgid "(Next file: %s)"
msgstr ""
-#: text-utils/more.c:760
+#: text-utils/more.c:841
#, fuzzy
msgid "[Press space to continue, 'q' to quit.]"
msgstr "Sla een toets aan om verder te gaan"
-#: text-utils/more.c:1058
+#: text-utils/more.c:1139
#, c-format
msgid "...back %d page"
msgstr ""
-#: text-utils/more.c:1104
+#: text-utils/more.c:1185
#, c-format
msgid "...skipping %d line"
msgstr ""
-#: text-utils/more.c:1145
+#: text-utils/more.c:1226
msgid ""
"\n"
"***Back***\n"
"\n"
msgstr ""
-#: text-utils/more.c:1183
+#: text-utils/more.c:1264
#, fuzzy
msgid "Can't open help file"
msgstr "Kan het bestand '%s' niet openen"
-#: text-utils/more.c:1204 text-utils/more.c:1208
+#: text-utils/more.c:1285 text-utils/more.c:1289
msgid "[Press 'h' for instructions.]"
msgstr ""
-#: text-utils/more.c:1243
+#: text-utils/more.c:1324
#, c-format
msgid "\"%s\" line %d"
msgstr ""
-#: text-utils/more.c:1245
+#: text-utils/more.c:1326
#, c-format
msgid "[Not a file] line %d"
msgstr ""
-#: text-utils/more.c:1329
+#: text-utils/more.c:1410
msgid " Overflow\n"
msgstr ""
-#: text-utils/more.c:1376
+#: text-utils/more.c:1457
msgid "...skipping\n"
msgstr ""
-#: text-utils/more.c:1406
+#: text-utils/more.c:1487
msgid "Regular expression botch"
msgstr ""
-#: text-utils/more.c:1418
+#: text-utils/more.c:1499
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
-#: text-utils/more.c:1421
+#: text-utils/more.c:1502
msgid "Pattern not found"
msgstr ""
-#: text-utils/more.c:1483
+#: text-utils/more.c:1563
msgid "can't fork\n"
msgstr ""
-#: text-utils/more.c:1522
+#: text-utils/more.c:1602
msgid ""
"\n"
"...Skipping "
msgstr ""
-#: text-utils/more.c:1526
+#: text-utils/more.c:1606
msgid "...Skipping "
msgstr ""
-#: text-utils/more.c:1527
+#: text-utils/more.c:1607
msgid "to file "
msgstr ""
-#: text-utils/more.c:1527
+#: text-utils/more.c:1607
msgid "back to file "
msgstr ""
-#: text-utils/more.c:1765
+#: text-utils/more.c:1846
msgid "Line too long"
msgstr ""
-#: text-utils/more.c:1809
+#: text-utils/more.c:1890
msgid "No previous command to substitute for"
msgstr ""
@@ -7527,36 +8174,57 @@ msgstr ""
msgid "hexdump: bad conversion character %%%s.\n"
msgstr ""
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
msgstr ""
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
msgstr ""
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
msgstr ""
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
msgstr ""
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
msgstr ""
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
msgstr ""
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
msgstr ""
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
msgstr ""
+
+#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+msgstr ""
+
+#: kbd/kbdrate.c:247
+#, fuzzy
+msgid "Cannot open /dev/port"
+msgstr "Kan schijf niet openen"
+
+#~ msgid "Cannot read disk drive geometry"
+#~ msgstr "Opvragen van de schijfgeometrie faalde"
+
+#, fuzzy
+#~ msgid "Using %s as default device!\n"
+#~ msgstr "%s: dit apparaat is geen floppy\n"
+
+#, fuzzy
+#~ msgid ", bootable"
+#~ msgstr "Startbaar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f423be796..514363ad5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.9h\n"
-"POT-Creation-Date: 1999-03-20 12:27-0300\n"
+"POT-Creation-Date: 1999-09-25 13:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
"Language-Team: pt_BR <pt@li.org>\n"
@@ -18,6 +18,498 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: mime\n"
+#: clock/cmos.c:146
+msgid "booted from MILO\n"
+msgstr ""
+
+#: clock/cmos.c:154
+msgid "Ruffian BCD clock\n"
+msgstr ""
+
+#: clock/cmos.c:170
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr ""
+
+#: clock/cmos.c:180
+msgid "funky TOY!\n"
+msgstr ""
+
+#: clock/cmos.c:234
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr ""
+
+#: clock/cmos.c:558
+#, fuzzy, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Năo foi possível abrir /dev/port"
+
+#: clock/cmos.c:565
+msgid "I failed to get permission because I didnt try.\n"
+msgstr ""
+
+#: clock/cmos.c:568
+#, c-format
+msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
+msgstr ""
+
+#: clock/cmos.c:571
+msgid "Probably you need root privileges.\n"
+msgstr ""
+
+#: clock/hwclock.c:253
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:255
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr ""
+
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop. The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:278
+msgid "Waiting for clock tick...\n"
+msgstr ""
+
+#: clock/hwclock.c:282
+msgid "...got clock tick\n"
+msgstr ""
+
+#: clock/hwclock.c:334
+#, c-format
+msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+
+#: clock/hwclock.c:343
+#, c-format
+msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:369
+#, c-format
+msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgstr ""
+
+#: clock/hwclock.c:395
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr ""
+
+#: clock/hwclock.c:401
+msgid "Clock not changed - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:449
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+
+#: clock/hwclock.c:473
+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 ""
+
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end. We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:485
+#, c-format
+msgid "%s %.6f seconds\n"
+msgstr ""
+
+#: clock/hwclock.c:519
+#, fuzzy
+msgid "No --date option specified.\n"
+msgstr "Nenhuma partiçăo definida\n"
+
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:524
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+
+#: clock/hwclock.c:530
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr ""
+
+#: clock/hwclock.c:534
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
+
+#: clock/hwclock.c:540
+#, c-format
+msgid "response from date command = %s\n"
+msgstr ""
+
+#: clock/hwclock.c:542
+#, 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 ""
+
+#: clock/hwclock.c:551
+#, c-format
+msgid ""
+"The date command issued by %s returnedsomething other than an integer where "
+"the convertedtime value was expected.\n"
+"The command was:\n"
+" %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+
+#: clock/hwclock.c:561
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr ""
+
+#: clock/hwclock.c:596
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+
+#: clock/hwclock.c:612
+msgid "Calling settimeofday:\n"
+msgstr ""
+
+#: clock/hwclock.c:613
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr ""
+
+#: clock/hwclock.c:615
+#, c-format
+msgid "\ttz.tz_minuteswest = %ld\n"
+msgstr ""
+
+#: clock/hwclock.c:618
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+
+#: clock/hwclock.c:630
+msgid "Must be superuser to set system clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:632
+msgid "settimeofday() failed"
+msgstr ""
+
+#: clock/hwclock.c:665
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+
+#: clock/hwclock.c:669
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+
+#: clock/hwclock.c:678
+#, c-format
+msgid ""
+"Clock drifted %d 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 ""
+
+#: clock/hwclock.c:729
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr ""
+
+#: clock/hwclock.c:731
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
+
+#: clock/hwclock.c:759
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr ""
+
+#: clock/hwclock.c:760
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+
+#: clock/hwclock.c:784
+msgid "Drift adjustment parameters not updated.\n"
+msgstr ""
+
+#: clock/hwclock.c:825
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+
+#: clock/hwclock.c:849
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:875
+#, fuzzy, c-format
+msgid "Using %s.\n"
+msgstr "%s em %s\n"
+
+#: clock/hwclock.c:877
+msgid "No usable clock interface found.\n"
+msgstr ""
+
+#: clock/hwclock.c:965
+msgid "Unable to set system clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:994
+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 ""
+
+#: clock/hwclock.c:1003
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1005
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr ""
+
+#: clock/hwclock.c:1008
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+
+#: clock/hwclock.c:1011
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr ""
+
+#: clock/hwclock.c:1014
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1094
+#, c-format
+msgid "%s takes no non-option arguments. You supplied %d.\n"
+msgstr ""
+
+#: clock/hwclock.c:1102
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+
+#: clock/hwclock.c:1115
+msgid "No usable set-to time. Cannot set clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1130
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1134
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+
+#: clock/hwclock.c:1150
+msgid ""
+"Cannot access the Hardware Clock via any known method. Use --debug option "
+"to see the details of our search for an access method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1164
+#, c-format
+msgid "%s: %s, errno=%d: %s.\n"
+msgstr ""
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr ""
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr ""
+
+#: clock/kd.c:65 clock/rtc.c:144
+msgid "Timed out waiting for time change.\n"
+msgstr ""
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr ""
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from /dev/tty1"
+msgstr ""
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr ""
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr ""
+
+#: clock/kd.c:161
+#, fuzzy
+msgid "Can't open /dev/tty1"
+msgstr "Năo foi possível abrir /dev/port"
+
+#: clock/rtc.c:98
+msgid "ioctl() to /dev/rtc to read the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:129
+msgid "Waiting in loop for time from /dev/rtc to change\n"
+msgstr ""
+
+#: clock/rtc.c:165 clock/rtc.c:222
+msgid "open() of /dev/rtc failed"
+msgstr ""
+
+#. This rtc device doesn't have interrupt functions. This is typical
+#. on an Alpha, where the Hardware Clock interrupts are used by the
+#. kernel for the system clock, so aren't at the user's disposal.
+#.
+#: clock/rtc.c:182
+msgid "/dev/rtc does not have interrupt functions. "
+msgstr ""
+
+#: clock/rtc.c:191
+msgid "read() to /dev/rtc to wait for clock tick failed"
+msgstr ""
+
+#: clock/rtc.c:199
+msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+msgstr ""
+
+#: clock/rtc.c:202
+msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+msgstr ""
+
+#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
+#, fuzzy
+msgid "Unable to open /dev/rtc"
+msgstr "Năo foi possível abrir /dev/port"
+
+#: clock/rtc.c:268
+msgid "ioctl() to /dev/rtc to set the time failed.\n"
+msgstr ""
+
+#: clock/rtc.c:272
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr ""
+
+#: clock/rtc.c:302
+msgid "Open of /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:320 clock/rtc.c:365
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file /dev/rtc. This file does not "
+"exist on this system.\n"
+msgstr ""
+
+#: clock/rtc.c:331
+msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+msgstr ""
+
+#: clock/rtc.c:337
+#, c-format
+msgid "we have read epoch %ld from /dev/rtc 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.
+#: clock/rtc.c:357
+#, c-format
+msgid "The epoch value may not be less than 1900. You requested %ld\n"
+msgstr ""
+
+#: clock/rtc.c:374
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgstr ""
+
+#: clock/rtc.c:379
+msgid ""
+"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
+"ioctl.\n"
+msgstr ""
+
+#: clock/rtc.c:382
+msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+msgstr ""
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, fuzzy, c-format
+msgid "invalid number `%s'\n"
+msgstr "Valor inválido: %s\n"
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr ""
+
+#: clock/shhopt.c:398
+#, fuzzy, c-format
+msgid "unrecognized option `%s'\n"
+msgstr "Atençăo: Opçăo desconhecida para proto=.\n"
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr ""
+
+#: clock/shhopt.c:439
+#, fuzzy, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr "Atençăo: Opçăo desconhecida para proto=.\n"
+
#: disk-utils/fdformat.c:33
msgid "Formatting ... "
msgstr "Formatando... "
@@ -73,227 +565,339 @@ msgstr "Dupla face"
msgid "Single"
msgstr "Face única"
-#: disk-utils/fsck.minix.c:288
+#: disk-utils/fsck.minix.c:198
+#, fuzzy, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Uso: %s [ -p ] dispositivo\n"
+
+#: disk-utils/fsck.minix.c:296
#, c-format
msgid "%s is mounted.\t "
msgstr "%s está montado.\t "
-#: disk-utils/fsck.minix.c:290
+#: disk-utils/fsck.minix.c:298
msgid "Do you really want to continue"
msgstr "Vocę quer realmente continuar"
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:302
msgid "check aborted.\n"
msgstr "verificaçăo abortada.\n"
-#: disk-utils/fsck.minix.c:311 disk-utils/fsck.minix.c:331
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
msgid "Zone nr < FIRSTZONE in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:313 disk-utils/fsck.minix.c:333
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
msgid "Zone nr >= ZONES in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:338
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
msgid "Remove block"
msgstr ""
-#: disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:364
msgid "Read error: unable to seek to block in file '"
msgstr ""
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:370
msgid "Read error: bad block in file '"
msgstr ""
-#: disk-utils/fsck.minix.c:378
+#: disk-utils/fsck.minix.c:386
msgid ""
"Internal error: trying to write bad block\n"
"Write request ignored\n"
msgstr ""
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+msgid "seek failed in write_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:394
msgid "Write error: bad block in file '"
msgstr ""
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+msgid "unable to write super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:560
+msgid "unable to read super block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr ""
+
#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:615
msgid "Warning: Firstzone != Norm_firstzone\n"
msgstr ""
-#: disk-utils/fsck.minix.c:612 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
#, c-format
msgid "%ld inodes\n"
msgstr "%ld inodos\n"
-#: disk-utils/fsck.minix.c:613 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
#, c-format
msgid "%ld blocks\n"
msgstr "%ld blocos\n"
-#: disk-utils/fsck.minix.c:614 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
#, c-format
msgid "Firstdatazone=%ld (%ld)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:615 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
#, c-format
msgid "Zonesize=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:624
#, c-format
msgid "Maxsize=%ld\n"
msgstr "TamMáximo=%ld\n"
-#: disk-utils/fsck.minix.c:617
+#: disk-utils/fsck.minix.c:625
#, c-format
msgid "Filesystem state=%d\n"
msgstr "Estado do sistema de arquivos=%d\n"
-#: disk-utils/fsck.minix.c:618
+#: disk-utils/fsck.minix.c:626
#, c-format
msgid ""
"namelen=%d\n"
"\n"
msgstr ""
-#: disk-utils/fsck.minix.c:632 disk-utils/fsck.minix.c:684
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
#, c-format
msgid "Inode %d marked not used, but used for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:637 disk-utils/fsck.minix.c:688
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
msgid "Mark in use"
msgstr ""
-#: disk-utils/fsck.minix.c:659 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
#, c-format
msgid " has mode %05o\n"
msgstr ""
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:713
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
msgid "Warning: inode count too big.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:749 disk-utils/fsck.minix.c:783
+#: disk-utils/fsck.minix.c:734
+msgid "root inode isn't a directory"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
msgid "Block has been used before. Now in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:752 disk-utils/fsck.minix.c:786
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1123
-#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
+#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
+#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
msgid "Clear"
msgstr ""
-#: disk-utils/fsck.minix.c:761 disk-utils/fsck.minix.c:795
+#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
#, c-format
msgid "Block %d in file `"
msgstr ""
-#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
msgid "' is marked not in use."
msgstr ""
-#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:798
+#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
msgid "Correct"
msgstr ""
-#: disk-utils/fsck.minix.c:948 disk-utils/fsck.minix.c:1012
+#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
msgid " contains a bad inode number for file '"
msgstr ""
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1014
+#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
msgid " Remove"
msgstr ""
-#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1028
+#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
msgid ": bad directory: '.' isn't first\n"
msgstr ""
-#: disk-utils/fsck.minix.c:971 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
msgid ": bad directory: '..' isn't second\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1071
+#: disk-utils/fsck.minix.c:1076
+#, fuzzy
+msgid "internal error"
+msgstr "Erro interno\n"
+
+#: disk-utils/fsck.minix.c:1079
msgid ": bad directory: size<32"
msgstr ""
-#: disk-utils/fsck.minix.c:1090
+#: disk-utils/fsck.minix.c:1098
msgid ": bad directory: size < 32"
msgstr ""
-#: disk-utils/fsck.minix.c:1113 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1111
+msgid "seek failed in bad_zone"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
#, c-format
msgid "Inode %d mode not cleared."
msgstr ""
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
#, c-format
msgid "Inode %d not used, marked used in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
#, c-format
msgid "Inode %d used, marked unused in the bitmap."
msgstr ""
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
#, c-format
msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
msgstr ""
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
msgid "Set i_nlinks to count"
msgstr ""
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
#, c-format
msgid "Zone %d: marked in use, no file uses it."
msgstr ""
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
msgid "Unmark"
msgstr ""
-#: disk-utils/fsck.minix.c:1153 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
#, c-format
msgid "Zone %d: %sin use, counted=%d\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
msgid "not "
msgstr ""
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1190
msgid "Set"
msgstr ""
-#: disk-utils/fsck.minix.c:1296
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
+#: disk-utils/mkfs.minix.c:640
+msgid "bad inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1257
+msgid "bad v2 inode size"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1283
+msgid "need terminal for interactive repairs"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1287
+#, c-format
+msgid "unable to open '%s'"
+msgstr ""
+
+#: disk-utils/fsck.minix.c:1304
#, c-format
msgid "%s is clean, no check.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1300
+#: disk-utils/fsck.minix.c:1308
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1302
+#: disk-utils/fsck.minix.c:1310
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1331
+#: disk-utils/fsck.minix.c:1339
msgid ""
"\n"
"%6ld inodes used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1336
+#: disk-utils/fsck.minix.c:1344
msgid "%6ld zones used (%ld%%)\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1338
+#: disk-utils/fsck.minix.c:1346
#, c-format
msgid ""
"\n"
@@ -307,7 +911,7 @@ msgid ""
"%6d files\n"
msgstr ""
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1359
msgid ""
"----------------------------\n"
"FILE SYSTEM HAS BEEN CHANGED\n"
@@ -319,14 +923,15 @@ 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:80 fdisk/cfdisk.c:324 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:221 mount/sundries.c:192
+#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
+#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
#, c-format
msgid "%s: Out of memory!\n"
msgstr "%s: faltou memória!\n"
#: disk-utils/mkfs.c:89
-msgid "mkfs version "
+#, fuzzy, c-format
+msgid "mkfs version %s (%s)\n"
msgstr "mkfs versăo "
#: disk-utils/mkfs.minix.c:186
@@ -351,10 +956,6 @@ msgstr ""
msgid "seek failed in write_tables"
msgstr ""
-#: disk-utils/mkfs.minix.c:277
-msgid "unable to write super-block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:279
msgid "unable to write inode map"
msgstr ""
@@ -367,10 +968,6 @@ msgstr ""
msgid "unable to write inodes"
msgstr ""
-#: disk-utils/mkfs.minix.c:290
-msgid "seek failed in write_block"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:292
msgid "write failed in write_block"
msgstr ""
@@ -408,7 +1005,7 @@ msgstr ""
msgid "Weird values in do_check: probably bugs\n"
msgstr ""
-#: disk-utils/mkfs.minix.c:585
+#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
msgid "seek failed in check_blocks"
msgstr ""
@@ -429,10 +1026,6 @@ msgstr ""
msgid "can't open file of bad blocks"
msgstr ""
-#: disk-utils/mkfs.minix.c:637 disk-utils/mkfs.minix.c:640
-msgid "bad inode size"
-msgstr ""
-
#: disk-utils/mkfs.minix.c:669
#, c-format
msgid "%s: not compiled with minix v2 support\n"
@@ -457,42 +1050,71 @@ msgstr ""
msgid "will not try to make filesystem on '%s'"
msgstr ""
-#: disk-utils/mkswap.c:99
+#: disk-utils/mkswap.c:101
#, c-format
msgid "Assuming pages of size %d\n"
msgstr ""
-#: disk-utils/mkswap.c:191
-#, c-format
-msgid "%d bad page%s\n"
+#: disk-utils/mkswap.c:185
+#, fuzzy, c-format
+msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgstr "Uso: %s [-c] [-n nível] [-s tam_buffer]\n"
+
+#: disk-utils/mkswap.c:208
+#, fuzzy
+msgid "too many bad pages"
+msgstr "número excessivo de blocos ruins"
+
+#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1153
+#: text-utils/more.c:1863 text-utils/more.c:1874
+msgid "Out of memory"
+msgstr "faltou memória"
+
+#: disk-utils/mkswap.c:239
+#, fuzzy
+msgid "one bad page\n"
msgstr "%d páginas inválida%s\n"
-#: disk-utils/mkswap.c:191 login-utils/shutdown.c:433
-#: login-utils/shutdown.c:436
-msgid "s"
-msgstr ""
+#: disk-utils/mkswap.c:241
+#, fuzzy, c-format
+msgid "%d bad pages\n"
+msgstr "%d páginas inválida%s\n"
-#: disk-utils/mkswap.c:294
+#: disk-utils/mkswap.c:345
#, c-format
msgid "%s: error: Nowhere to set up swap on?\n"
msgstr ""
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:354
+#, c-format
+msgid "%s: error: size %ld is larger than device size %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:372
#, c-format
msgid "%s: error: unknown version %d\n"
msgstr ""
-#: disk-utils/mkswap.c:319
+#: disk-utils/mkswap.c:378
#, c-format
msgid "%s: error: swap area needs to be at least %ldkB\n"
msgstr ""
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:397
#, c-format
msgid "%s: warning: truncating swap area to %ldkB\n"
msgstr ""
-#: disk-utils/mkswap.c:353
+#: disk-utils/mkswap.c:409
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr ""
+
+#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+msgid "fatal: first page unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:424
#, c-format
msgid ""
"%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -501,11 +1123,27 @@ msgid ""
"the -f option to force it.\n"
msgstr ""
-#: disk-utils/mkswap.c:378
+#: disk-utils/mkswap.c:448
+msgid "Unable to set up swap-space: unreadable"
+msgstr ""
+
+#: disk-utils/mkswap.c:449
#, c-format
msgid "Setting up swapspace version %d, size = %ld bytes\n"
msgstr ""
+#: disk-utils/mkswap.c:455
+msgid "unable to rewind swap-device"
+msgstr ""
+
+#: disk-utils/mkswap.c:458
+msgid "unable to write signature page"
+msgstr ""
+
+#: disk-utils/mkswap.c:465
+msgid "fsync failed"
+msgstr ""
+
#: disk-utils/setfdprm.c:30
#, c-format
msgid "Invalid number: %s\n"
@@ -542,44 +1180,44 @@ msgstr ""
msgid " %s [ -c | -y | -n ] dev\n"
msgstr ""
-#: fdisk/cfdisk.c:349 fdisk/cfdisk.c:1764
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
msgid "Unusable"
msgstr ""
-#: fdisk/cfdisk.c:351 fdisk/cfdisk.c:1766
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
msgid "Free Space"
msgstr "Espaço Livre"
-#: fdisk/cfdisk.c:354
+#: fdisk/cfdisk.c:400
msgid "Linux ext2"
msgstr ""
#. also Solaris
-#: fdisk/cfdisk.c:356 fdisk/i386_sys_types.c:53
+#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
msgid "Linux"
msgstr ""
-#: fdisk/cfdisk.c:359
+#: fdisk/cfdisk.c:405
msgid "OS/2 HPFS"
msgstr ""
-#: fdisk/cfdisk.c:361
+#: fdisk/cfdisk.c:407
msgid "OS/2 IFS"
msgstr ""
-#: fdisk/cfdisk.c:365
+#: fdisk/cfdisk.c:411
msgid "NTFS"
msgstr ""
-#: fdisk/cfdisk.c:376
+#: fdisk/cfdisk.c:422
msgid "Disk has been changed.\n"
msgstr ""
-#: fdisk/cfdisk.c:377
+#: fdisk/cfdisk.c:423
msgid "Reboot the system to ensure the partition table is correctly updated.\n"
msgstr ""
-#: fdisk/cfdisk.c:380
+#: fdisk/cfdisk.c:426
msgid ""
"\n"
"WARNING: If you have created or modified any\n"
@@ -587,704 +1225,751 @@ msgid ""
"page for additional information.\n"
msgstr ""
-#: fdisk/cfdisk.c:475
+#: fdisk/cfdisk.c:521
msgid "FATAL ERROR"
msgstr ""
-#: fdisk/cfdisk.c:484
-msgid "Press any key to exit fdisk"
-msgstr ""
+#: fdisk/cfdisk.c:530
+#, fuzzy
+msgid "Press any key to exit cfdisk"
+msgstr "Pressione uma tecla para continuar"
-#: fdisk/cfdisk.c:520 fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
msgid "Cannot seek on disk drive"
msgstr ""
-#: fdisk/cfdisk.c:522
+#: fdisk/cfdisk.c:568
msgid "Cannot read disk drive"
msgstr ""
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:576
msgid "Cannot write disk drive"
msgstr ""
-#: fdisk/cfdisk.c:767
-msgid "Too many parts"
-msgstr "Número excessivo de partiçőes"
+#: fdisk/cfdisk.c:815
+#, fuzzy
+msgid "Too many partitions"
+msgstr "Número excessivo de partiçőes\n"
-#: fdisk/cfdisk.c:772
+#: fdisk/cfdisk.c:820
msgid "Partition begins before sector 0"
msgstr ""
-#: fdisk/cfdisk.c:777
+#: fdisk/cfdisk.c:825
msgid "Partition ends before sector 0"
msgstr ""
-#: fdisk/cfdisk.c:782
+#: fdisk/cfdisk.c:830
msgid "Partition begins after end-of-disk"
msgstr "A partiçăo começa depois do fim do disco"
-#: fdisk/cfdisk.c:787
+#: fdisk/cfdisk.c:835
msgid "Partition ends after end-of-disk"
msgstr "A partiçăo se estende até depois do fim do disco"
-#: fdisk/cfdisk.c:835
+#: fdisk/cfdisk.c:859
+msgid "logical partitions not in disk order"
+msgstr ""
+
+#: fdisk/cfdisk.c:862
+#, fuzzy
+msgid "logical partitions overlap"
+msgstr "Partiçăo lógica inválida"
+
+#: fdisk/cfdisk.c:864
+#, fuzzy
+msgid "enlarged logical partitions overlap"
+msgstr "Partiçăo lógica inválida"
+
+#: fdisk/cfdisk.c:894
msgid ""
"!!!! Internal error creating logical drive with no extended partition !!!!"
msgstr ""
-#: fdisk/cfdisk.c:846 fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
msgid ""
"Cannot create logical drive here -- would create two extended partitions"
msgstr ""
-#: fdisk/cfdisk.c:1002
+#: fdisk/cfdisk.c:1067
msgid "Menu item too long. Menu may look odd."
msgstr ""
-#: fdisk/cfdisk.c:1051
+#: fdisk/cfdisk.c:1123
msgid "Menu without direction. Defaulting horizontal."
msgstr ""
-#: fdisk/cfdisk.c:1166
+#: fdisk/cfdisk.c:1253
msgid "Illegal key"
msgstr ""
-#: fdisk/cfdisk.c:1189
+#: fdisk/cfdisk.c:1276
msgid "Press a key to continue"
msgstr "Pressione uma tecla para continuar"
-#: fdisk/cfdisk.c:1236 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2261
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
+#: fdisk/cfdisk.c:2398
msgid "Primary"
msgstr "Primária"
-#: fdisk/cfdisk.c:1236
+#: fdisk/cfdisk.c:1323
msgid "Create a new primary partition"
msgstr "Cria uma nova partiçăo primária"
-#: fdisk/cfdisk.c:1237 fdisk/cfdisk.c:1735 fdisk/cfdisk.c:2260
-#: fdisk/cfdisk.c:2263
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
+#: fdisk/cfdisk.c:2398
msgid "Logical"
msgstr "Lógica"
-#: fdisk/cfdisk.c:1237
+#: fdisk/cfdisk.c:1324
msgid "Create a new logical partition"
msgstr "Cria uma nova partiçăo lógica"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291 fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
msgid "Cancel"
msgstr "Cancelar"
-#: fdisk/cfdisk.c:1238 fdisk/cfdisk.c:1291
+#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
msgid "Don't create a partition"
msgstr "Năo crie a partiçăo"
-#: fdisk/cfdisk.c:1254
+#: fdisk/cfdisk.c:1341
msgid "!!! Internal error !!!"
msgstr "!!! Erro interno !!!"
-#: fdisk/cfdisk.c:1257
+#: fdisk/cfdisk.c:1344
msgid "Size (in MB): "
msgstr "Tamanho (em MB): "
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Beginning"
msgstr "Início"
-#: fdisk/cfdisk.c:1289
+#: fdisk/cfdisk.c:1378
msgid "Add partition at beginning of free space"
msgstr "Adicionar uma partiçăo no início do espaço livre"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "End"
msgstr "Fim"
-#: fdisk/cfdisk.c:1290
+#: fdisk/cfdisk.c:1379
msgid "Add partition at end of free space"
msgstr ""
-#: fdisk/cfdisk.c:1308
+#: fdisk/cfdisk.c:1397
msgid "No room to create the extended partition"
msgstr "Espaço insuficiente para criaçăo de partiçăo estendida"
-#: fdisk/cfdisk.c:1354
+#: fdisk/cfdisk.c:1436
+#, fuzzy
+msgid "Bad signature on partition table"
+msgstr " g criar uma tabela de partiçőes IRIX"
+
+#: fdisk/cfdisk.c:1474
+msgid "You specified more cylinders than fit on disk"
+msgstr ""
+
+#: fdisk/cfdisk.c:1504
msgid "Cannot open disk drive"
msgstr ""
-#: fdisk/cfdisk.c:1356 fdisk/cfdisk.c:1546
+#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
msgid "Opened disk read-only - you have no permission to write"
msgstr ""
-#: fdisk/cfdisk.c:1386
-msgid "Cannot read disk drive geometry"
+#: fdisk/cfdisk.c:1527
+#, fuzzy
+msgid "Cannot get disk size"
msgstr "Năo foi possível ler a geometria do disco"
-#: fdisk/cfdisk.c:1408
+#. avoid snprintf - it does not exist on ancient systems
+#: fdisk/cfdisk.c:1553
msgid "Bad primary partition"
msgstr "Partiçăo primária inválida"
-#: fdisk/cfdisk.c:1438
+#. avoid snprintf
+#: fdisk/cfdisk.c:1584
msgid "Bad logical partition"
msgstr "Partiçăo lógica inválida"
-#: fdisk/cfdisk.c:1558
+#: fdisk/cfdisk.c:1699
msgid "Warning!! This may destroy data on your disk!"
msgstr ""
-#: fdisk/cfdisk.c:1562
+#: fdisk/cfdisk.c:1703
msgid "Are you sure you want write the partition table to disk? (yes or no): "
msgstr ""
-#: fdisk/cfdisk.c:1571
+#: fdisk/cfdisk.c:1709
+msgid "no"
+msgstr ""
+
+#: fdisk/cfdisk.c:1710
msgid "Did not write partition table to disk"
msgstr "A tabela de partiçőes NĂO foi gravada no disco"
-#: fdisk/cfdisk.c:1579
+#: fdisk/cfdisk.c:1712
+msgid "yes"
+msgstr ""
+
+#: fdisk/cfdisk.c:1715
msgid "Please enter `yes' or `no'"
msgstr ""
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1719
msgid "Writing partition table to disk..."
msgstr "Gravando tabela de partiçőes no disco..."
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1612
+#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
msgid "Wrote partition table to disk"
msgstr "A tabela de partiçőes foi gravada no disco"
-#: fdisk/cfdisk.c:1610
+#: fdisk/cfdisk.c:1746
msgid ""
"Wrote partition table, but re-read table failed. Reboot to update table."
msgstr ""
-#: fdisk/cfdisk.c:1620
+#: fdisk/cfdisk.c:1756
msgid ""
"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
msgstr ""
-#: fdisk/cfdisk.c:1678 fdisk/cfdisk.c:1796 fdisk/cfdisk.c:1888
+#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
msgid "Enter filename or press RETURN to display on screen: "
msgstr ""
-#: fdisk/cfdisk.c:1686 fdisk/cfdisk.c:1804 fdisk/cfdisk.c:1896
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
#, c-format
msgid "Cannot open file '%s'"
msgstr ""
-#: fdisk/cfdisk.c:1697
+#: fdisk/cfdisk.c:1833
#, c-format
msgid "Disk Drive: %s\n"
msgstr "Disco: %s\n"
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1835
msgid "Sector 0:\n"
msgstr ""
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1842
#, c-format
msgid "Sector %d:\n"
msgstr ""
-#: fdisk/cfdisk.c:1726
+#: fdisk/cfdisk.c:1862
msgid " None "
msgstr ""
-#: fdisk/cfdisk.c:1728
+#: fdisk/cfdisk.c:1864
msgid " Pri/Log"
msgstr ""
-#: fdisk/cfdisk.c:1730
+#: fdisk/cfdisk.c:1866
msgid " Primary"
msgstr ""
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1868
msgid " Logical"
msgstr ""
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1770 fdisk/fdisk.c:1045 fdisk/fdisk.c:1194
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:644 fdisk/sfdisk.c:551
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
+#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
msgid "Unknown"
msgstr ""
-#: fdisk/cfdisk.c:1776
+#: fdisk/cfdisk.c:1912
#, c-format
msgid "Boot (%02X)"
msgstr ""
-#: fdisk/cfdisk.c:1778 fdisk/cfdisk.c:2269
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
#, c-format
msgid "Unknown (%02X)"
msgstr ""
-#: fdisk/cfdisk.c:1780
+#: fdisk/cfdisk.c:1916
#, c-format
msgid "None (%02X)"
msgstr ""
-#: fdisk/cfdisk.c:1815 fdisk/cfdisk.c:1907
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
#, c-format
msgid "Partition Table for %s\n"
msgstr ""
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1953
msgid " First Last\n"
msgstr ""
-#: fdisk/cfdisk.c:1818
+#: fdisk/cfdisk.c:1954
msgid ""
" # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n"
msgstr ""
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1955
msgid ""
"-- ------- -------- --------- ------ --------- ---------------------- "
"---------\n"
msgstr ""
-#: fdisk/cfdisk.c:1909
+#: fdisk/cfdisk.c:2037
msgid " ---Starting--- ----Ending---- Start Number of\n"
msgstr ""
-#: fdisk/cfdisk.c:1910
+#: fdisk/cfdisk.c:2038
msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n"
msgstr ""
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:2039
msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
msgstr ""
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2072
msgid "Raw"
msgstr ""
-#: fdisk/cfdisk.c:1944
+#: fdisk/cfdisk.c:2072
msgid "Print the table using raw data format"
msgstr ""
-#: fdisk/cfdisk.c:1945 fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
msgid "Sectors"
msgstr ""
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:2073
msgid "Print the table ordered by sectors"
msgstr ""
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2074
msgid "Table"
msgstr ""
-#: fdisk/cfdisk.c:1946
+#: fdisk/cfdisk.c:2074
msgid "Just print the partition table"
msgstr ""
-#: fdisk/cfdisk.c:1947
+#: fdisk/cfdisk.c:2075
msgid "Don't print the table"
msgstr ""
-#: fdisk/cfdisk.c:1976
-msgid "Help Screen for cfdisk "
+#: fdisk/cfdisk.c:2103
+msgid "Help Screen for cfdisk"
msgstr ""
-#: fdisk/cfdisk.c:1978
+#: fdisk/cfdisk.c:2105
msgid "This is cfdisk, a curses based disk partitioning program, which"
msgstr ""
-#: fdisk/cfdisk.c:1979
+#: fdisk/cfdisk.c:2106
msgid "allows you to create, delete and modify partitions on your hard"
msgstr ""
-#: fdisk/cfdisk.c:1980
+#: fdisk/cfdisk.c:2107
msgid "disk drive."
msgstr ""
-#: fdisk/cfdisk.c:1982
-msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-msgstr ""
+#: fdisk/cfdisk.c:2109
+#, fuzzy
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-#: fdisk/cfdisk.c:1984
+#: fdisk/cfdisk.c:2111
msgid "Command Meaning"
msgstr ""
-#: fdisk/cfdisk.c:1985
+#: fdisk/cfdisk.c:2112
msgid "------- -------"
msgstr ""
-#: fdisk/cfdisk.c:1986
+#: fdisk/cfdisk.c:2113
msgid " b Toggle bootable flag of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:1987
+#: fdisk/cfdisk.c:2114
msgid " d Delete the current partition"
msgstr ""
-#: fdisk/cfdisk.c:1988
+#: fdisk/cfdisk.c:2115
msgid " g Change cylinders, heads, sectors-per-track parameters"
msgstr ""
-#: fdisk/cfdisk.c:1989
+#: fdisk/cfdisk.c:2116
msgid " WARNING: This option should only be used by people who"
msgstr ""
-#: fdisk/cfdisk.c:1990
+#: fdisk/cfdisk.c:2117
msgid " know what they are doing."
msgstr ""
-#: fdisk/cfdisk.c:1991
+#: fdisk/cfdisk.c:2118
msgid " h Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:1992
+#: fdisk/cfdisk.c:2119
msgid " m Maximize disk usage of the current partition"
msgstr ""
-#: fdisk/cfdisk.c:1993
+#: fdisk/cfdisk.c:2120
msgid " Note: This may make the partition incompatible with"
msgstr ""
-#: fdisk/cfdisk.c:1994
+#: fdisk/cfdisk.c:2121
msgid " DOS, OS/2, ..."
msgstr ""
-#: fdisk/cfdisk.c:1995
+#: fdisk/cfdisk.c:2122
msgid " n Create new partition from free space"
msgstr ""
-#: fdisk/cfdisk.c:1996
+#: fdisk/cfdisk.c:2123
msgid " p Print partition table to the screen or to a file"
msgstr ""
-#: fdisk/cfdisk.c:1997
+#: fdisk/cfdisk.c:2124
msgid " There are several different formats for the partition"
msgstr ""
-#: fdisk/cfdisk.c:1998
+#: fdisk/cfdisk.c:2125
msgid " that you can choose from:"
msgstr ""
-#: fdisk/cfdisk.c:1999
+#: fdisk/cfdisk.c:2126
msgid " r - Raw data (exactly what would be written to disk)"
msgstr ""
-#: fdisk/cfdisk.c:2000
+#: fdisk/cfdisk.c:2127
msgid " s - Table ordered by sectors"
msgstr ""
-#: fdisk/cfdisk.c:2001
+#: fdisk/cfdisk.c:2128
msgid " t - Table in raw format"
msgstr ""
-#: fdisk/cfdisk.c:2002
+#: fdisk/cfdisk.c:2129
msgid " q Quit program without writing partition table"
msgstr ""
-#: fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:2130
msgid " t Change the filesystem type"
msgstr ""
-#: fdisk/cfdisk.c:2004
+#: fdisk/cfdisk.c:2131
msgid " u Change units of the partition size display"
msgstr ""
-#: fdisk/cfdisk.c:2005
-msgid " Rotates through Mb, sectors and cylinders"
+#: fdisk/cfdisk.c:2132
+msgid " Rotates through MB, sectors and cylinders"
msgstr ""
-#: fdisk/cfdisk.c:2006
+#: fdisk/cfdisk.c:2133
msgid " W Write partition table to disk (must enter upper case W)"
msgstr ""
-#: fdisk/cfdisk.c:2007
+#: fdisk/cfdisk.c:2134
msgid " Since this might destroy data on the disk, you must"
msgstr ""
-#: fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:2135
msgid " either confirm or deny the write by entering `yes' or"
msgstr ""
-#: fdisk/cfdisk.c:2009
+#: fdisk/cfdisk.c:2136
msgid " `no'"
msgstr ""
-#: fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:2137
msgid "Up Arrow Move cursor to the previous partition"
msgstr ""
-#: fdisk/cfdisk.c:2011
+#: fdisk/cfdisk.c:2138
msgid "Down Arrow Move cursor to the next partition"
msgstr ""
-#: fdisk/cfdisk.c:2012
+#: fdisk/cfdisk.c:2139
msgid "CTRL-L Redraws the screen"
msgstr ""
-#: fdisk/cfdisk.c:2013
+#: fdisk/cfdisk.c:2140
msgid " ? Print this screen"
msgstr ""
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2142
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr ""
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:2143
msgid "case letters (except for Writes)."
msgstr ""
-#: fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2350 fdisk/fdisksunlabel.c:305
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
#: fdisk/fdisksunlabel.c:307
msgid "Cylinders"
msgstr "Cilindros"
-#: fdisk/cfdisk.c:2048
+#: fdisk/cfdisk.c:2173
msgid "Change cylinder geometry"
msgstr "Mudar geometria dos cilindros"
-#: fdisk/cfdisk.c:2049 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
msgid "Heads"
msgstr "Cabeças"
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:2174
msgid "Change head geometry"
msgstr "Mudar geometria dos cilindros"
-#: fdisk/cfdisk.c:2050
+#: fdisk/cfdisk.c:2175
msgid "Change sector geometry"
msgstr "Mudar geometria dos setores"
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2176
msgid "Done"
msgstr "Feito"
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:2176
msgid "Done with changing geometry"
msgstr "A mudança da geometria foi feita"
-#: fdisk/cfdisk.c:2064
+#: fdisk/cfdisk.c:2189
msgid "Enter the number of cylinders: "
msgstr "Informe o número de cilindros: "
-#: fdisk/cfdisk.c:2071 fdisk/cfdisk.c:2614
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
msgid "Illegal cylinders value"
msgstr ""
-#: fdisk/cfdisk.c:2077
+#: fdisk/cfdisk.c:2207
msgid "Enter the number of heads: "
msgstr "Informe o número de cabeças: "
-#: fdisk/cfdisk.c:2084 fdisk/cfdisk.c:2621
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
msgid "Illegal heads value"
msgstr ""
-#: fdisk/cfdisk.c:2090
+#: fdisk/cfdisk.c:2220
msgid "Enter the number of sectors per track: "
msgstr "Informe o número de setores por trilha: "
-#: fdisk/cfdisk.c:2097 fdisk/cfdisk.c:2628
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
msgid "Illegal sectors value"
msgstr "Valor de setores inválido"
-#: fdisk/cfdisk.c:2196
+#: fdisk/cfdisk.c:2330
msgid "Enter filesystem type: "
msgstr "Informe o tipo do sistema de arquivos: "
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2348
msgid "Cannot change FS Type to empty"
msgstr "Năo foi possível mudar o tipo de SA para vazio"
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2350
msgid "Cannot change FS Type to extended"
msgstr ""
-#: fdisk/cfdisk.c:2238 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
msgid "Boot"
msgstr "Inicial."
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2375
#, c-format
msgid "Unk(%02X)"
msgstr "Desc(%02X)"
-#: fdisk/cfdisk.c:2243 fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
msgid ", NC"
msgstr ""
-#: fdisk/cfdisk.c:2251 fdisk/cfdisk.c:2254
+#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
msgid "NC"
msgstr ""
-#: fdisk/cfdisk.c:2262
+#: fdisk/cfdisk.c:2397
msgid "Pri/Log"
msgstr "Pri/Lóg"
-#: fdisk/cfdisk.c:2336
+#: fdisk/cfdisk.c:2473
#, c-format
msgid "Disk Drive: %s"
msgstr "Disco: %s"
-#: fdisk/cfdisk.c:2338
+#: fdisk/cfdisk.c:2476
+#, c-format
+msgid "Size: %lld bytes"
+msgstr ""
+
+#: fdisk/cfdisk.c:2478
#, c-format
msgid "Heads: %d Sectors per Track: %d Cylinders: %d"
msgstr "Cabeças: %d Setores por Trilha: %d Cilindros: %d"
-#: fdisk/cfdisk.c:2342
+#: fdisk/cfdisk.c:2482
msgid "Name"
msgstr "Nome"
-#: fdisk/cfdisk.c:2343
+#: fdisk/cfdisk.c:2483
msgid "Flags"
msgstr "Opçőes"
-#: fdisk/cfdisk.c:2344
+#: fdisk/cfdisk.c:2484
msgid "Part Type"
msgstr "Tipo Part."
-#: fdisk/cfdisk.c:2345
+#: fdisk/cfdisk.c:2485
msgid "FS Type"
msgstr "Tipo SA"
-#: fdisk/cfdisk.c:2346
+#: fdisk/cfdisk.c:2486
msgid "[Label]"
msgstr "[Rótulo]"
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2488
msgid " Sectors"
msgstr " Setores"
-#: fdisk/cfdisk.c:2352
+#: fdisk/cfdisk.c:2492
msgid "Size (MB)"
msgstr "Tam. (MB)"
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2494
+#, fuzzy
+msgid "Size (GB)"
+msgstr "Tam. (MB)"
+
+#: fdisk/cfdisk.c:2549
msgid "Bootable"
msgstr "Inicial."
-#: fdisk/cfdisk.c:2407
+#: fdisk/cfdisk.c:2549
msgid "Toggle bootable flag of the current partition"
msgstr "Configura a partiçăo corrente como inicializável"
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2550
msgid "Delete"
msgstr "Remova"
-#: fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:2550
msgid "Delete the current partition"
msgstr "Remover partiçăo corrente"
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2551
msgid "Geometry"
msgstr "Geometria"
-#: fdisk/cfdisk.c:2409
+#: fdisk/cfdisk.c:2551
msgid "Change disk geometry (experts only)"
msgstr "Mudar geometria do disco (somente para experts)"
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2552
msgid "Help"
msgstr "Ajuda"
-#: fdisk/cfdisk.c:2410
+#: fdisk/cfdisk.c:2552
msgid "Print help screen"
msgstr "Mostrar tela de ajuda"
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2553
msgid "Maximize"
msgstr "Maximize"
-#: fdisk/cfdisk.c:2411
+#: fdisk/cfdisk.c:2553
msgid "Maximize disk usage of the current partition (experts only)"
msgstr ""
"Maximizar o uso de disco para a partiçăo corrente (somente para experts)"
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2554
msgid "New"
msgstr "Nova"
-#: fdisk/cfdisk.c:2412
+#: fdisk/cfdisk.c:2554
msgid "Create new partition from free space"
msgstr "Criar nova partiçăo a partir do espaço livre"
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2555
msgid "Print"
msgstr "Mostre"
-#: fdisk/cfdisk.c:2413
+#: fdisk/cfdisk.c:2555
msgid "Print partition table to the screen or to a file"
msgstr "Mostrar tabela de particőes na tela ou para um arquivo"
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2556
msgid "Quit"
msgstr "Saia"
-#: fdisk/cfdisk.c:2414
+#: fdisk/cfdisk.c:2556
msgid "Quit program without writing partition table"
msgstr "Sair do programa sem gravar a tabela de partiçőes"
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2557
msgid "Type"
msgstr "Tipo"
-#: fdisk/cfdisk.c:2415
+#: fdisk/cfdisk.c:2557
msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
msgstr "Mudar o tipo do sistema de arquivos (DOS, Linux, OS/2 e outros)"
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2558
msgid "Units"
msgstr "Unidades"
-#: fdisk/cfdisk.c:2416
+#: fdisk/cfdisk.c:2558
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:2417
+#: fdisk/cfdisk.c:2559
msgid "Write"
msgstr "Grave"
-#: fdisk/cfdisk.c:2417
+#: fdisk/cfdisk.c:2559
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:2463
+#: fdisk/cfdisk.c:2605
msgid "Cannot make this partition bootable"
msgstr ""
-#: fdisk/cfdisk.c:2473
+#: fdisk/cfdisk.c:2615
msgid "Cannot delete an empty partition"
msgstr "Năo foi possível remover uma partiçăo vazia"
-#: fdisk/cfdisk.c:2493 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
msgid "Cannot maximize this partition"
msgstr "Năo foi possível maximizar esta partiçăo"
-#: fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2645
msgid "This partition is unusable"
msgstr ""
-#: fdisk/cfdisk.c:2505
+#: fdisk/cfdisk.c:2647
msgid "This partition is already in use"
msgstr ""
-#: fdisk/cfdisk.c:2522
+#: fdisk/cfdisk.c:2664
msgid "Cannot change the type of an empty partition"
msgstr ""
-#: fdisk/cfdisk.c:2547 fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
msgid "No more partitions"
msgstr "Sem mais partiçőes"
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2704
msgid "Illegal command"
msgstr "Comando inválido"
-#: fdisk/cfdisk.c:2570
+#: fdisk/cfdisk.c:2714
msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
#. Unfortunately, xgettext does not handle multi-line strings
#. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2577
+#: fdisk/cfdisk.c:2721
#, c-format
msgid ""
"\n"
@@ -1304,261 +1989,268 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:247
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"
+"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 drives) use 2048-byte sectors\n"
msgstr ""
-#: fdisk/fdisk.c:245
-msgid "A disk block device is needed.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:259
msgid ""
-"Given name does not refer to a partition,\n"
-"or maybe not even to a block device.\n"
+"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 ""
-#: fdisk/fdisk.c:252
+#: fdisk/fdisk.c:267
#, c-format
msgid "Unable to open %s\n"
msgstr ""
-#: fdisk/fdisk.c:255
+#: fdisk/fdisk.c:270
#, c-format
msgid "Unable to read %s\n"
msgstr ""
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:273
#, c-format
msgid "Unable to seek on %s\n"
msgstr ""
-#: fdisk/fdisk.c:261
+#: fdisk/fdisk.c:276
#, c-format
msgid "Unable to write %s\n"
msgstr ""
-#: fdisk/fdisk.c:264
+#: fdisk/fdisk.c:279
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr ""
+
+#: fdisk/fdisk.c:283
msgid "Unable to allocate any more memory\n"
msgstr ""
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:285
msgid "Fatal error\n"
msgstr ""
-#: fdisk/fdisk.c:277 fdisk/fdisk.c:296 fdisk/fdisk.c:314 fdisk/fdisk.c:321
-#: fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
+#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
msgid "Command action"
msgstr "Comando - açăo"
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:297
msgid " a toggle a read only flag"
msgstr " a configura a opçăo de somente leitura"
#. sun
-#: fdisk/fdisk.c:279 fdisk/fdisk.c:323
+#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
msgid " b edit bsd disklabel"
msgstr " b edita rótulo BSD no disco"
-#: fdisk/fdisk.c:280
+#: fdisk/fdisk.c:299
msgid " c toggle the mountable flag"
msgstr " c configura a opçăo \"montável\""
#. sun
-#: fdisk/fdisk.c:281 fdisk/fdisk.c:300 fdisk/fdisk.c:325
+#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
msgid " d delete a partition"
msgstr " d remova uma partiçăo"
-#: fdisk/fdisk.c:282 fdisk/fdisk.c:301 fdisk/fdisk.c:326
+#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
msgid " l list known partition types"
msgstr " l lista os tipos de partiçăo conhecidos"
#. sun
-#: fdisk/fdisk.c:283 fdisk/fdisk.c:302 fdisk/fdisk.c:315 fdisk/fdisk.c:327
-#: fdisk/fdisk.c:352 fdisk/fdisk.c:369 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
msgid " m print this menu"
msgstr " m mostra este menu"
-#: fdisk/fdisk.c:284 fdisk/fdisk.c:303 fdisk/fdisk.c:328
+#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
msgid " n add a new partition"
msgstr " n cria uma nova partiçăo"
-#: fdisk/fdisk.c:285 fdisk/fdisk.c:304 fdisk/fdisk.c:316 fdisk/fdisk.c:329
+#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
msgid " o create a new empty DOS partition table"
msgstr " o cria uma nova tabela de partiçőes DOS vazia"
-#: fdisk/fdisk.c:286 fdisk/fdisk.c:305 fdisk/fdisk.c:330 fdisk/fdisk.c:353
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:389
msgid " p print the partition table"
msgstr " p mostra a tabela de partiçőes"
-#: fdisk/fdisk.c:287 fdisk/fdisk.c:306 fdisk/fdisk.c:317 fdisk/fdisk.c:331
-#: fdisk/fdisk.c:354 fdisk/fdisk.c:371 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
msgid " q quit without saving changes"
msgstr " q sai sem salvar as mudanças"
-#: fdisk/fdisk.c:288 fdisk/fdisk.c:307 fdisk/fdisk.c:318 fdisk/fdisk.c:332
+#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
msgid " s create a new empty Sun disklabel"
msgstr " s cria um novo rotúlo de disco Sun vazio"
#. sun
-#: fdisk/fdisk.c:289 fdisk/fdisk.c:308 fdisk/fdisk.c:333
+#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
msgid " t change a partition's system id"
msgstr " t muda a identificaçăo da partiçăo para o sistema"
-#: fdisk/fdisk.c:290 fdisk/fdisk.c:309 fdisk/fdisk.c:334
+#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
msgid " u change display/entry units"
msgstr " u muda as unidades das entradas mostradas"
-#: fdisk/fdisk.c:291 fdisk/fdisk.c:310 fdisk/fdisk.c:335 fdisk/fdisk.c:357
-#: fdisk/fdisk.c:374
+#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:393
msgid " v verify the partition table"
msgstr " v verifica a tabela de partiçőes"
-#: fdisk/fdisk.c:292 fdisk/fdisk.c:311 fdisk/fdisk.c:336 fdisk/fdisk.c:358
-#: fdisk/fdisk.c:375
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
msgid " w write table to disk and exit"
msgstr " w grava a tabela para o disco e sai"
-#: fdisk/fdisk.c:293 fdisk/fdisk.c:337
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
msgid " x extra functionality (experts only)"
msgstr " x funcionalidade adicional (somente para experts)"
-#: fdisk/fdisk.c:297
+#: fdisk/fdisk.c:316
msgid " a select bootable partition"
msgstr " a torna a partiçăo inicializável"
#. sgi flavour
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:317
msgid " b edit bootfile entry"
msgstr " b edita uma entrada de arquivo de inicializaçăo"
#. sgi
-#: fdisk/fdisk.c:299
+#: fdisk/fdisk.c:318
msgid " c select sgi swap partition"
msgstr " c seleciona uma partiçăo de troca sgi"
-#: fdisk/fdisk.c:322
+#: fdisk/fdisk.c:341
msgid " a toggle a bootable flag"
msgstr " a configura a opçăo \"inicializável\""
-#: fdisk/fdisk.c:324
+#: fdisk/fdisk.c:343
msgid " c toggle the dos compatibility flag"
msgstr ""
# DÚVIDA!!!!
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:364
msgid " a change number of alternate cylinders"
msgstr " a mudar número de cilindros alternativos"
# ^^^^^^^^^^^^
#. sun
-#: fdisk/fdisk.c:346 fdisk/fdisk.c:364
+#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
msgid " c change number of cylinders"
msgstr " c mudar número de cilindros"
-#: fdisk/fdisk.c:347 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
msgid " d print the raw data in the partition table"
msgstr " d mostre os dados brutos (sem formataçăo) da tabela de partiçőes"
-#: fdisk/fdisk.c:348
+#: fdisk/fdisk.c:367
msgid " e change number of extra sectors per cylinder"
msgstr " e mudar número de setores extras por cilindro"
#. sun
-#: fdisk/fdisk.c:349 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
msgid " h change number of heads"
msgstr " h mudar número de cabeças"
-#: fdisk/fdisk.c:350
+#: fdisk/fdisk.c:369
msgid " i change interleave factor"
msgstr " i mudar fator de \"interleave\""
#. sun
-#: fdisk/fdisk.c:351
+#: fdisk/fdisk.c:370
msgid " o change rotation speed (rpm)"
msgstr " o mudar velocidade rotacional (rpm)"
-#: fdisk/fdisk.c:355 fdisk/fdisk.c:372 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
msgid " r return to main menu"
msgstr " r voltar ao menu principal"
-#: fdisk/fdisk.c:356 fdisk/fdisk.c:373
-msgid " s change number of sectors"
+#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+#, fuzzy
+msgid " s change number of sectors/track"
msgstr " s mudar número de setores"
-#: fdisk/fdisk.c:359
+#: fdisk/fdisk.c:378
msgid " y change number of physical cylinders"
msgstr " y mudar número de cilindros físicos"
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:382
msgid " b move beginning of data in a partition"
msgstr " b mover inicio dos dados em uma partiçăo"
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:385
msgid " e list extended partitions"
msgstr " e listar partiçőes estendidas"
#. !sun
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:386
msgid " g create an IRIX partition table"
msgstr " g criar uma tabela de partiçőes IRIX"
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:482
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:477
+#: fdisk/fdisk.c:496
msgid "heads"
msgstr "cabeças"
-#: fdisk/fdisk.c:479 fdisk/sfdisk.c:825
+#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
msgid "sectors"
msgstr "setores"
-#: fdisk/fdisk.c:481 fdisk/fdiskbsdlabel.c:441 fdisk/sfdisk.c:825
+#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:441
+#: fdisk/sfdisk.c:842
msgid "cylinders"
msgstr "cilindros"
-#: fdisk/fdisk.c:485
+#: fdisk/fdisk.c:504
#, c-format
msgid ""
"%s%s.\n"
"You can do this from the extra functions menu.\n"
msgstr ""
-#: fdisk/fdisk.c:486
+#: fdisk/fdisk.c:505
msgid " and "
msgstr ""
-#: fdisk/fdisk.c:520
+#: fdisk/fdisk.c:539
msgid "Bad offset in primary extended partition\n"
msgstr "Deslocamento (offset) inválido em uma partiçăo primária estendida\n"
-#: fdisk/fdisk.c:524
+#: fdisk/fdisk.c:546
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr ""
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:567
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:553
+#: fdisk/fdisk.c:575
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:579
+#: fdisk/fdisk.c:601
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"
@@ -1566,102 +2258,102 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:615
+#: fdisk/fdisk.c:637
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:624
+#: fdisk/fdisk.c:646
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr ""
-#: fdisk/fdisk.c:671
+#: fdisk/fdisk.c:694
msgid ""
"Device contains neither a valid DOS partition table, nor Sun or SGI "
"disklabel\n"
msgstr ""
-#: fdisk/fdisk.c:687
+#: fdisk/fdisk.c:710
msgid "Internal error\n"
msgstr "Erro interno\n"
-#: fdisk/fdisk.c:697
+#: fdisk/fdisk.c:720
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:704
+#: fdisk/fdisk.c:727
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
"w(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:725
+#: fdisk/fdisk.c:748
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:762
+#: fdisk/fdisk.c:785
msgid "Hex code (type L to list codes): "
msgstr ""
-#: fdisk/fdisk.c:801
+#: fdisk/fdisk.c:824
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr ""
-#: fdisk/fdisk.c:855
+#: fdisk/fdisk.c:878
#, c-format
msgid "Using default value %d\n"
msgstr ""
-#: fdisk/fdisk.c:859
+#: fdisk/fdisk.c:882
msgid "Value out of range.\n"
msgstr ""
-#: fdisk/fdisk.c:866
+#: fdisk/fdisk.c:889
msgid "Partition number"
msgstr ""
-#: fdisk/fdisk.c:874
+#: fdisk/fdisk.c:897
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr ""
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:904
msgid "cylinder"
msgstr "cilindro"
-#: fdisk/fdisk.c:880
+#: fdisk/fdisk.c:904
msgid "sector"
msgstr "setor"
-#: fdisk/fdisk.c:887
-#, c-format
-msgid "Changing display/entry units to %ss\n"
-msgstr ""
+#: fdisk/fdisk.c:913
+#, fuzzy, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr " u muda as unidades das entradas mostradas"
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:923
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:910
+#: fdisk/fdisk.c:936
msgid "DOS Compatibility flag is set\n"
msgstr ""
-#: fdisk/fdisk.c:914
+#: fdisk/fdisk.c:940
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:999
+#: fdisk/fdisk.c:1026
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr ""
-#: fdisk/fdisk.c:1004
+#: fdisk/fdisk.c:1031
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -1669,92 +2361,92 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1013
+#: fdisk/fdisk.c:1040
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1022
+#: fdisk/fdisk.c:1049
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1028
+#: fdisk/fdisk.c:1055
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1042
+#: fdisk/fdisk.c:1069
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1095
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1097 fdisk/fdisk.c:1105 fdisk/fdisk.c:1114 fdisk/fdisk.c:1123
+#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1098 fdisk/fdisk.c:1106
+#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1103
+#: fdisk/fdisk.c:1130
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1112
+#: fdisk/fdisk.c:1139
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1115
+#: fdisk/fdisk.c:1142
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1121
+#: fdisk/fdisk.c:1148
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1151
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1131
+#: fdisk/fdisk.c:1158
#, c-format
msgid ""
"\n"
"Disk %s: %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * %d bytes\n"
+"Units = %s of %d * %d bytes\n"
"\n"
msgstr ""
#. FIXME! let's see how this shows up with other languagues
#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1168
+#: fdisk/fdisk.c:1195
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisk.c:1169 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:629
+#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
msgid "Device"
msgstr ""
-#: fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1236
#, c-format
msgid ""
"\n"
@@ -1762,104 +2454,104 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1211
+#: fdisk/fdisk.c:1238
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr ""
-#: fdisk/fdisk.c:1250
+#: fdisk/fdisk.c:1277
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr ""
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1280
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1256
+#: fdisk/fdisk.c:1283
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1259
+#: fdisk/fdisk.c:1286
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1263
+#: fdisk/fdisk.c:1290
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1293
+#: fdisk/fdisk.c:1320
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1301
+#: fdisk/fdisk.c:1328
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr ""
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1346
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr ""
-#: fdisk/fdisk.c:1324
+#: fdisk/fdisk.c:1351
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1330
+#: fdisk/fdisk.c:1357
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1333
+#: fdisk/fdisk.c:1360
#, c-format
msgid "%d unallocated sectors\n"
msgstr ""
-#: fdisk/fdisk.c:1345 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
-#: fdisk/fdisk.c:1366 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
+#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
#: fdisk/fdisksunlabel.c:494
#, c-format
msgid "First %s"
msgstr ""
-#: fdisk/fdisk.c:1381 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
#, c-format
msgid "Sector %d is already allocated\n"
msgstr ""
-#: fdisk/fdisk.c:1407
+#: fdisk/fdisk.c:1440
msgid "No free sectors available\n"
msgstr ""
-#: fdisk/fdisk.c:1417 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr ""
-#: fdisk/fdisk.c:1447
+#: fdisk/fdisk.c:1480
#, c-format
msgid "Warning: partition %d has an odd number of sectors.\n"
msgstr ""
-#: fdisk/fdisk.c:1484 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:590
msgid "The maximum number of partitions has been created\n"
msgstr ""
-#: fdisk/fdisk.c:1494
+#: fdisk/fdisk.c:1527
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1531
#, c-format
msgid ""
"Command action\n"
@@ -1867,41 +2559,41 @@ msgid ""
" p primary partition (1-4)\n"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1533
msgid "l logical (5 or over)"
msgstr ""
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1533
msgid "e extended"
msgstr "e estendida"
-#: fdisk/fdisk.c:1517
+#: fdisk/fdisk.c:1550
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr ""
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1582
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1551
+#: fdisk/fdisk.c:1584
msgid "Calling ioctl() to re-read partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:1568
+#: fdisk/fdisk.c:1601
msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:1573
+#: fdisk/fdisk.c:1606
#, c-format
msgid ""
"Re-read table failed with error %d: %s.\n"
"Reboot your system to ensure the partition table is updated.\n"
msgstr ""
-#: fdisk/fdisk.c:1579
+#: fdisk/fdisk.c:1612
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -1909,85 +2601,80 @@ msgid ""
"information.\n"
msgstr ""
-#: fdisk/fdisk.c:1610
+#: fdisk/fdisk.c:1643
#, c-format
msgid "Device: %s\n"
msgstr "Dispositivo: %s\n"
-#: fdisk/fdisk.c:1625
+#: fdisk/fdisk.c:1658
#, c-format
msgid "Partition %d has no data area\n"
msgstr ""
-#: fdisk/fdisk.c:1631
+#: fdisk/fdisk.c:1664
msgid "New beginning of data"
msgstr ""
-#: fdisk/fdisk.c:1645
+#: fdisk/fdisk.c:1678
msgid "Expert command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:1656
+#: fdisk/fdisk.c:1689
msgid "Number of cylinders"
msgstr "Número de cilindros"
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1710
msgid "Number of heads"
msgstr "Número de cabeças"
-#: fdisk/fdisk.c:1702
+#: fdisk/fdisk.c:1735
msgid "Number of sectors"
msgstr "Número de setores"
-#: fdisk/fdisk.c:1705
+#: fdisk/fdisk.c:1738
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:1767
+#: fdisk/fdisk.c:1800
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr ""
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1814
#, c-format
msgid "Cannot open %s\n"
msgstr ""
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1879
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:1839
+#: fdisk/fdisk.c:1882
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:1947
-#, c-format
-msgid "Using %s as default device!\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1953
+#: fdisk/fdisk.c:1940
msgid "Command (m for help): "
msgstr "Comando (tecle m para obter ajuda): "
-#: fdisk/fdisk.c:1967
+#: fdisk/fdisk.c:1954
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:1969
+#: fdisk/fdisk.c:1956
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:1971
+#: fdisk/fdisk.c:1958
msgid "Boot file unchanged\n"
msgstr ""
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2018
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2346,7 +3033,7 @@ msgid "SGI rxlvol"
msgstr ""
#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:52
+#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
msgid "Linux swap"
msgstr "Linux swap"
@@ -2372,7 +3059,7 @@ msgid ""
"%d cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2381,7 +3068,7 @@ msgstr ""
msgid ""
"\n"
"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
@@ -2654,15 +3341,15 @@ msgstr "Cilindros Alternativos"
msgid "Physical cylinders"
msgstr "Cilindros físicos"
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:679
+#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
msgid "Rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
msgid "Interleave factor"
msgstr "Fator de \"Interleave\""
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:665
+#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
msgid "Extra sectors per cylinder"
msgstr "Setores extras por cilindro: "
@@ -2707,19 +3394,19 @@ msgstr ""
#: fdisk/fdisksunlabel.c:547
#, c-format
msgid ""
-"You haven't covered whole disk with 3rd partition, but your value\n"
-"%d %s covers some other partition. Your entry have been changed\n"
+"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 ""
-#: fdisk/fdisksunlabel.c:565
+#: fdisk/fdisksunlabel.c:567
#, 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:578
+#: fdisk/fdisksunlabel.c:580
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -2728,7 +3415,7 @@ msgid ""
"tagged with 82 (Linux swap): "
msgstr ""
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
#, c-format
msgid ""
"\n"
@@ -2736,29 +3423,29 @@ msgid ""
"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
"%d extra sects/cyl, interleave %d:1\n"
"%s\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:625
#, c-format
msgid ""
"\n"
"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
-"Units = %ss of %d * 512 bytes\n"
+"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:628
+#: fdisk/fdisksunlabel.c:630
#, c-format
msgid "%*s Flag Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:655
msgid "Number of alternate cylinders"
msgstr "Informe o número de cilindros alternativos: "
-#: fdisk/fdisksunlabel.c:686
+#: fdisk/fdisksunlabel.c:688
msgid "Number of physical cylinders"
msgstr "Número de cilindros físicos"
@@ -2854,275 +3541,296 @@ msgid "AST Windows swapfile"
msgstr ""
#: fdisk/i386_sys_types.c:28
+#, fuzzy
+msgid "Hidden Win95 FAT32"
+msgstr "FAT32 Win95"
+
+#: fdisk/i386_sys_types.c:29
+#, fuzzy
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr "FAT32 Win95 (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+#, fuzzy
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr "FAT16 Win95 (LBA)"
+
+#: fdisk/i386_sys_types.c:31
msgid "NEC DOS"
msgstr ""
-#: fdisk/i386_sys_types.c:29
+#: fdisk/i386_sys_types.c:32
msgid "PartitionMagic recovery"
msgstr ""
-#: fdisk/i386_sys_types.c:30
+#: fdisk/i386_sys_types.c:33
msgid "Venix 80286"
msgstr ""
-#: fdisk/i386_sys_types.c:31
+#: fdisk/i386_sys_types.c:34
msgid "PPC PReP Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:32
+#: fdisk/i386_sys_types.c:35
msgid "SFS"
msgstr ""
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:36
msgid "QNX4.x"
msgstr ""
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:37
msgid "QNX4.x 2nd part"
msgstr ""
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:38
msgid "QNX4.x 3rd part"
msgstr ""
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:39
msgid "OnTrack DM"
msgstr ""
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:40
msgid "OnTrack DM6 Aux1"
msgstr ""
#. (or Novell)
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:41
msgid "CP/M"
msgstr ""
#. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:42
msgid "OnTrack DM6 Aux3"
msgstr ""
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:43
msgid "OnTrackDM6"
msgstr ""
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:44
msgid "EZ-Drive"
msgstr ""
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:45
msgid "Golden Bow"
msgstr ""
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:46
msgid "Priam Edisk"
msgstr ""
#. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:44 fdisk/i386_sys_types.c:73
-#: fdisk/i386_sys_types.c:75 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
msgid "SpeedStor"
msgstr ""
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:48
msgid "GNU HURD or SysV"
msgstr ""
#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:49
msgid "Novell Netware 286"
msgstr ""
-#: fdisk/i386_sys_types.c:47
+#: fdisk/i386_sys_types.c:50
msgid "Novell Netware 386"
msgstr ""
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:51
msgid "DiskSecure Multi-Boot"
msgstr ""
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:52
msgid "PC/IX"
msgstr ""
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:53
msgid "Old Minix"
msgstr ""
#. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:54
msgid "Minix / old Linux"
msgstr ""
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:57
msgid "OS/2 hidden C: drive"
msgstr ""
-#: fdisk/i386_sys_types.c:55
+#: fdisk/i386_sys_types.c:58
msgid "Linux extended"
msgstr "Estendida Linux"
-#: fdisk/i386_sys_types.c:56 fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
msgid "NTFS volume set"
msgstr ""
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:61
msgid "Amoeba"
msgstr ""
-#: fdisk/i386_sys_types.c:59
+#: fdisk/i386_sys_types.c:62
msgid "Amoeba BBT"
msgstr ""
#. (bad block table)
-#: fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:63
msgid "IBM Thinkpad hibernation"
msgstr ""
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:64
msgid "BSD/386"
msgstr ""
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:65
msgid "OpenBSD"
msgstr ""
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:66
msgid "NeXTSTEP"
msgstr ""
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
msgid "BSDI fs"
msgstr ""
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
msgid "BSDI swap"
msgstr ""
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
msgid "DRDOS/sec (FAT-12)"
msgstr "DRDOS/sec (FAT12)"
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
msgid "DRDOS/sec (FAT-16 < 32M)"
msgstr "DRDOS/sec (FAT16 < 32M)"
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
msgid "DRDOS/sec (FAT-16)"
msgstr "DRDOS/sec (FAT16)"
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
msgid "Syrinx"
msgstr ""
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
msgid "CP/M / CTOS / ..."
msgstr ""
#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
msgid "DOS access"
msgstr ""
#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
msgid "DOS R/O"
msgstr ""
#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
msgid "BeOS fs"
msgstr ""
#. SpeedStor large partition
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
msgid "DOS secondary"
msgstr ""
#. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:78
+#: fdisk/i386_sys_types.c:81
+msgid "Linux raid autodetect"
+msgstr ""
+
+#. New (2.2.x) raid partition with autodetect
+#. using persistent superblock
+#: fdisk/i386_sys_types.c:83
msgid "LANstep"
msgstr ""
#. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:84
msgid "BBT"
msgstr ""
-#: fdisk/sfdisk.c:148
+#: fdisk/sfdisk.c:147
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:153
+#: fdisk/sfdisk.c:152
#, c-format
msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
msgstr ""
-#: fdisk/sfdisk.c:199
+#: fdisk/sfdisk.c:198
msgid "out of memory - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:203 fdisk/sfdisk.c:286
+#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:219
+#: fdisk/sfdisk.c:218
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
msgstr ""
-#: fdisk/sfdisk.c:236
+#: fdisk/sfdisk.c:235
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
msgstr ""
-#: fdisk/sfdisk.c:274
+#: fdisk/sfdisk.c:273
#, c-format
msgid "cannot open partition sector save file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:292
+#: fdisk/sfdisk.c:291
#, c-format
msgid "write error on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:310
+#: fdisk/sfdisk.c:309
#, c-format
msgid "cannot stat partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
msgid "partition restore file has wrong size - not restoring\n"
msgstr ""
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:318
msgid "out of memory?\n"
msgstr ""
-#: fdisk/sfdisk.c:325
+#: fdisk/sfdisk.c:324
#, c-format
msgid "cannot open partition restore file (%s)\n"
msgstr ""
-#: fdisk/sfdisk.c:331
+#: fdisk/sfdisk.c:330
#, c-format
msgid "error reading %s\n"
msgstr ""
-#: fdisk/sfdisk.c:338
+#: fdisk/sfdisk.c:337
#, c-format
msgid "cannot open device %s for writing\n"
msgstr ""
-#: fdisk/sfdisk.c:350
+#: fdisk/sfdisk.c:349
#, c-format
msgid "error writing sector %lu on %s\n"
msgstr ""
-#: fdisk/sfdisk.c:407
+#: fdisk/sfdisk.c:415
#, c-format
msgid ""
"Warning: start=%d - this looks like a partition rather than\n"
@@ -3130,60 +3838,60 @@ msgid ""
"[Use the --force option if you really want this]\n"
msgstr ""
-#: fdisk/sfdisk.c:413
+#: fdisk/sfdisk.c:421
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
msgstr ""
-#: fdisk/sfdisk.c:416
+#: fdisk/sfdisk.c:424
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:419
+#: fdisk/sfdisk.c:427
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
msgstr ""
-#: fdisk/sfdisk.c:423
+#: fdisk/sfdisk.c:431
#, c-format
msgid "Disk %s: cannot get geometry\n"
msgstr "Disco %s: năo foi possível obter a geometria\n"
-#: fdisk/sfdisk.c:425
+#: fdisk/sfdisk.c:433
#, c-format
msgid ""
"Warning: unlikely number of sectors (%d) - usually at most 63\n"
"This will give problems with all software that uses C/H/S addressing.\n"
msgstr ""
-#: fdisk/sfdisk.c:429
+#: fdisk/sfdisk.c:437
#, c-format
msgid ""
"\n"
-"Disk %s: %lu heads, %lu sectors, %lu cylinders\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:517
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:514
+#: fdisk/sfdisk.c:522
#, c-format
msgid ""
"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:527
#, c-format
msgid ""
"%s of partition %s has impossible value for cylinders: %d (should be in "
"0-%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:558
+#: fdisk/sfdisk.c:566
msgid ""
"Id Name\n"
"\n"
@@ -3191,595 +3899,576 @@ msgstr ""
"Id Nome\n"
"\n"
-#: fdisk/sfdisk.c:703
+#: fdisk/sfdisk.c:719
msgid "Re-reading the partition table ...\n"
msgstr "Relendo tabela de partiçőes...\n"
-#: fdisk/sfdisk.c:709
+#: fdisk/sfdisk.c:725
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
msgstr ""
-#: fdisk/sfdisk.c:714
+#: fdisk/sfdisk.c:730
#, c-format
msgid "Error closing %s\n"
msgstr ""
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:768
#, c-format
msgid "%s: no such partition\n"
msgstr "%s: partiçăo năo existente\n"
-#: fdisk/sfdisk.c:775
+#: fdisk/sfdisk.c:791
msgid "unrecognized format - using sectors\n"
msgstr ""
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:830
#, c-format
msgid "# partition table of %s\n"
msgstr "# tabela de partiçőes de %s\n"
-#: fdisk/sfdisk.c:814
-msgid ""
-"unit: sectors\n"
-"\n"
-msgstr ""
-"unidade: setores\n"
-"\n"
-
-#: fdisk/sfdisk.c:824
+#: fdisk/sfdisk.c:841
#, c-format
msgid "unimplemented format - using %s\n"
msgstr ""
-#: fdisk/sfdisk.c:828
+#: fdisk/sfdisk.c:845
#, c-format
msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:831
+#: fdisk/sfdisk.c:848
msgid " Device Boot Start End #cyls #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:836
+#: fdisk/sfdisk.c:853
#, c-format
msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:838
+#: fdisk/sfdisk.c:855
msgid " Device Boot Start End #sectors Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:858
#, c-format
msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:843
+#: fdisk/sfdisk.c:860
msgid " Device Boot Start End #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:846
+#: fdisk/sfdisk.c:863
#, c-format
msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:865
msgid " Device Boot Start End MB #blocks Id System\n"
msgstr ""
-#: fdisk/sfdisk.c:903
-#, c-format
-msgid " start=%9lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:904
-#, c-format
-msgid ", size=%8lu"
-msgstr ""
-
-#: fdisk/sfdisk.c:906
-#, c-format
-msgid ", Id=%2x"
-msgstr ""
-
-#: fdisk/sfdisk.c:908
-msgid ", bootable"
-msgstr ", inicializável"
-
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:997
#, c-format
msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:1004
#, c-format
msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:1007
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:989
+#: fdisk/sfdisk.c:1018
msgid "No partitions found\n"
msgstr "Sem mais partiçőes\n"
-#: fdisk/sfdisk.c:1034
+#: fdisk/sfdisk.c:1025
+#, c-format
+msgid ""
+"Warning: The first partition 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 ""
+
+#: fdisk/sfdisk.c:1075
msgid "no partition table present.\n"
msgstr "nenhuma tabela de partiçőes presente.\n"
-#: fdisk/sfdisk.c:1036
+#: fdisk/sfdisk.c:1077
#, c-format
msgid "strange, only %d partitions defined.\n"
msgstr ""
-#: fdisk/sfdisk.c:1045
+#: fdisk/sfdisk.c:1086
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
msgstr ""
-#: fdisk/sfdisk.c:1048
+#: fdisk/sfdisk.c:1089
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
msgstr ""
-#: fdisk/sfdisk.c:1051
+#: fdisk/sfdisk.c:1092
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
msgstr ""
-#: fdisk/sfdisk.c:1062
+#: fdisk/sfdisk.c:1103
#, c-format
msgid "Warning: partition %s "
msgstr "Atençăo: partiçăo %s "
-#: fdisk/sfdisk.c:1063
+#: fdisk/sfdisk.c:1104
#, c-format
msgid "is not contained in partition %s\n"
msgstr "năo está contida na partiçăo %s\n"
-#: fdisk/sfdisk.c:1074
+#: fdisk/sfdisk.c:1115
#, c-format
msgid "Warning: partitions %s "
msgstr ""
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1116
#, c-format
msgid "and %s overlap\n"
msgstr ""
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1127
#, c-format
msgid "Warning: partition %s contains part of "
msgstr "Atençăo: a partiçăo %s contém parte da "
-#: fdisk/sfdisk.c:1087
+#: fdisk/sfdisk.c:1128
#, c-format
msgid "the partition table (sector %lu),\n"
msgstr "tabela de partiçőes (setor %lu),\n"
-#: fdisk/sfdisk.c:1088
+#: fdisk/sfdisk.c:1129
msgid "and will destroy it when filled\n"
msgstr "e a destruirá quando preenchida\n"
-#: fdisk/sfdisk.c:1097
+#: fdisk/sfdisk.c:1138
#, c-format
msgid "Warning: partition %s starts at sector 0\n"
msgstr ""
-#: fdisk/sfdisk.c:1101
+#: fdisk/sfdisk.c:1142
#, c-format
msgid "Warning: partition %s extends past end of disk\n"
msgstr "Atençăo: a partiçăo %s se estende até depois do fim do disco\n"
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1156
msgid "Among the primary partitions, at most one can be extended\n"
msgstr ""
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1157
msgid " (although this is not a problem under Linux)\n"
msgstr ""
-#: fdisk/sfdisk.c:1133
+#: fdisk/sfdisk.c:1174
#, c-format
msgid "Warning: partition %s does not start at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1180
#, c-format
msgid "Warning: partition %s does not end at a cylinder boundary\n"
msgstr ""
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1198
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:1164
+#: fdisk/sfdisk.c:1205
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
msgstr ""
-#: fdisk/sfdisk.c:1170
+#: fdisk/sfdisk.c:1211
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:1187
+#: fdisk/sfdisk.c:1228
#, c-format
msgid ""
"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1196
+#: fdisk/sfdisk.c:1237
#, c-format
msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
msgstr ""
-#: fdisk/sfdisk.c:1199
+#: fdisk/sfdisk.c:1240
#, c-format
msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
msgstr ""
-#: fdisk/sfdisk.c:1232 fdisk/sfdisk.c:1309
+#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
#, c-format
msgid "too many partitions - ignoring those past nr (%d)\n"
msgstr ""
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1288
msgid "tree of partitions?\n"
msgstr "árvore de partiçőes?\n"
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1392
msgid "detected Disk Manager - unable to handle that\n"
msgstr ""
-#: fdisk/sfdisk.c:1358
+#: fdisk/sfdisk.c:1399
msgid "DM6 signature found - giving up\n"
msgstr ""
-#: fdisk/sfdisk.c:1378
+#: fdisk/sfdisk.c:1419
msgid "strange..., an extended partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1426
msgid "strange..., a BSD partition of size 0?\n"
msgstr ""
-#: fdisk/sfdisk.c:1417
+#: fdisk/sfdisk.c:1458
#, c-format
msgid " %s: unrecognized partition\n"
msgstr ""
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1470
msgid "-n flag was given: Nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:1442
+#: fdisk/sfdisk.c:1483
msgid "Failed saving the old sectors - aborting\n"
msgstr ""
-#: fdisk/sfdisk.c:1447
+#: fdisk/sfdisk.c:1488
#, c-format
msgid "Failed writing the partition on %s\n"
msgstr "Falha na gravaçăo da partiçăo em %s\n"
-#: fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1565
msgid "long or incomplete input line - quitting\n"
msgstr "linha de entrada longa ou incompleta - terminando\n"
-#: fdisk/sfdisk.c:1560
+#: fdisk/sfdisk.c:1601
#, c-format
msgid "input error: `=' expected after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1567
+#: fdisk/sfdisk.c:1608
#, c-format
msgid "input error: unexpected character %c after %s field\n"
msgstr ""
-#: fdisk/sfdisk.c:1573
+#: fdisk/sfdisk.c:1614
#, c-format
msgid "unrecognized input: %s\n"
msgstr ""
-#: fdisk/sfdisk.c:1605
+#: fdisk/sfdisk.c:1646
msgid "number too big\n"
msgstr ""
-#: fdisk/sfdisk.c:1609
+#: fdisk/sfdisk.c:1650
msgid "trailing junk after number\n"
msgstr ""
-#: fdisk/sfdisk.c:1725
+#: fdisk/sfdisk.c:1766
msgid "no room for partition descriptor\n"
msgstr "sem espaço para o descritor da partiçăo\n"
-#: fdisk/sfdisk.c:1758
+#: fdisk/sfdisk.c:1799
msgid "cannot build surrounding extended partition\n"
msgstr "năo foi possível criar a partiçăo estendida envoltória\n"
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1850
msgid "too many input fields\n"
msgstr ""
#. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1843
+#: fdisk/sfdisk.c:1884
msgid "No room for more\n"
msgstr ""
-#: fdisk/sfdisk.c:1862
+#: fdisk/sfdisk.c:1903
msgid "Illegal type\n"
msgstr ""
-#: fdisk/sfdisk.c:1894
+#: fdisk/sfdisk.c:1935
#, c-format
msgid "Warning: exceeds max allowable size (%lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1899
+#: fdisk/sfdisk.c:1940
msgid "Warning: empty partition\n"
msgstr "Atençăo: partiçăo vazia\n"
-#: fdisk/sfdisk.c:1913
+#: fdisk/sfdisk.c:1954
#, c-format
msgid "Warning: bad partition start (earliest %lu)\n"
msgstr ""
-#: fdisk/sfdisk.c:1926
+#: fdisk/sfdisk.c:1967
msgid "unrecognized bootable flag - choose - or *\n"
msgstr ""
-#: fdisk/sfdisk.c:1943 fdisk/sfdisk.c:1956
+#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
msgid "partial c,h,s specification?\n"
msgstr ""
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2008
msgid "Extended partition not where expected\n"
msgstr "Partiçăo estentida năo está no lugar esperado\n"
-#: fdisk/sfdisk.c:1999
+#: fdisk/sfdisk.c:2040
msgid "bad input\n"
msgstr ""
-#: fdisk/sfdisk.c:2021
+#: fdisk/sfdisk.c:2062
msgid "too many partitions\n"
msgstr "Número excessivo de partiçőes\n"
-#: fdisk/sfdisk.c:2054
+#: fdisk/sfdisk.c:2095
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:2074
+#: fdisk/sfdisk.c:2115
msgid "version"
msgstr "versăo"
-#: fdisk/sfdisk.c:2080
+#: fdisk/sfdisk.c:2121
#, c-format
msgid "Usage: %s [options] device ...\n"
msgstr "Uso: %s [opçőes] dispositivo ...\n"
-#: fdisk/sfdisk.c:2081
+#: fdisk/sfdisk.c:2122
msgid "device: something like /dev/hda or /dev/sda"
msgstr ""
-#: fdisk/sfdisk.c:2082
+#: fdisk/sfdisk.c:2123
msgid "useful options:"
msgstr "opçőes úteis:"
-#: fdisk/sfdisk.c:2083
+#: fdisk/sfdisk.c:2124
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:2084
+#: fdisk/sfdisk.c:2125
msgid " -c [or --id]: print or change partition Id"
msgstr ""
-#: fdisk/sfdisk.c:2085
+#: fdisk/sfdisk.c:2126
msgid " -l [or --list]: list partitions of each device"
msgstr ""
-#: fdisk/sfdisk.c:2086
+#: fdisk/sfdisk.c:2127
msgid " -d [or --dump]: idem, but in a format suitable for later input"
msgstr ""
-#: fdisk/sfdisk.c:2087
+#: fdisk/sfdisk.c:2128
msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0"
msgstr ""
-#: fdisk/sfdisk.c:2088
+#: fdisk/sfdisk.c:2129
msgid ""
" -uS, -uB, -uC, -uM: accept/report in units of "
"sectors/blocks/cylinders/MB"
msgstr ""
-#: fdisk/sfdisk.c:2089
+#: fdisk/sfdisk.c:2130
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:2090
+#: fdisk/sfdisk.c:2131
msgid " -D [or --DOS]: for DOS-compatibility: waste a little space"
msgstr ""
-#: fdisk/sfdisk.c:2091
+#: fdisk/sfdisk.c:2132
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:2092
+#: fdisk/sfdisk.c:2133
msgid " -N# : change only the partition with number #"
msgstr ""
-#: fdisk/sfdisk.c:2093
+#: fdisk/sfdisk.c:2134
msgid " -n : do not actually write to disk"
msgstr ""
-#: fdisk/sfdisk.c:2094
+#: fdisk/sfdisk.c:2135
msgid ""
" -O file : save the sectors that will be overwritten to file"
msgstr ""
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2136
msgid " -I file : restore these sectors again"
msgstr ""
-#: fdisk/sfdisk.c:2096
+#: fdisk/sfdisk.c:2137
msgid " -v [or --version]: print version"
msgstr ""
-#: fdisk/sfdisk.c:2097
+#: fdisk/sfdisk.c:2138
msgid " -? [or --help]: print this message"
msgstr ""
-#: fdisk/sfdisk.c:2098
+#: fdisk/sfdisk.c:2139
msgid "dangerous options:"
msgstr ""
-#: fdisk/sfdisk.c:2099
+#: fdisk/sfdisk.c:2140
msgid " -g [or --show-geometry]: print the kernel's idea of the geometry"
msgstr ""
-#: fdisk/sfdisk.c:2100
+#: fdisk/sfdisk.c:2141
msgid ""
" -x [or --show-extended]: also list extended partitions on output\n"
" or expect descriptors for them on input"
msgstr ""
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2143
msgid ""
" -L [or --Linux]: do not complain about things irrelevant for Linux"
msgstr ""
-#: fdisk/sfdisk.c:2103
+#: fdisk/sfdisk.c:2144
msgid " -q [or --quiet]: suppress warning messages"
msgstr ""
-#: fdisk/sfdisk.c:2104
+#: fdisk/sfdisk.c:2145
msgid " You can override the detected geometry using:"
msgstr ""
-#: fdisk/sfdisk.c:2105
+#: fdisk/sfdisk.c:2146
msgid " -C# [or --cylinders #]:set the number of cylinders to use"
msgstr ""
" -C# [ou --cylinders #]:configura o número de cilindros a serem usados"
-#: fdisk/sfdisk.c:2106
+#: fdisk/sfdisk.c:2147
msgid " -H# [or --heads #]: set the number of heads to use"
msgstr ""
" -H# [ou --heads #]: configura o número de cabeças a serem usadas"
-#: fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2148
msgid " -S# [or --sectors #]: set the number of sectors to use"
msgstr ""
" -S# [ou --sectors #]: configura o número de setores a serem usados"
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2149
msgid "You can disable all consistency checking with:"
msgstr ""
-#: fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2150
msgid " -f [or --force]: do what I say, even if it is stupid"
msgstr ""
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2156
msgid "Usage:"
msgstr "Uso:"
-#: fdisk/sfdisk.c:2116
+#: fdisk/sfdisk.c:2157
#, c-format
msgid "%s device\t\t list active partitions on device\n"
msgstr ""
-#: fdisk/sfdisk.c:2117
+#: fdisk/sfdisk.c:2158
#, c-format
msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
msgstr ""
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2159
#, c-format
msgid "%s -An device\t activate partition n, inactivate the other ones\n"
msgstr ""
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2278
msgid "no command?\n"
msgstr ""
-#: fdisk/sfdisk.c:2360
+#: fdisk/sfdisk.c:2401
#, c-format
msgid "total: %d blocks\n"
msgstr ""
-#: fdisk/sfdisk.c:2397
+#: fdisk/sfdisk.c:2438
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr ""
-#: fdisk/sfdisk.c:2399
+#: fdisk/sfdisk.c:2440
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr ""
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2442
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr ""
-#: fdisk/sfdisk.c:2408
+#: fdisk/sfdisk.c:2449
msgid "can specify only one device (except with -l or -s)\n"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
#, c-format
msgid "cannot open %s %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "read-write"
msgstr ""
-#: fdisk/sfdisk.c:2433
+#: fdisk/sfdisk.c:2474
msgid "for reading"
msgstr ""
-#: fdisk/sfdisk.c:2458
+#: fdisk/sfdisk.c:2499
#, c-format
msgid "%s: OK\n"
msgstr ""
-#: fdisk/sfdisk.c:2475
+#: fdisk/sfdisk.c:2516
#, c-format
msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
msgstr ""
-#: fdisk/sfdisk.c:2478
+#: fdisk/sfdisk.c:2519
#, c-format
msgid "%s: unknown geometry\n"
msgstr ""
-#: fdisk/sfdisk.c:2493
+#: fdisk/sfdisk.c:2535
#, c-format
msgid "BLKGETSIZE ioctl failed for %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2570
+#: fdisk/sfdisk.c:2612
#, c-format
msgid "bad active byte: 0x%x instead of 0x80\n"
msgstr ""
-#: fdisk/sfdisk.c:2587 fdisk/sfdisk.c:2640 fdisk/sfdisk.c:2670
+#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
msgid ""
"Done\n"
"\n"
@@ -3787,42 +4476,42 @@ msgstr ""
"Feito\n"
"\n"
-#: fdisk/sfdisk.c:2596
+#: fdisk/sfdisk.c:2638
#, 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:2610
+#: fdisk/sfdisk.c:2652
#, c-format
msgid "partition %s has id %x and is not hidden\n"
msgstr ""
-#: fdisk/sfdisk.c:2666
+#: fdisk/sfdisk.c:2708
#, c-format
msgid "Bad Id %x\n"
msgstr ""
-#: fdisk/sfdisk.c:2681
+#: fdisk/sfdisk.c:2723
msgid "This disk is currently in use.\n"
msgstr ""
-#: fdisk/sfdisk.c:2698
+#: fdisk/sfdisk.c:2740
#, c-format
msgid "Fatal error: cannot find %s\n"
msgstr ""
-#: fdisk/sfdisk.c:2701
+#: fdisk/sfdisk.c:2743
#, c-format
msgid "Warning: %s is not a block device\n"
msgstr ""
-#: fdisk/sfdisk.c:2706
+#: fdisk/sfdisk.c:2749
msgid "Checking that no-one is using this disk right now ...\n"
msgstr ""
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2751
msgid ""
"\n"
"This disk is currently in use - repartitioning is probably a bad idea.Umount "
@@ -3830,60 +4519,60 @@ msgid ""
"--no-reread flag to suppress this check.\n"
msgstr ""
-#: fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2755
msgid "Use the --force flag to overrule all checks.\n"
msgstr ""
-#: fdisk/sfdisk.c:2716
+#: fdisk/sfdisk.c:2759
msgid "OK"
msgstr ""
-#: fdisk/sfdisk.c:2725
+#: fdisk/sfdisk.c:2768
msgid "Old situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2772
#, c-format
msgid "Partition %d does not exist, cannot change it\n"
msgstr ""
-#: fdisk/sfdisk.c:2737
+#: fdisk/sfdisk.c:2780
msgid "New situation:\n"
msgstr ""
-#: fdisk/sfdisk.c:2742
+#: fdisk/sfdisk.c:2785
msgid ""
"I don't like these partitions - nothing changed.\n"
"(If you really want this, use the --force option.)\n"
msgstr ""
-#: fdisk/sfdisk.c:2745
+#: fdisk/sfdisk.c:2788
msgid "I don't like this - probably you should answer No\n"
msgstr ""
-#: fdisk/sfdisk.c:2750
+#: fdisk/sfdisk.c:2793
msgid "Are you satisfied with this? [ynq] "
msgstr ""
-#: fdisk/sfdisk.c:2752
+#: fdisk/sfdisk.c:2795
msgid "Do you want to write this to disk? [ynq] "
msgstr "Deseja gravar isto no disco? [ynq] "
-#: fdisk/sfdisk.c:2757
+#: fdisk/sfdisk.c:2800
msgid ""
"\n"
"sfdisk: premature end of input\n"
msgstr ""
-#: fdisk/sfdisk.c:2759
+#: fdisk/sfdisk.c:2802
msgid "Quitting - nothing changed\n"
msgstr ""
-#: fdisk/sfdisk.c:2765
+#: fdisk/sfdisk.c:2808
msgid "Please answer one of y,n,q\n"
msgstr ""
-#: fdisk/sfdisk.c:2773
+#: fdisk/sfdisk.c:2816
msgid ""
"Successfully wrote the new partition table\n"
"\n"
@@ -3891,27 +4580,27 @@ msgstr ""
"Tabela de partiçőes gravada com sucesso\n"
"\n"
-#: fdisk/sfdisk.c:2779
+#: fdisk/sfdisk.c:2822
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 ""
-#: games/banner.c:1051
+#: games/banner.c:1048
msgid "usage: banner [-w width]\n"
msgstr ""
-#: games/banner.c:1071
+#: games/banner.c:1068
msgid "Message: "
msgstr "Mensagem: "
-#: games/banner.c:1105
+#: games/banner.c:1102
#, c-format
msgid "The character '%c' is not in my character set"
msgstr ""
-#: games/banner.c:1113
+#: games/banner.c:1110
#, c-format
msgid "Message '%s' is OK\n"
msgstr ""
@@ -3998,146 +4687,146 @@ msgstr "getopt (melhorado) 1.0.3)\n"
msgid "internal error, contact the author."
msgstr "erro interno, contacte o autor."
-#: login-utils/agetty.c:300
+#: login-utils/agetty.c:303
msgid "calling open_tty\n"
msgstr ""
#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:313
+#: login-utils/agetty.c:316
msgid "calling termio_init\n"
msgstr ""
-#: login-utils/agetty.c:318
+#: login-utils/agetty.c:321
msgid "writing init string\n"
msgstr ""
#. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:328
+#: login-utils/agetty.c:331
msgid "before autobaud\n"
msgstr ""
-#: login-utils/agetty.c:340
+#: login-utils/agetty.c:343
msgid "waiting for cr-lf\n"
msgstr ""
-#: login-utils/agetty.c:344
+#: login-utils/agetty.c:347
#, c-format
msgid "read %c\n"
msgstr ""
#. Read the login name.
-#: login-utils/agetty.c:353
+#: login-utils/agetty.c:356
msgid "reading login name\n"
msgstr ""
-#: login-utils/agetty.c:374
+#: login-utils/agetty.c:377
#, c-format
msgid "%s: can't exec %s: %m"
msgstr ""
-#: login-utils/agetty.c:394
+#: login-utils/agetty.c:397
msgid "can't malloc initstring"
msgstr ""
-#: login-utils/agetty.c:456
+#: login-utils/agetty.c:459
#, c-format
msgid "bad timeout value: %s"
msgstr ""
-#: login-utils/agetty.c:465
+#: login-utils/agetty.c:468
msgid "after getopt loop\n"
msgstr ""
-#: login-utils/agetty.c:483
+#: login-utils/agetty.c:486
msgid "exiting parseargs\n"
msgstr ""
-#: login-utils/agetty.c:496
+#: login-utils/agetty.c:499
msgid "entered parse_speeds\n"
msgstr ""
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:502
#, c-format
msgid "bad speed: %s"
msgstr ""
-#: login-utils/agetty.c:501
+#: login-utils/agetty.c:504
msgid "too many alternate speeds"
msgstr "Número excessivo de velocidades alternativas"
-#: login-utils/agetty.c:503
+#: login-utils/agetty.c:506
msgid "exiting parsespeeds\n"
msgstr ""
-#: login-utils/agetty.c:576
+#: login-utils/agetty.c:579
#, c-format
msgid "%s: open for update: %m"
msgstr ""
-#: login-utils/agetty.c:592
+#: login-utils/agetty.c:595
#, c-format
msgid "%s: no utmp entry"
msgstr ""
-#: login-utils/agetty.c:621
+#: login-utils/agetty.c:624
#, c-format
msgid "/dev: chdir() failed: %m"
msgstr ""
-#: login-utils/agetty.c:625
+#: login-utils/agetty.c:628
#, c-format
msgid "/dev/%s: not a character device"
msgstr ""
#. ignore close(2) errors
-#: login-utils/agetty.c:632
+#: login-utils/agetty.c:635
msgid "open(2)\n"
msgstr ""
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:637
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr ""
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:647
#, c-format
msgid "%s: not open for read/write"
msgstr ""
#. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:648
+#: login-utils/agetty.c:651
msgid "duping\n"
msgstr ""
#. set up stdout and stderr
-#: login-utils/agetty.c:650
+#: login-utils/agetty.c:653
#, c-format
msgid "%s: dup problem: %m"
msgstr ""
-#: login-utils/agetty.c:712
+#: login-utils/agetty.c:723
msgid "term_io 2\n"
msgstr ""
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:905
msgid "user"
msgstr "usuário"
-#: login-utils/agetty.c:894
+#: login-utils/agetty.c:905
msgid "users"
msgstr "usuários"
-#: login-utils/agetty.c:982
+#: login-utils/agetty.c:993
#, c-format
msgid "%s: read: %m"
msgstr ""
-#: login-utils/agetty.c:1028
+#: login-utils/agetty.c:1039
#, c-format
msgid "%s: input overrun"
msgstr ""
-#: login-utils/agetty.c:1152
+#: login-utils/agetty.c:1163
#, c-format
msgid ""
"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
@@ -4169,7 +4858,7 @@ msgid "can't malloc for grplist"
msgstr ""
#. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:424
+#: login-utils/checktty.c:431
#, c-format
msgid "Login on %s from %s denied by default.\n"
msgstr ""
@@ -4178,95 +4867,95 @@ msgstr ""
#. 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:435
+#: login-utils/checktty.c:442
#, c-format
msgid "Login on %s from %s denied.\n"
msgstr ""
-#: login-utils/chfn.c:139 login-utils/chsh.c:118
+#: login-utils/chfn.c:135 login-utils/chsh.c:118
#, c-format
msgid "%s: you (user %d) don't exist.\n"
msgstr ""
-#: login-utils/chfn.c:146 login-utils/chsh.c:125
+#: login-utils/chfn.c:142 login-utils/chsh.c:125
#, c-format
msgid "%s: user \"%s\" does not exist.\n"
msgstr ""
-#: login-utils/chfn.c:151 login-utils/chsh.c:130
+#: login-utils/chfn.c:147 login-utils/chsh.c:130
#, c-format
msgid "%s: can only change local entries; use yp%s instead.\n"
msgstr ""
-#: login-utils/chfn.c:163
+#: login-utils/chfn.c:159
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "Modificando informaçőes finger para o usuário %s.\n"
-#: login-utils/chfn.c:169 login-utils/chfn.c:173 login-utils/chfn.c:180
-#: login-utils/chfn.c:184 login-utils/chsh.c:154 login-utils/chsh.c:158
+#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
+#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
#: login-utils/chsh.c:165 login-utils/chsh.c:169
msgid "Password error."
msgstr "Erro na senha."
-#: login-utils/chfn.c:193 login-utils/chsh.c:178 login-utils/login.c:650
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:196
-#: mount/lomount.c:202 mount/losetup.c:115 mount/losetup.c:121
+#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:678
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
+#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
msgid "Password: "
msgstr "Senha: "
-#: login-utils/chfn.c:196 login-utils/chsh.c:181
+#: login-utils/chfn.c:192 login-utils/chsh.c:181
msgid "Incorrect password."
msgstr "Senha incorreta."
-#: login-utils/chfn.c:207
+#: login-utils/chfn.c:203
msgid "Finger information not changed.\n"
msgstr ""
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:306
#, c-format
msgid "Usage: %s [ -f full-name ] [ -o office ] "
msgstr "Uso: %s [ -f nome-completo ] [ -o local_de_trabalho ] "
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:307
msgid ""
"[ -p office-phone ]\n"
"\t[ -h home-phone ] "
msgstr ""
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:308
msgid "[ --help ] [ --version ]\n"
msgstr ""
-#: login-utils/chfn.c:381 login-utils/chsh.c:294
+#: login-utils/chfn.c:377 login-utils/chsh.c:294
msgid ""
"\n"
"Aborted.\n"
msgstr ""
-#: login-utils/chfn.c:414
+#: login-utils/chfn.c:410
msgid "field is too long.\n"
msgstr "Campo muito longo.\n"
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:418
#, c-format
msgid "'%c' is not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:427
+#: login-utils/chfn.c:423
msgid "Control characters are not allowed.\n"
msgstr ""
-#: login-utils/chfn.c:492
+#: login-utils/chfn.c:488
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr ""
"As informaçőes finger *NĂO* foram modificada. Tente novamente mais tarde.\n"
-#: login-utils/chfn.c:495
+#: login-utils/chfn.c:491
msgid "Finger information changed.\n"
msgstr ""
-#: login-utils/chfn.c:509 login-utils/chsh.c:412 sys-utils/cytune.c:315
+#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
msgid "malloc failed"
msgstr ""
@@ -4398,65 +5087,60 @@ msgstr ""
msgid "Can't read %s, exiting."
msgstr ""
-#: login-utils/last.c:138
+#: login-utils/last.c:143
msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
msgstr ""
-#: login-utils/last.c:215
-#, c-format
-msgid "last: %s: "
-msgstr ""
-
-#: login-utils/last.c:270
+#: login-utils/last.c:283
msgid " still logged in"
msgstr ""
-#: login-utils/last.c:291
+#: login-utils/last.c:305
#, c-format
msgid ""
"\n"
-"wtmp begins %10.10s %5.5s \n"
+"wtmp begins %s"
msgstr ""
-#: login-utils/last.c:352 login-utils/last.c:372 login-utils/last.c:427
+#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
msgid "last: malloc failure.\n"
msgstr ""
-#: login-utils/last.c:401
+#: login-utils/last.c:416
msgid "last: gethostname"
msgstr ""
-#: login-utils/last.c:454
+#: login-utils/last.c:469
#, c-format
msgid ""
"\n"
"interrupted %10.10s %5.5s \n"
msgstr ""
-#: login-utils/login.c:349
+#: login-utils/login.c:377
msgid "login: -h for super-user only.\n"
msgstr "login: -h somente pode ser especificado pelo superusuário.\n"
-#: login-utils/login.c:374
+#: login-utils/login.c:402
msgid "usage: login [-fp] [username]\n"
msgstr ""
-#: login-utils/login.c:476
+#: login-utils/login.c:504
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr ""
-#: login-utils/login.c:478
+#: login-utils/login.c:506
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr ""
-#: login-utils/login.c:518
+#: login-utils/login.c:546
#, c-format
msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:520
+#: login-utils/login.c:548
msgid ""
"Login incorrect\n"
"\n"
@@ -4464,17 +5148,17 @@ msgstr ""
"Login incorreto\n"
"\n"
-#: login-utils/login.c:529
+#: login-utils/login.c:557
#, c-format
msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:533
+#: login-utils/login.c:561
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr ""
-#: login-utils/login.c:536
+#: login-utils/login.c:564
msgid ""
"\n"
"Login incorrect\n"
@@ -4482,129 +5166,129 @@ msgstr ""
"\n"
"Login incorreto\n"
-#: login-utils/login.c:585
+#: login-utils/login.c:613
msgid "Illegal username"
msgstr "Nome de usuário inválido"
-#: login-utils/login.c:628
+#: login-utils/login.c:656
#, c-format
msgid "%s login refused on this terminal.\n"
msgstr ""
-#: login-utils/login.c:633
+#: login-utils/login.c:661
#, c-format
msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
msgstr ""
-#: login-utils/login.c:637
+#: login-utils/login.c:665
#, c-format
msgid "LOGIN %s REFUSED ON TTY %s"
msgstr ""
-#: login-utils/login.c:689
+#: login-utils/login.c:717
msgid "Login incorrect\n"
msgstr "Login incorreto\n"
-#: login-utils/login.c:711
+#: login-utils/login.c:739
msgid ""
"Too many users logged on already.\n"
"Try again later.\n"
msgstr ""
-#: login-utils/login.c:715
+#: login-utils/login.c:743
msgid "You have too many processes running.\n"
msgstr ""
-#: login-utils/login.c:761
+#: login-utils/login.c:789
msgid "Warning: no Kerberos tickets issued\n"
msgstr ""
-#: login-utils/login.c:773
+#: login-utils/login.c:801
msgid "Sorry -- your password has expired.\n"
msgstr ""
-#: login-utils/login.c:779
+#: login-utils/login.c:807
#, c-format
msgid "Warning: your password expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:787
+#: login-utils/login.c:815
msgid "Sorry -- your account has expired.\n"
msgstr ""
-#: login-utils/login.c:793
+#: login-utils/login.c:821
#, c-format
msgid "Warning: your account expires on %s %d, %d\n"
msgstr ""
-#: login-utils/login.c:1012
+#: login-utils/login.c:1055
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr ""
-#: login-utils/login.c:1019
+#: login-utils/login.c:1062
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr ""
-#: login-utils/login.c:1022
+#: login-utils/login.c:1065
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr ""
-#: login-utils/login.c:1025
+#: login-utils/login.c:1068
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr ""
-#: login-utils/login.c:1028
+#: login-utils/login.c:1071
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr ""
-#: login-utils/login.c:1039
+#: login-utils/login.c:1083
#, c-format
msgid "You have %smail.\n"
msgstr "Vocę tem mensagens %s na caixa de correio.\n"
-#: login-utils/login.c:1040
+#: login-utils/login.c:1084
msgid "new "
msgstr ""
#. error in fork()
-#: login-utils/login.c:1057
+#: login-utils/login.c:1102
#, c-format
msgid "login: failure forking: %s"
msgstr ""
-#: login-utils/login.c:1072
+#: login-utils/login.c:1117
msgid "setuid() failed"
msgstr ""
-#: login-utils/login.c:1078
+#: login-utils/login.c:1123
#, c-format
msgid "No directory %s!\n"
msgstr ""
-#: login-utils/login.c:1082
+#: login-utils/login.c:1127
msgid "Logging in with home = \"/\".\n"
msgstr ""
-#: login-utils/login.c:1090
+#: login-utils/login.c:1135
msgid "login: no memory for shell script.\n"
msgstr ""
-#: login-utils/login.c:1116
+#: login-utils/login.c:1163
#, c-format
msgid "login: couldn't exec shell script: %s.\n"
msgstr ""
-#: login-utils/login.c:1119
+#: login-utils/login.c:1166
#, c-format
msgid "login: no shell: %s.\n"
msgstr ""
-#: login-utils/login.c:1135
+#: login-utils/login.c:1182
#, c-format
msgid ""
"\n"
@@ -4613,62 +5297,62 @@ msgstr ""
"\n"
"%s usuário: "
-#: login-utils/login.c:1146
+#: login-utils/login.c:1193
msgid "login name much too long.\n"
msgstr "nome de login muito longo.\n"
-#: login-utils/login.c:1147
+#: login-utils/login.c:1194
msgid "NAME too long"
msgstr "NOME muito longo"
-#: login-utils/login.c:1154
+#: login-utils/login.c:1201
msgid "login names may not start with '-'.\n"
msgstr ""
-#: login-utils/login.c:1164
+#: login-utils/login.c:1211
msgid "too many bare linefeeds.\n"
msgstr "Número excessivo de saltos de linha.\n"
-#: login-utils/login.c:1165
+#: login-utils/login.c:1212
msgid "EXCESSIVE linefeeds"
msgstr ""
-#: login-utils/login.c:1176
+#: login-utils/login.c:1223
#, c-format
msgid "Login timed out after %d seconds\n"
msgstr "Tempo de login esgotado após %d segundos\n"
-#: login-utils/login.c:1276
+#: login-utils/login.c:1323
#, c-format
msgid "Last login: %.*s "
msgstr "Último login: %.*s "
-#: login-utils/login.c:1280
+#: login-utils/login.c:1327
#, c-format
msgid "from %.*s\n"
msgstr "a partir de %.*s\n"
-#: login-utils/login.c:1283
+#: login-utils/login.c:1330
#, c-format
msgid "on %.*s\n"
msgstr "em: %.*s\n"
-#: login-utils/login.c:1306
+#: login-utils/login.c:1353
#, c-format
msgid "LOGIN FAILURE FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1309
+#: login-utils/login.c:1356
#, c-format
msgid "LOGIN FAILURE ON %s, %s"
msgstr ""
-#: login-utils/login.c:1313
+#: login-utils/login.c:1360
#, c-format
msgid "%d LOGIN FAILURES FROM %s, %s"
msgstr ""
-#: login-utils/login.c:1316
+#: login-utils/login.c:1363
#, c-format
msgid "%d LOGIN FAILURES ON %s, %s"
msgstr ""
@@ -4709,129 +5393,129 @@ msgstr ""
msgid "No shell"
msgstr ""
-#: login-utils/passwd.c:165
+#: login-utils/passwd.c:163
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:178
+#: login-utils/passwd.c:176
msgid "The password must contain characters out of two of the following\n"
msgstr "A senha deve conter caracteres de uma das duas classes seguintes:\n"
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:177
msgid "classes: upper and lower case letters, digits and non alphanumeric\n"
msgstr ""
"letras maiúsculas e minúsculas, dígitos e caracteres năo alfanuméricos.\n"
-#: login-utils/passwd.c:180
+#: login-utils/passwd.c:178
msgid "characters. See passwd(1) for more information.\n"
msgstr "Veja passwd(1) para maiores informaçőes.\n"
-#: login-utils/passwd.c:185
+#: login-utils/passwd.c:183
msgid "You cannot reuse the old password.\n"
msgstr "Vocę năo pode reutilizar a senha antiga.\n"
-#: login-utils/passwd.c:190
+#: login-utils/passwd.c:188
msgid "Please don't use something like your username as password!\n"
msgstr ""
-#: login-utils/passwd.c:201 login-utils/passwd.c:208
+#: login-utils/passwd.c:199 login-utils/passwd.c:206
msgid "Please don't use something like your realname as password!\n"
msgstr ""
-#: login-utils/passwd.c:225
+#: login-utils/passwd.c:223
msgid "Usage: passwd [username [password]]\n"
msgstr ""
-#: login-utils/passwd.c:226
+#: login-utils/passwd.c:224
msgid "Only root may use the one and two argument forms.\n"
msgstr ""
-#: login-utils/passwd.c:282
+#: login-utils/passwd.c:280
msgid "Usage: passwd [-foqsvV] [user [password]]\n"
msgstr ""
-#: login-utils/passwd.c:302
+#: login-utils/passwd.c:301
#, c-format
msgid "Can't exec %s: %s\n"
msgstr ""
-#: login-utils/passwd.c:313
+#: login-utils/passwd.c:312
msgid "Cannot find login name"
msgstr ""
-#: login-utils/passwd.c:320 login-utils/passwd.c:327
+#: login-utils/passwd.c:319 login-utils/passwd.c:326
msgid "Only root can change the password for others.\n"
msgstr ""
-#: login-utils/passwd.c:335
+#: login-utils/passwd.c:334
msgid "Too many arguments.\n"
msgstr "Número excessivo de argumentos.\n"
-#: login-utils/passwd.c:340
+#: login-utils/passwd.c:339
#, c-format
msgid "Can't find username anywhere. Is `%s' really a user?"
msgstr ""
-#: login-utils/passwd.c:344
+#: login-utils/passwd.c:343
msgid "Sorry, I can only change local passwords. Use yppasswd instead."
msgstr ""
-#: login-utils/passwd.c:350
+#: login-utils/passwd.c:349
msgid "UID and username does not match, imposter!"
msgstr ""
-#: login-utils/passwd.c:355
+#: login-utils/passwd.c:354
#, c-format
msgid "Changing password for %s\n"
msgstr "Modificando a senha para o usuário %s\n"
-#: login-utils/passwd.c:359
+#: login-utils/passwd.c:358
msgid "Enter old password: "
msgstr "Informe a senha anterior: "
-#: login-utils/passwd.c:361
+#: login-utils/passwd.c:360
msgid "Illegal password, imposter."
msgstr "Senha incorreta, impostor."
-#: login-utils/passwd.c:373
+#: login-utils/passwd.c:372
msgid "Enter new password: "
msgstr "Informa a nova senha: "
-#: login-utils/passwd.c:375
+#: login-utils/passwd.c:374
msgid "Password not changed."
msgstr "A senha NĂO foi modificada."
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:384
msgid "Re-type new password: "
msgstr "Redigite a nova senha: "
-#: login-utils/passwd.c:388
+#: login-utils/passwd.c:387
msgid "You misspelled it. Password not changed."
msgstr "Vocę năo a informou corretamente. A senha NĂO foi modificada."
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:402
#, c-format
msgid "password changed, user %s"
msgstr "senha modificada, usuário %s"
-#: login-utils/passwd.c:406
+#: login-utils/passwd.c:405
msgid "ROOT PASSWORD CHANGED"
msgstr "A SENHA DO ROOT FOI MODIFICADA"
-#: login-utils/passwd.c:408
+#: login-utils/passwd.c:407
#, c-format
msgid "password changed by root, user %s"
msgstr "senha modificada pelo root, usuário %s"
-#: login-utils/passwd.c:415
+#: login-utils/passwd.c:414
msgid "calling setpwnam to set password.\n"
msgstr ""
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:418
msgid "Password *NOT* changed. Try again later.\n"
msgstr "A senha *NĂO* foi modificada. Tente novamente mais tarde.\n"
-#: login-utils/passwd.c:425
+#: login-utils/passwd.c:424
msgid "Password changed.\n"
msgstr "Senha modificada.\n"
@@ -4849,11 +5533,7 @@ msgid "%s: Only root can shut a system down.\n"
msgstr ""
#: login-utils/shutdown.c:219
-msgid "That must be tomorrow, "
-msgstr ""
-
-#: login-utils/shutdown.c:220
-msgid "can't you wait till then?\n"
+msgid "That must be tomorrow, can't you wait till then?\n"
msgstr ""
#: login-utils/shutdown.c:271
@@ -4887,94 +5567,91 @@ msgid "halted"
msgstr ""
#. RB_AUTOBOOT
-#: login-utils/shutdown.c:369
+#: login-utils/shutdown.c:377
msgid ""
"\n"
"Why am I still alive after reboot?"
msgstr ""
-#: login-utils/shutdown.c:371
+#: login-utils/shutdown.c:379
msgid ""
"\n"
"Now you can turn off the power..."
msgstr ""
-#: login-utils/shutdown.c:386
+#: login-utils/shutdown.c:394
msgid "Calling kernel power-off facility...\n"
msgstr ""
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:397
#, c-format
msgid "Error powering off\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:405
#, c-format
msgid "Executing the program \"%s\" ...\n"
msgstr ""
-#: login-utils/shutdown.c:400
+#: login-utils/shutdown.c:408
#, c-format
msgid "Error executing\t%s\n"
msgstr ""
-#: login-utils/shutdown.c:423
+#: login-utils/shutdown.c:431
#, c-format
msgid "URGENT: broadcast message from %s:"
msgstr ""
-#: login-utils/shutdown.c:429
+#: login-utils/shutdown.c:437
msgid "System going down IMMEDIATELY!\n"
msgstr ""
-#: login-utils/shutdown.c:432
+#: login-utils/shutdown.c:440
#, c-format
msgid "System going down in %d hour%s %d minutes"
msgstr ""
-#: login-utils/shutdown.c:435
+#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+msgid "s"
+msgstr ""
+
+#: login-utils/shutdown.c:443
#, c-format
msgid "System going down in %d minute%s\n"
msgstr ""
-#: login-utils/shutdown.c:441
+#: login-utils/shutdown.c:449
#, c-format
msgid "\t... %s ...\n"
msgstr ""
-#: login-utils/shutdown.c:498
-msgid "Cannot fork for swapoff. Shrug!"
-msgstr ""
-
#: login-utils/shutdown.c:506
-msgid "Cannot exec swapoff, "
+msgid "Cannot fork for swapoff. Shrug!"
msgstr ""
-#: login-utils/shutdown.c:507
-msgid "hoping umount will do the trick."
+#: login-utils/shutdown.c:514
+msgid "Cannot exec swapoff, hoping umount will do the trick."
msgstr ""
-#: login-utils/shutdown.c:525
+#: login-utils/shutdown.c:533
msgid "Cannot fork for umount, trying manually."
msgstr ""
-#: login-utils/shutdown.c:531
-msgid "Cannot exec "
-msgstr ""
-
-#: login-utils/shutdown.c:531
-msgid ", trying umount."
+#: login-utils/shutdown.c:542
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
msgstr ""
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:546
msgid "Cannot exec umount, giving up on umount."
msgstr ""
-#: login-utils/shutdown.c:538
+#: login-utils/shutdown.c:551
msgid "Unmounting any remaining filesystems..."
msgstr ""
-#: login-utils/shutdown.c:574
+#: login-utils/shutdown.c:587
#, c-format
msgid "shutdown: Couldn't umount %s\n"
msgstr ""
@@ -5013,7 +5690,7 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:302 text-utils/more.c:1469
+#: login-utils/simpleinit.c:302 text-utils/more.c:1549
msgid "exec failed\n"
msgstr ""
@@ -5025,114 +5702,102 @@ msgstr ""
msgid "no TERM or cannot stat tty\n"
msgstr ""
-#: login-utils/ttymsg.c:79
+#: login-utils/ttymsg.c:81
msgid "too many iov's (change code in wall/ttymsg.c)"
msgstr ""
-#. A slash is an attempt to break security...
-#: login-utils/ttymsg.c:83
-#, c-format
-msgid "'/' in \"%s\""
-msgstr ""
-
-#: login-utils/ttymsg.c:88
+#: login-utils/ttymsg.c:91
msgid "excessively long line arg"
msgstr ""
-#: login-utils/ttymsg.c:142
+#: login-utils/ttymsg.c:145
msgid "cannot fork"
msgstr ""
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:149
#, c-format
msgid "fork: %s"
msgstr ""
-#: login-utils/ttymsg.c:172
+#: login-utils/ttymsg.c:177
#, c-format
msgid "%s: BAD ERROR"
msgstr ""
-#: login-utils/vipw.c:147
+#: login-utils/vipw.c:149
#, c-format
msgid "%s: the %s file is busy.\n"
msgstr ""
-#: login-utils/vipw.c:163
+#: login-utils/vipw.c:165
#, c-format
msgid "%s: the %s file is busy (%s present)\n"
msgstr ""
-#: login-utils/vipw.c:168
+#: login-utils/vipw.c:171
#, c-format
msgid "%s: can't link %s: %s\n"
msgstr ""
-#: login-utils/vipw.c:188
+#: login-utils/vipw.c:193
#, c-format
msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
msgstr ""
-#: login-utils/vipw.c:212
+#: login-utils/vipw.c:217
#, c-format
msgid "%s: Cannot fork\n"
msgstr ""
-#: login-utils/vipw.c:252
+#: login-utils/vipw.c:257
#, c-format
msgid "%s: %s unchanged\n"
msgstr "%s: %s năo foi modificada\n"
-#: login-utils/vipw.c:295
+#: login-utils/vipw.c:300
#, c-format
msgid "%s: no changes made\n"
msgstr ""
-#: login-utils/wall.c:104
-msgid "usage: wall [file]\n"
-msgstr ""
-
-#: login-utils/wall.c:115
-#, c-format
-msgid "wall: cannot read %s.\n"
-msgstr ""
+#: login-utils/wall.c:103
+#, fuzzy, c-format
+msgid "usage: %s [file]\n"
+msgstr "Uso: script [-a] [arquivo]\n"
-#: login-utils/wall.c:132
+#: login-utils/wall.c:151
#, c-format
-msgid "wall: %s\n"
+msgid "%s: can't open temporary file.\n"
msgstr ""
-#: login-utils/wall.c:154
-msgid "wall: can't open temporary file.\n"
-msgstr ""
-
-#: login-utils/wall.c:181
+#: login-utils/wall.c:178
#, c-format
msgid "Broadcast Message from %s@%s"
msgstr ""
-#: login-utils/wall.c:191
+#: login-utils/wall.c:188
#, c-format
-msgid "wall: can't read %s.\n"
+msgid "%s: can't read %s.\n"
msgstr ""
-#: login-utils/wall.c:216
-msgid "wall: can't stat temporary file.\n"
+#: login-utils/wall.c:213
+#, c-format
+msgid "%s: can't stat temporary file.\n"
msgstr ""
-#: login-utils/wall.c:225
-msgid "wall: can't read temporary file.\n"
+#: login-utils/wall.c:222
+#, c-format
+msgid "%s: can't read temporary file.\n"
msgstr ""
-#: misc-utils/cal.c:198
+#: misc-utils/cal.c:184
msgid "illegal month value: use 1-12"
msgstr ""
-#: misc-utils/cal.c:202
+#: misc-utils/cal.c:188
msgid "illegal year value: use 1-9999"
msgstr ""
-#: misc-utils/cal.c:498
+#: misc-utils/cal.c:484
msgid "usage: cal [-mjy] [[month] year]\n"
msgstr ""
@@ -5171,44 +5836,36 @@ msgstr ""
msgid " %s -l [ signal ]\n"
msgstr ""
-#: misc-utils/logger.c:135
+#: misc-utils/logger.c:144
#, c-format
msgid "logger: %s: %s.\n"
msgstr ""
-#: misc-utils/logger.c:232
+#: misc-utils/logger.c:241
#, c-format
msgid "logger: unknown facility name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:244
+#: misc-utils/logger.c:253
#, c-format
msgid "logger: unknown priority name: %s.\n"
msgstr ""
-#: misc-utils/logger.c:271
-msgid "logger: [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+#: misc-utils/logger.c:280
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr ""
-#: misc-utils/look.c:170 misc-utils/setterm.c:1153 text-utils/more.c:1782
-#: text-utils/more.c:1793
-msgid "Out of memory"
-msgstr "faltou memória"
-
#: misc-utils/look.c:340
msgid "usage: look [-dfa] [-t char] string [file]\n"
msgstr ""
-#: misc-utils/look.c:365
-msgid "look: "
-msgstr ""
-
-#: misc-utils/mcookie.c:95 misc-utils/mcookie.c:120
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
#, c-format
msgid "Could not open %s\n"
msgstr ""
-#: misc-utils/mcookie.c:103 misc-utils/mcookie.c:117
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
#, c-format
msgid "Got %d bytes from %s\n"
msgstr ""
@@ -5254,37 +5911,37 @@ msgstr ""
msgid "namei: unknown file type 0%06o on file %s\n"
msgstr ""
-#: misc-utils/script.c:108
+#: misc-utils/script.c:109
msgid "usage: script [-a] [file]\n"
msgstr "Uso: script [-a] [arquivo]\n"
-#: misc-utils/script.c:128
+#: misc-utils/script.c:129
#, c-format
msgid "Script started, file is %s\n"
msgstr ""
-#: misc-utils/script.c:197
+#: misc-utils/script.c:198
#, c-format
msgid "Script started on %s"
msgstr ""
-#: misc-utils/script.c:263
+#: misc-utils/script.c:264
#, c-format
msgid ""
"\n"
"Script done on %s"
msgstr ""
-#: misc-utils/script.c:268
+#: misc-utils/script.c:269
#, c-format
msgid "Script done, file is %s\n"
msgstr ""
-#: misc-utils/script.c:280
+#: misc-utils/script.c:281
msgid "openpty failed\n"
msgstr ""
-#: misc-utils/script.c:314
+#: misc-utils/script.c:315
msgid "Out of pty's\n"
msgstr ""
@@ -5294,11 +5951,6 @@ msgstr ""
msgid "%s: Argument error, usage\n"
msgstr ""
-#: misc-utils/setterm.c:747
-#, c-format
-msgid "%s\n"
-msgstr ""
-
#: misc-utils/setterm.c:748
msgid " [ -term terminal_name ]\n"
msgstr ""
@@ -5544,154 +6196,149 @@ msgstr ""
msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
msgstr ""
-#: misc-utils/write.c:101
+#: misc-utils/write.c:99
msgid "write: can't find your tty's name\n"
msgstr ""
-#: misc-utils/write.c:112
+#: misc-utils/write.c:110
msgid "write: you have write permission turned off.\n"
msgstr ""
-#: misc-utils/write.c:133
+#: misc-utils/write.c:131
#, c-format
msgid "write: %s is not logged in on %s.\n"
msgstr ""
-#: misc-utils/write.c:141
+#: misc-utils/write.c:139
#, c-format
msgid "write: %s has messages disabled on %s\n"
msgstr ""
-#: misc-utils/write.c:148
+#: misc-utils/write.c:146
msgid "usage: write user [tty]\n"
msgstr ""
-#: misc-utils/write.c:247
+#: misc-utils/write.c:245
#, c-format
msgid "write: %s is not logged in\n"
msgstr ""
-#: misc-utils/write.c:256
+#: misc-utils/write.c:254
#, c-format
msgid "write: %s has messages disabled\n"
msgstr ""
-#: misc-utils/write.c:260
+#: misc-utils/write.c:258
#, c-format
msgid "write: %s is logged in more than once; writing to %s\n"
msgstr ""
-#: misc-utils/write.c:327
+#: misc-utils/write.c:325
#, c-format
msgid "Message from %s@%s on %s at %s ..."
msgstr ""
-#: mount/fstab.c:113
+#: mount/fstab.c:116
#, c-format
msgid "warning: error reading %s: %s"
msgstr ""
-#: mount/fstab.c:140 mount/fstab.c:162
+#: mount/fstab.c:143 mount/fstab.c:166
#, c-format
msgid "warning: can't open %s: %s"
msgstr "Atençăo: năo foi possível abrir %s: %s"
-#: mount/fstab.c:144
+#: mount/fstab.c:147
#, c-format
msgid "mount: could not open %s - using %s instead\n"
msgstr ""
-#. MOUNTLOCK_LINKTARGET does not exist (as a file)
+#. 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:346
+#: mount/fstab.c:375
#, c-format
msgid "can't create lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:358
+#: mount/fstab.c:387
#, c-format
msgid "can't link lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:369
+#: mount/fstab.c:399
#, c-format
msgid "can't open lock file %s: %s (use -n flag to override)"
msgstr ""
-#: mount/fstab.c:383
+#: mount/fstab.c:414
#, c-format
msgid "Can't lock lock file %s: %s\n"
msgstr ""
-#: mount/fstab.c:392
+#: mount/fstab.c:425
#, c-format
msgid "can't lock lock file %s: %s"
msgstr ""
-#: mount/fstab.c:394
+#: mount/fstab.c:427
msgid "timed out"
msgstr ""
-#: mount/fstab.c:438
+#: mount/fstab.c:472 mount/fstab.c:480
#, c-format
msgid "cannot open %s (%s) - mtab not updated"
msgstr ""
-#: mount/fstab.c:445
-#, c-format
-msgid "can't open %s (%s) - mtab not updated"
-msgstr ""
-
-#: mount/fstab.c:470
+#: mount/fstab.c:505
msgid "mount: warning: cannot change mounted device with a remount\n"
msgstr ""
-#: mount/fstab.c:475
+#: mount/fstab.c:510
msgid "mount: warning: cannot change filesystem type with a remount\n"
msgstr ""
-#: mount/fstab.c:482 mount/fstab.c:486
+#: mount/fstab.c:518 mount/fstab.c:524
#, c-format
msgid "error writing %s: %s"
msgstr ""
-#: mount/fstab.c:491
+#: mount/fstab.c:531
#, c-format
msgid "error changing mode of %s: %s\n"
msgstr ""
-#: mount/fstab.c:496
+#: mount/fstab.c:538
#, c-format
msgid "can't rename %s to %s: %s\n"
msgstr ""
-#: mount/lomount.c:75
+#: mount/lomount.c:78
#, c-format
msgid "loop: can't open device %s: %s\n"
msgstr ""
-#: mount/lomount.c:80
+#: mount/lomount.c:84
#, c-format
msgid "loop: can't get info on device %s: %s\n"
msgstr ""
-#: mount/lomount.c:85 mount/losetup.c:74
+#: mount/lomount.c:89 mount/losetup.c:74
#, c-format
msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
msgstr ""
-#: mount/lomount.c:139
+#: mount/lomount.c:143
msgid "mount: could not find any device /dev/loop#"
msgstr ""
-#: mount/lomount.c:143
+#: mount/lomount.c:147
msgid ""
"mount: Could not find any loop device.\n"
" Maybe /dev/loop# has a wrong major number?"
msgstr ""
-#: mount/lomount.c:147
+#: mount/lomount.c:151
#, c-format
msgid ""
"mount: Could not find any loop device, and, according to %s,\n"
@@ -5699,52 +6346,52 @@ msgid ""
" (If so, then recompile or `insmod loop.o'.)"
msgstr ""
-#: mount/lomount.c:152
+#: mount/lomount.c:156
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/lomount.c:156
+#: mount/lomount.c:160
msgid "mount: could not find any free loop device"
msgstr ""
-#: mount/lomount.c:187 mount/losetup.c:106
+#: mount/lomount.c:191 mount/losetup.c:106
#, c-format
msgid "Unsupported encryption type %s\n"
msgstr ""
-#: mount/lomount.c:206 mount/losetup.c:125
+#: mount/lomount.c:210 mount/losetup.c:125
msgid "Init (up to 16 hex digits): "
msgstr ""
-#: mount/lomount.c:213 mount/losetup.c:132
+#: mount/lomount.c:217 mount/losetup.c:132
#, c-format
msgid "Non-hex digit '%c'.\n"
msgstr ""
-#: mount/lomount.c:219 mount/losetup.c:138
+#: mount/lomount.c:223 mount/losetup.c:138
#, c-format
msgid "Don't know how to get key for encryption system %d\n"
msgstr ""
-#: mount/lomount.c:235
+#: mount/lomount.c:239
#, c-format
msgid "set_loop(%s,%s,%d): success\n"
msgstr ""
-#: mount/lomount.c:245
+#: mount/lomount.c:250
#, c-format
msgid "loop: can't delete device %s: %s\n"
msgstr ""
-#: mount/lomount.c:255
+#: mount/lomount.c:260
#, c-format
msgid "del_loop(%s): success\n"
msgstr ""
-#: mount/lomount.c:263
+#: mount/lomount.c:268
msgid "This mount was compiled without loop support. Please recompile.\n"
msgstr ""
@@ -5770,297 +6417,304 @@ msgstr ""
msgid "[mntent]: warning: no final newline at the end of %s\n"
msgstr ""
-#: mount/mntent.c:214
+#: mount/mntent.c:216
#, c-format
msgid "[mntent]: line %d in %s is bad%s\n"
msgstr ""
-#: mount/mntent.c:217
+#: mount/mntent.c:219
msgid "; rest of file ignored"
msgstr ""
-#: mount/mount.c:319
+#: mount/mount.c:333
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:322
+#: mount/mount.c:336
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:342
+#: mount/mount.c:357
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:355 mount/mount.c:597
+#: mount/mount.c:372 mount/mount.c:644
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:360
+#: mount/mount.c:379
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:434
+#: mount/mount.c:473
msgid "mount failed"
msgstr ""
-#: mount/mount.c:436
+#: mount/mount.c:475
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr ""
-#: mount/mount.c:461
+#: mount/mount.c:503
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:467
+#: mount/mount.c:509
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:479
+#: mount/mount.c:521
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:488
+#: mount/mount.c:530
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:492
+#: mount/mount.c:534
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:496
+#: mount/mount.c:538
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:509
+#: mount/mount.c:551
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
-#: mount/mount.c:557 mount/mount.c:969
+#: mount/mount.c:601 mount/mount.c:1026
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:593
+#: mount/mount.c:639
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:619
+#: mount/mount.c:667
msgid "mount: you must specify the filesystem type"
msgstr ""
-#: mount/mount.c:626 mount/mount.c:660
+#: mount/mount.c:674 mount/mount.c:709
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:628
+#: mount/mount.c:676
msgid "mount: permission denied"
msgstr "mount: permissăo negada"
-#: mount/mount.c:630
+#: mount/mount.c:678
msgid "mount: must be superuser to use mount"
msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:634 mount/mount.c:638
+#: mount/mount.c:682 mount/mount.c:686
#, c-format
msgid "mount: %s is busy"
msgstr ""
#. no
#. yes, don't mention it
-#: mount/mount.c:640
+#: mount/mount.c:688
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:642
+#: mount/mount.c:690
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:648
+#: mount/mount.c:696
#, c-format
msgid "mount: mount point %s does not exist"
msgstr ""
-#: mount/mount.c:650
+#: mount/mount.c:698
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:653
+#: mount/mount.c:701
#, c-format
msgid "mount: special device %s does not exist"
msgstr ""
-#: mount/mount.c:666
+#: mount/mount.c:711
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+" (a path prefix is not a directory)\n"
+msgstr ""
+
+#: mount/mount.c:723
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:668
+#: mount/mount.c:725
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" or too many mounted file systems"
msgstr ""
-#: mount/mount.c:683
+#: mount/mount.c:740
msgid "mount table full"
msgstr ""
-#: mount/mount.c:685
+#: mount/mount.c:742
#, c-format
msgid "mount: %s: can't read superblock"
msgstr ""
-#: mount/mount.c:688
+#: mount/mount.c:745
#, c-format
msgid "mount: %s has wrong major or minor number"
msgstr ""
-#: mount/mount.c:693
+#: mount/mount.c:750
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
-#: mount/mount.c:705
+#: mount/mount.c:762
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:707
+#: mount/mount.c:764
msgid "mount: maybe you meant iso9660 ?"
msgstr ""
-#: mount/mount.c:710
+#: mount/mount.c:767
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
#. strange ...
-#: mount/mount.c:715
+#: mount/mount.c:772
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:717
+#: mount/mount.c:774
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
" (maybe `insmod driver'?)"
msgstr ""
-#: mount/mount.c:720
+#: mount/mount.c:777
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:723
+#: mount/mount.c:780
#, c-format
msgid "mount: %s is not a block device"
msgstr ""
-#: mount/mount.c:726
+#: mount/mount.c:783
#, c-format
msgid "mount: %s is not a valid block device"
msgstr ""
-#: mount/mount.c:730
+#: mount/mount.c:787
#, c-format
msgid "mount: block device %s is not permitted on its filesystem"
msgstr ""
-#: mount/mount.c:747
+#: mount/mount.c:803
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:748
+#: mount/mount.c:804
msgid "block device "
msgstr ""
-#: mount/mount.c:834
+#: mount/mount.c:890
#, c-format
msgid "mount: consider mounting %s by %s\n"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:891
msgid "UUID"
msgstr ""
-#: mount/mount.c:835
+#: mount/mount.c:891
msgid "label"
msgstr "rótulo"
-#: mount/mount.c:837 mount/mount.c:1151
+#: mount/mount.c:893 mount/mount.c:1209
msgid "mount: no such partition found"
msgstr "mount: a partiçăo năo foi encontrada"
-#: mount/mount.c:845
+#: mount/mount.c:901
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
#.
#. * Retry in the background.
#.
-#: mount/mount.c:861
+#: mount/mount.c:917
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr ""
-#: mount/mount.c:872
+#: mount/mount.c:928
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr ""
-#: mount/mount.c:921
+#: mount/mount.c:977
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1030
+#: mount/mount.c:1088
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 ."
+" A special device can be indicated by -L label or -U uuid .\n"
msgstr ""
-#: mount/mount.c:1136
+#: mount/mount.c:1194
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:1141
+#: mount/mount.c:1199
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1153
+#: mount/mount.c:1211
#, c-format
msgid "mount: mounting %s\n"
msgstr ""
-#: mount/mount.c:1162
+#: mount/mount.c:1220
msgid "not mounted anything"
msgstr ""
-#: mount/mount.c:1175
+#: mount/mount.c:1233
#, c-format
msgid "mount: cannot find %s in %s"
msgstr ""
-#: mount/mount.c:1189
+#: mount/mount.c:1247
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr ""
@@ -6069,17 +6723,17 @@ msgstr ""
msgid "mount: bad UUID"
msgstr ""
-#: mount/mount_guess_fstype.c:186
+#: mount/mount_guess_fstype.c:195
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:189
+#: mount/mount_guess_fstype.c:198
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:191
+#: mount/mount_guess_fstype.c:200
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
@@ -6131,10 +6785,6 @@ msgstr ""
msgid "unknown nfs mount option: %s%s\n"
msgstr ""
-#: mount/nfsmount.c:349
-msgid "no"
-msgstr ""
-
#: mount/nfsmount.c:426
msgid "mount: got bad hp->h_length?\n"
msgstr ""
@@ -6182,7 +6832,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr ""
-#: mount/swapon.c:49
+#: mount/swapon.c:51
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -6191,27 +6841,27 @@ msgid ""
" %s [-s]\n"
msgstr ""
-#: mount/swapon.c:86
+#: mount/swapon.c:88
#, c-format
msgid "%s on %s\n"
msgstr "%s em %s\n"
-#: mount/swapon.c:90
+#: mount/swapon.c:93
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr ""
-#: mount/swapon.c:95
+#: mount/swapon.c:100
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
msgstr ""
-#: mount/swapon.c:103
+#: mount/swapon.c:108
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr ""
-#: mount/swapon.c:204
+#: mount/swapon.c:213
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr ""
@@ -6335,22 +6985,22 @@ msgstr ""
msgid "umount: it seems %s is mounted multiple times"
msgstr ""
-#: mount/umount.c:480
+#: mount/umount.c:490
#, c-format
msgid "umount: %s is not in the fstab (and you are not root)"
msgstr ""
-#: mount/umount.c:486
+#: mount/umount.c:493
#, c-format
msgid "umount: %s mount disagrees with the fstab"
msgstr ""
-#: mount/umount.c:505
+#: mount/umount.c:514
#, c-format
msgid "umount: only root can unmount %s from %s"
msgstr ""
-#: mount/umount.c:515
+#: mount/umount.c:525
#, c-format
msgid "umount: only %s can unmount %s from %s"
msgstr ""
@@ -6363,14 +7013,14 @@ msgstr ""
msgid "Usage: ctrlaltdel hard|soft\n"
msgstr ""
-#: sys-utils/cytune.c:116
+#: sys-utils/cytune.c:118
#, 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 ""
-#: sys-utils/cytune.c:127
+#: sys-utils/cytune.c:129
#, c-format
msgid ""
"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -6378,117 +7028,117 @@ msgid ""
"and the maximum transfer rate in characters/second was %f\n"
msgstr ""
-#: sys-utils/cytune.c:194
+#: sys-utils/cytune.c:196
#, c-format
msgid "Invalid interval value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:202
+#: sys-utils/cytune.c:204
#, c-format
msgid "Invalid set value: %s\n"
msgstr "Valor inválido: %s\n"
-#: sys-utils/cytune.c:210
+#: sys-utils/cytune.c:212
#, c-format
msgid "Invalid default value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:218
+#: sys-utils/cytune.c:220
#, c-format
msgid "Invalid set time value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:226
+#: sys-utils/cytune.c:228
#, c-format
msgid "Invalid default time value: %s\n"
msgstr ""
-#: sys-utils/cytune.c:243
+#: sys-utils/cytune.c:245
#, c-format
msgid ""
"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
"[-g|-G] file [file...]\n"
msgstr ""
-#: sys-utils/cytune.c:254 sys-utils/cytune.c:270 sys-utils/cytune.c:287
-#: sys-utils/cytune.c:332
+#: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
+#: sys-utils/cytune.c:342
#, c-format
msgid "Can't open %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:260
+#: sys-utils/cytune.c:264
#, c-format
msgid "Can't set %s to threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:276
+#: sys-utils/cytune.c:282
#, c-format
msgid "Can't set %s to time threshold %d: %s\n"
msgstr ""
-#: sys-utils/cytune.c:291 sys-utils/cytune.c:342 sys-utils/cytune.c:370
+#: sys-utils/cytune.c:299 sys-utils/cytune.c:354 sys-utils/cytune.c:385
#, c-format
msgid "Can't get threshold for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:296 sys-utils/cytune.c:347 sys-utils/cytune.c:375
+#: sys-utils/cytune.c:305 sys-utils/cytune.c:360 sys-utils/cytune.c:391
#, c-format
msgid "Can't get timeout for %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:300
+#: sys-utils/cytune.c:309
#, c-format
msgid "%s: %ld %s threshold and %ld %s timeout\n"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "current"
msgstr ""
-#: sys-utils/cytune.c:302 sys-utils/cytune.c:304
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
msgid "default"
msgstr ""
-#: sys-utils/cytune.c:321
+#: sys-utils/cytune.c:330
msgid "Can't set signal handler"
msgstr ""
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:356
+#: sys-utils/cytune.c:334 sys-utils/cytune.c:369
msgid "gettimeofday failed"
msgstr ""
-#: sys-utils/cytune.c:336 sys-utils/cytune.c:365
+#: sys-utils/cytune.c:347 sys-utils/cytune.c:379
#, c-format
msgid "Can't issue CYGETMON on %s: %s\n"
msgstr ""
-#: sys-utils/cytune.c:405
+#: sys-utils/cytune.c:421
#, c-format
msgid "%s: %lu ints, %lu/%lu chars; "
msgstr ""
-#: sys-utils/cytune.c:406
+#: sys-utils/cytune.c:422
#, c-format
msgid "fifo: %lu thresh, %lu tmout, "
msgstr ""
-#: sys-utils/cytune.c:407
+#: sys-utils/cytune.c:423
#, c-format
msgid "%lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:428
#, c-format
msgid " %f int/sec; %f rec, %f send (char/sec)\n"
msgstr ""
-#: sys-utils/cytune.c:417
+#: sys-utils/cytune.c:433
#, c-format
msgid ""
"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
msgstr ""
-#: sys-utils/cytune.c:422
+#: sys-utils/cytune.c:438
#, c-format
msgid " %f int/sec; %f rec (char/sec)\n"
msgstr ""
@@ -7048,20 +7698,6 @@ msgstr ""
msgid "pid"
msgstr ""
-#: sys-utils/kbdrate.c:126
-#, c-format
-msgid "util-linux kbdrate %s \n"
-msgstr ""
-
-#: sys-utils/kbdrate.c:159 sys-utils/kbdrate.c:206
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d mS)\n"
-msgstr "Velocidade do teclado configurada para %.1f cps (intervalo = %d mS)\n"
-
-#: sys-utils/kbdrate.c:182
-msgid "Cannot open /dev/port"
-msgstr "Năo foi possível abrir /dev/port"
-
#: sys-utils/rdev.c:68
msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr ""
@@ -7120,7 +7756,7 @@ msgstr ""
msgid " use -R 1 to mount root readonly, -R 0 for read/write."
msgstr ""
-#: sys-utils/readprofile.c:50
+#: sys-utils/readprofile.c:52
#, c-format
msgid ""
"%s: Usage: \"%s [options]\n"
@@ -7133,48 +7769,45 @@ msgid ""
"\t -V print version and exit\n"
msgstr ""
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:116
#, c-format
msgid "%s Version %s\n"
msgstr ""
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:128
msgid "anything\n"
msgstr ""
-#: sys-utils/readprofile.c:154
+#: sys-utils/readprofile.c:157
#, c-format
msgid "Sampling_step: %i\n"
msgstr ""
-#: sys-utils/readprofile.c:167 sys-utils/readprofile.c:193
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
#, c-format
msgid "%s: %s(%i): wrong map line\n"
msgstr ""
-#: sys-utils/readprofile.c:180
+#: sys-utils/readprofile.c:183
#, c-format
msgid "%s: can't find \"_stext\" in %s\n"
msgstr ""
-#: sys-utils/readprofile.c:221
+#: sys-utils/readprofile.c:226
msgid "total"
msgstr "total"
-#: sys-utils/renice.c:66
-msgid "usage: renice priority [ [ -p ] pids ] "
-msgstr ""
-
#: sys-utils/renice.c:67
-msgid "[ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
msgstr ""
-#: sys-utils/renice.c:93
+#: sys-utils/renice.c:94
#, c-format
msgid "renice: %s: unknown user\n"
msgstr ""
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:102
#, c-format
msgid "renice: %s: bad value\n"
msgstr ""
@@ -7197,101 +7830,102 @@ msgstr ""
msgid "usage: %s program [arg ...]\n"
msgstr ""
-#: sys-utils/tunelp.c:77
+#: sys-utils/tunelp.c:74
#, 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"
+" -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+" -T [on|off] ]\n"
msgstr ""
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
msgid "malloc error"
msgstr ""
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:101
msgid "sscanf error"
msgstr ""
-#: sys-utils/tunelp.c:140
+#: sys-utils/tunelp.c:239
#, c-format
msgid "%s: %s not an lp device.\n"
msgstr "%s: %s năo é um dispositivo lp\n"
-#: sys-utils/tunelp.c:239
+#: sys-utils/tunelp.c:260
#, c-format
msgid "%s status is %d"
msgstr ""
-#: sys-utils/tunelp.c:240
+#: sys-utils/tunelp.c:261
msgid ", busy"
msgstr ""
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:262
msgid ", ready"
msgstr ""
-#: sys-utils/tunelp.c:242
+#: sys-utils/tunelp.c:263
msgid ", out of paper"
msgstr ""
-#: sys-utils/tunelp.c:243
+#: sys-utils/tunelp.c:264
msgid ", on-line"
msgstr ""
-#: sys-utils/tunelp.c:244
+#: sys-utils/tunelp.c:265
msgid ", error"
msgstr ""
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:282
msgid "LPGETIRQ error"
msgstr ""
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:288
#, c-format
msgid "%s using IRQ %d\n"
msgstr ""
-#: sys-utils/tunelp.c:269
+#: sys-utils/tunelp.c:290
#, c-format
msgid "%s using polling\n"
msgstr ""
-#: text-utils/col.c:154
+#: text-utils/col.c:153
#, c-format
msgid "col: bad -l argument %s.\n"
msgstr "col: argumento inválido para -l %s.\n"
-#: text-utils/col.c:515
+#: text-utils/col.c:516
msgid "usage: col [-bfx] [-l nline]\n"
msgstr ""
-#: text-utils/col.c:521
+#: text-utils/col.c:522
msgid "col: write error.\n"
msgstr ""
-#: text-utils/col.c:528
+#: text-utils/col.c:529
#, c-format
msgid "col: warning: can't back up %s.\n"
msgstr ""
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "past first line"
msgstr ""
-#: text-utils/col.c:529
+#: text-utils/col.c:530
msgid "-- line already flushed"
msgstr ""
-#: text-utils/colcrt.c:93
+#: text-utils/colcrt.c:98
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Uso: %s [ - ] [ -2 ] [ arquivo ... ]\n"
-#: text-utils/column.c:276
+#: text-utils/column.c:302
msgid "line too long"
msgstr "linha muito longa"
-#: text-utils/column.c:311
+#: text-utils/column.c:379
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr ""
@@ -7308,15 +7942,12 @@ msgid ""
"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
msgstr ""
-#: text-utils/more.c:247
-msgid "usage: "
-msgstr "uso: "
-
-#: text-utils/more.c:249
-msgid " [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+#: text-utils/more.c:329
+#, fuzzy, c-format
+msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
msgstr " [-dfln] [+número_da_linha | +/padrăo] nome1 nome2 ...\n"
-#: text-utils/more.c:423
+#: text-utils/more.c:504
#, c-format
msgid ""
"\n"
@@ -7325,7 +7956,7 @@ msgid ""
msgstr ""
#. simple ELF detection
-#: text-utils/more.c:462
+#: text-utils/more.c:543
#, c-format
msgid ""
"\n"
@@ -7333,107 +7964,107 @@ msgid ""
"\n"
msgstr ""
-#: text-utils/more.c:566
+#: text-utils/more.c:647
msgid "[Use q or Q to quit]"
msgstr ""
-#: text-utils/more.c:752
+#: text-utils/more.c:833
msgid "--More--"
msgstr "--Mais--"
-#: text-utils/more.c:754
+#: text-utils/more.c:835
#, c-format
msgid "(Next file: %s)"
msgstr "(Próximo arquivo: %s)"
-#: text-utils/more.c:760
+#: text-utils/more.c:841
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[Pressione espaço para continuar, 'q' para sair.]"
-#: text-utils/more.c:1058
+#: text-utils/more.c:1139
#, c-format
msgid "...back %d page"
msgstr "...voltar %d páginas"
-#: text-utils/more.c:1104
+#: text-utils/more.c:1185
#, c-format
msgid "...skipping %d line"
msgstr ""
-#: text-utils/more.c:1145
+#: text-utils/more.c:1226
msgid ""
"\n"
"***Back***\n"
"\n"
msgstr ""
-#: text-utils/more.c:1183
+#: text-utils/more.c:1264
msgid "Can't open help file"
msgstr ""
-#: text-utils/more.c:1204 text-utils/more.c:1208
+#: text-utils/more.c:1285 text-utils/more.c:1289
msgid "[Press 'h' for instructions.]"
msgstr ""
-#: text-utils/more.c:1243
+#: text-utils/more.c:1324
#, c-format
msgid "\"%s\" line %d"
msgstr ""
-#: text-utils/more.c:1245
+#: text-utils/more.c:1326
#, c-format
msgid "[Not a file] line %d"
msgstr ""
-#: text-utils/more.c:1329
+#: text-utils/more.c:1410
msgid " Overflow\n"
msgstr ""
-#: text-utils/more.c:1376
+#: text-utils/more.c:1457
msgid "...skipping\n"
msgstr ""
-#: text-utils/more.c:1406
+#: text-utils/more.c:1487
msgid "Regular expression botch"
msgstr ""
-#: text-utils/more.c:1418
+#: text-utils/more.c:1499
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
-#: text-utils/more.c:1421
+#: text-utils/more.c:1502
msgid "Pattern not found"
msgstr ""
-#: text-utils/more.c:1483
+#: text-utils/more.c:1563
msgid "can't fork\n"
msgstr ""
-#: text-utils/more.c:1522
+#: text-utils/more.c:1602
msgid ""
"\n"
"...Skipping "
msgstr ""
-#: text-utils/more.c:1526
+#: text-utils/more.c:1606
msgid "...Skipping "
msgstr ""
-#: text-utils/more.c:1527
+#: text-utils/more.c:1607
msgid "to file "
msgstr ""
-#: text-utils/more.c:1527
+#: text-utils/more.c:1607
msgid "back to file "
msgstr ""
-#: text-utils/more.c:1765
+#: text-utils/more.c:1846
msgid "Line too long"
msgstr "Linha muito longa"
-#: text-utils/more.c:1809
+#: text-utils/more.c:1890
msgid "No previous command to substitute for"
msgstr ""
@@ -7481,39 +8112,64 @@ msgstr ""
msgid "hexdump: bad conversion character %%%s.\n"
msgstr ""
-#: text-utils/rev.c:109
+#: text-utils/rev.c:114
msgid "Unable to allocate bufferspace\n"
msgstr ""
-#: text-utils/rev.c:167
+#: text-utils/rev.c:173
msgid "usage: rev [file ...]\n"
msgstr ""
-#: text-utils/ul.c:125
+#: text-utils/ul.c:141
#, c-format
msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
msgstr "Uso: %s [ -i ] [ -tTerm ] arquivo...\n"
-#: text-utils/ul.c:136
+#: text-utils/ul.c:152
msgid "trouble reading terminfo"
msgstr ""
-#: text-utils/ul.c:223
+#: text-utils/ul.c:241
#, c-format
msgid "Unknown escape sequence in input: %o, %o\n"
msgstr ""
-#: text-utils/ul.c:372
+#: text-utils/ul.c:398
msgid "Unable to allocate buffer.\n"
msgstr ""
-#: text-utils/ul.c:529
+#: text-utils/ul.c:555
msgid "Input line too long.\n"
msgstr "Linha de entrada muito longa.\n"
-#: text-utils/ul.c:542
+#: text-utils/ul.c:568
msgid "Out of memory when growing buffer.\n"
msgstr ""
+#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#, fuzzy, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+msgstr "Velocidade do teclado configurada para %.1f cps (intervalo = %d mS)\n"
+
+#: kbd/kbdrate.c:247
+msgid "Cannot open /dev/port"
+msgstr "Năo foi possível abrir /dev/port"
+
+#~ msgid "Too many parts"
+#~ msgstr "Número excessivo de partiçőes"
+
+#~ msgid ""
+#~ "unit: sectors\n"
+#~ "\n"
+#~ msgstr ""
+#~ "unidade: setores\n"
+#~ "\n"
+
+#~ msgid ", bootable"
+#~ msgstr ", inicializável"
+
+#~ msgid "usage: "
+#~ msgstr "uso: "
+
#~ msgid "mount: out of memory"
#~ msgstr "getopt: faltou memória!"
diff --git a/rescuept/README b/rescuept/README
index 77c1c557d..50114d13b 100644
--- a/rescuept/README
+++ b/rescuept/README
@@ -8,7 +8,8 @@ It is in the non-installed part of the e2progs distribution.
(ii) rescuept is a utility that recognizes ext2 superblocks,
FAT partitions, swap partitions, and extended partition tables;
-it prints out information that can be used with fdisk or sfdisk
+it may also recognize BSD disklabels and Unixware 7 partitions.
+It prints out information that can be used with fdisk or sfdisk
to reconstruct the partition table.
It is in the non-installed part of the util-linux distribution.
@@ -31,21 +32,6 @@ that are handled by rescuept and not by any of the others,
so let it be for the moment.
-Two patches for bugs found in gpart-0.1c:
-=================================================================
-diff -r ../gpart-0.1c/src/gm_ext2.c ./src/gm_ext2.c
-74c74,75
-< if ((sb->s_errors != EXT2_ERRORS_CONTINUE) &&
----
-> if ((sb->s_errors != 0) &&
-> (sb->s_errors != EXT2_ERRORS_CONTINUE) &&
-78c79
-< if (sb->s_state && (sb->s_state != EXT2_VALID_FS) && (sb->s_state != EXT2_ERROR_FS))
----
-> if (sb->s_state & ~(EXT2_VALID_FS | EXT2_ERROR_FS))
-=================================================================
-(Both bugs have the effect that good ext2 filesystems are not
-recognized by gpart-0.1c. Patches sent to gpart author.)
@@ -82,7 +68,7 @@ by gpart.)
-A comment:
+Comments:
-----
From: Nix <nix-kernel@vger.rutgers.edu>
Subject: Re: [OFFTOPIC] Searching for filesystem locator
@@ -96,3 +82,28 @@ I've just tried this but it appears to suffer from a 2^31-sectors problem.
... but this proved a godsend.
-----
+From: Chris L. Mason <cmason@unixzone.com>
+Subject: All hail rescuept!
+Date: Fri, 27 Aug 1999 22:58:24 -0400
+
+..rescuept got me out of a real jam!
+I tried fixdisktable without any luck.
+-----
+From: Osman <osman@Cable.EU.org>
+Subject: Re: rescuept
+Date: Thu, 26 Aug 1999 16:24:40 +0200 (CEST)
+
+Ok, This is what I tried:
+
+"./rescuept /dev/sdc > detection.txt"
+"cat detection.txt | sfdisk -f /dev/sdc"
+
+The "-f" was to force it because sfdisk didn't like the partitioning,
+whoehaha...
+After carefully looking at the data in "detection.txt",
+I remembered that I had created the table with the "dos compatibility"
+flag turned off. That gave me 31 sectors back at that time...
+Well after that I mounted the ext2 partition read-only and it looked
+recovered!
+Wowy !!!!
+-----
diff --git a/rescuept/rescuept.c b/rescuept/rescuept.c
index b549568f1..8be535381 100644
--- a/rescuept/rescuept.c
+++ b/rescuept/rescuept.c
@@ -1,4 +1,25 @@
-/* call: rescuept /dev/hda */
+/*
+ * rescuept - Andries Brouwer - aeb@cwi.nl - 1999
+ *
+ * This may be distributed under the GPL.
+ *
+ * call: rescuept /dev/xxx
+ *
+ * The output is a proposed partition table, in the
+ * form of input to sfdisk. Typical use:
+ *
+ * ./rescuept /dev/xxx > xxx.pt
+ * now look at xxx.pt to see whether it resembles what
+ * you expected, and possibly edit the partition types;
+ * if you are satisfied, then
+ * sfdisk /dev/xxx < xxx.pt
+ * will restore your partition table. If you are cautious, use
+ * sfdisk /dev/xxx -O xxx.old < xxx.pt
+ * so that the original state can be retrieved using
+ * sfdisk /dev/xxx -I xxx.old
+ *
+ * Here xxx stands for hda or hdb or sda or sdb or ...
+ */
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
@@ -113,7 +134,7 @@ void outparts() {
}
void outmsg(char *msg, int start, int nextstart, unsigned char type) {
- printf("# %4d MB %16s (type %2x): sectors %9d-%9d\n",
+ printf("# %5d MB %16s (type %2x): sectors %9d-%9d\n",
((nextstart-start)+1024)/2048, msg, type, start, nextstart-1);
}
@@ -307,7 +328,7 @@ struct fat_boot_sector_start {
fd 5.25" 9/2/40 360k
fe 5.25" 8/1/40 160k
ff 5.25" 8/2/40 320k
- Conclusion: this bytes does not differentiate between 3.5" and 5.25",
+ Conclusion: this byte does not differentiate between 3.5" and 5.25",
it does not give the capacity or the number of sectors per track.
However, maybe C and H can be derived.
*/
@@ -415,6 +436,40 @@ struct swap_header_v1 {
unsigned int badpages[1];
};
+struct unixware_slice {
+ unsigned short slice_type;
+ unsigned short slice_flags;
+ unsigned int start;
+ unsigned int size;
+};
+
+struct bsd_disklabel {
+ uchar d_magic[4];
+ uchar d_stuff1[4];
+ uchar d_typename[16]; /* type name, e.g. "eagle" */
+ uchar d_packname[16]; /* pack identifier */
+ uint32 d_secsize; /* # of bytes per sector */
+ uint32 d_nsectors; /* # of data sectors per track */
+ uint32 d_ntracks; /* # of tracks per cylinder */
+ uint32 d_ncylinders; /* # of data cylinders per unit */
+ uint32 d_secpercyl; /* # of data sectors per cylinder */
+ uint32 d_secperunit; /* # of data sectors per unit */
+ uchar d_stuff2[68];
+ uchar d_magic2[4]; /* the magic number (again) */
+ uint16 d_checksum; /* xor of data incl. partitions */
+
+ /* filesystem and partition information: */
+ uint16 d_npartitions; /* number of partitions in following */
+ uint32 d_bbsize; /* size of boot area at sn0, bytes */
+ uint32 d_sbsize; /* max size of fs superblock, bytes */
+ struct bsd_partition { /* the partition table */
+ uint32 p_size; /* number of sectors in partition */
+ uint32 p_offset; /* starting sector */
+ uchar p_stuff[8];
+ } d_partitions[16]; /* 16 is for openbsd */
+};
+
+
int
main(int argc, char **argv){
int i,j,fd;
@@ -631,6 +686,62 @@ main(int argc, char **argv){
}
}
+
+ if (bp[4] == 0x0d && bp[5] == 0x60 &&
+ bp[6] == 0x5e && bp[7] == 0xca && /* CA5E600D */
+ bp[156] == 0xee && bp[157] == 0xde &&
+ bp[158] == 0x0d && bp[159] == 0x60) /* 600DDEEE */ {
+ int ss, es;
+ struct unixware_slice *u;
+ printf("# Unixware partition seen\n");
+ u = (struct unixware_slice *)(bp + 216);
+ if (u->slice_type == 5 /* entire disk */
+ && (u->slice_flags & 0x200)) /* valid */ {
+ ss = u->start;
+ es = u->start + u->size;
+ outmsg("Unixware ptn", ss, es, 0x63);
+ addpart(ss, es-ss, 0x63);
+ i = es-1;
+ continue;
+ } else
+ printf("# Unrecognized details\n");
+ }
+
+ /* bsd disk magic 0x82564557UL */
+ if (bp[0] == 0x57 && bp[1] == 0x45 && bp[2] == 0x56 && bp[3] == 0x82) {
+ int ss, es, npts, j;
+ struct bsd_disklabel *l;
+ struct bsd_partition *p;
+ printf("# BSD magic seen in sector %d\n", i);
+ l = (struct bsd_disklabel *) bp;
+ if (l->d_magic2[0] != 0x57 || l->d_magic2[1] != 0x45 ||
+ l->d_magic2[2] != 0x56 || l->d_magic2[3] != 0x82)
+ printf("# 2nd magic bad - ignored this sector\n");
+ else if ((npts = l->d_npartitions) > 16)
+ printf("# strange number (%d) of subpartitions - "
+ "ignored this sector\n", npts);
+ else {
+ for (j=0; j<npts; j++) {
+ p = &(l->d_partitions[j]);
+ if (p->p_size)
+ printf("# part %c: size %9d, start %9d\n",
+ 'a'+j, p->p_size, p->p_offset);
+ }
+ ss = l->d_partitions[2].p_offset;
+ es = ss + l->d_partitions[2].p_size;
+ if (ss != i-1)
+ printf("# strange start of whole disk - "
+ "ignored this sector\n");
+ else {
+ /* FreeBSD 0xa5, OpenBSD 0xa6, NetBSD 0xa9, BSDI 0xb7 */
+ /* How to distinguish? */
+ outmsg("BSD partition", ss, es, 0xa5);
+ addpart(ss, es-ss, 0xa5);
+ i = es-1;
+ continue;
+ }
+ }
+ }
}
outparts();
diff --git a/sys-utils/Makefile b/sys-utils/Makefile
index 0109eb146..85173658a 100644
--- a/sys-utils/Makefile
+++ b/sys-utils/Makefile
@@ -11,9 +11,8 @@ include ../MCONFIG
MAN1= arch.1 readprofile.1
MAN8= ctrlaltdel.8 cytune.8 dmesg.8 \
- ipcrm.8 ipcs.8 ramsize.8 renice.8 \
- rootflags.8 setsid.8 sln.8 swapdev.8 tunelp.8 \
- vidmode.8
+ ipcrm.8 ipcs.8 renice.8 \
+ setsid.8 sln.8 tunelp.8
# Where to put binaries?
# See the "install" rule for the links. . .
@@ -37,7 +36,7 @@ endif
endif
ifeq "$(CPU)" "intel"
-MAN8:=$(MAN8) rdev.8
+MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 swapdev.8 vidmode.8
USRSBIN:=$(USRSBIN) rdev
endif
@@ -71,10 +70,12 @@ install: all
$(INSTALLBIN) $(BIN) $(BINDIR)
$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
$(INSTALLBIN) $(USRSBIN) $(USRSBINDIR)
+ifeq "$(CPU)" "intel"
(cd $(USRSBINDIR); ln -sf rdev swapdev)
(cd $(USRSBINDIR); ln -sf rdev ramsize)
(cd $(USRSBINDIR); ln -sf rdev vidmode)
(cd $(USRSBINDIR); ln -sf rdev rootflags)
+endif
$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR)
$(INSTALLMAN) $(MAN1) $(MAN1DIR)
$(INSTALLMAN) $(MAN8) $(MAN8DIR)
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index e628ce874..09dec45a0 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -28,11 +28,6 @@
#include <grp.h>
#include "nls.h"
-#include "../defines.h" /* for NEED_linkage_h */
-#ifdef NEED_linkage_h
-#define __KERNEL__ /* required for SHM_DEST etc. */
-#include <linux/linkage.h> /* required for the keyword asmlinkage */
-#endif
/* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
/* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
/* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */
@@ -41,9 +36,40 @@
#include <sys/sem.h>
#include <sys/msg.h>
#include <sys/shm.h>
-#ifdef NEED_linkage_h
-#undef __KERNEL__
+
+/*-------------------------------------------------------------------*/
+/* SHM_DEST and SHM_LOCKED are defined in kernel headers,
+ but inside #ifdef __KERNEL__ ... #endif */
+#ifndef SHM_DEST
+/* shm_mode upper byte flags */
+#define SHM_DEST 01000 /* segment will be destroyed on last detach */
+#define SHM_LOCKED 02000 /* segment will not be swapped */
+#endif
+
+/* For older kernels the same holds for the defines below */
+#ifndef MSG_STAT
+#define MSG_STAT 11
+#define MSG_INFO 12
+#endif
+
+#ifndef SHM_STAT
+#define SHM_STAT 13
+#define SHM_INFO 14
+struct shm_info {
+ int used_ids;
+ ulong shm_tot; /* total allocated shm */
+ ulong shm_rss; /* total resident shm */
+ ulong shm_swp; /* total swapped shm */
+ ulong swap_attempts;
+ ulong swap_successes;
+};
+#endif
+
+#ifndef SEM_STAT
+#define SEM_STAT 18
+#define SEM_INFO 19
#endif
+/*-------------------------------------------------------------------*/
/* The last arg of semctl is a union semun, but where is it defined?
X/OPEN tells us to define it ourselves, but until recently
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index ba982f7c3..6a8d4d20f 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -21,6 +21,8 @@
/*
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
* - added Native Language Support
+ * 1999-09-01 Stephane Eranian <eranian@cello.hpl.hp.com>
+ * - 64bit clean patch
*/
#include <errno.h>
@@ -79,9 +81,10 @@ FILE *pro;
FILE *map;
int proFd;
char *mapFile, *proFile;
-unsigned int len=0, add0=0, step, index=0;
+unsigned long len=0, add0=0, index=0;
+unsigned int step;
unsigned int *buf, total, fn_len;
-unsigned int fn_add, next_add; /* current and next address */
+unsigned long fn_add, next_add; /* current and next address */
char fn_name[S_LEN], next_name[S_LEN]; /* current and next name */
char mode[8];
int c;
@@ -162,13 +165,13 @@ int popenMap; /* flag to tell if popen() has been used */
while(fgets(mapline,S_LEN,map))
{
- if (sscanf(mapline,"%x %s %s",&fn_add,mode,fn_name)!=3)
+ if (sscanf(mapline,"%lx %s %s",&fn_add,mode,fn_name)!=3)
{
fprintf(stderr,_("%s: %s(%i): wrong map line\n"),
prgname,mapFile, maplineno);
exit(1);
}
- if (strcmp(fn_name,"_stext")) /* only elf works like this */
+ if (!strcmp(fn_name,"_stext")) /* only elf works like this */
{
add0=fn_add;
break;
@@ -188,12 +191,14 @@ int popenMap; /* flag to tell if popen() has been used */
{
unsigned int this=0;
- if (sscanf(mapline,"%x %s %s",&next_add,mode,next_name)!=3)
+ if (sscanf(mapline,"%lx %s %s",&next_add,mode,next_name)!=3)
{
fprintf(stderr,_("%s: %s(%i): wrong map line\n"),
prgname,mapFile, maplineno);
exit(1);
}
+ /* ignore any LEADING (before a '[tT]' symbol is found) Absolute symbols */
+ if (*mode == 'A' && total == 0) continue;
if (*mode!='T' && *mode!='t') break; /* only text is profiled */
while (index < (next_add-add0)/step)
@@ -204,7 +209,7 @@ int popenMap; /* flag to tell if popen() has been used */
if (fn_len && (this || optAll))
{
if (optVerbose)
- printf("%08x %-40s %6i %8.4f\n",
+ printf("%08lx %-40s %6i %8.4f\n",
fn_add,fn_name,this,this/(double)fn_len);
else
printf("%6i %-40s %8.4f\n",
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index dfb30aa67..7292a0cad 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -61,7 +61,6 @@
#include <errno.h>
#include "lp.h"
#include "nls.h"
-#include "../version.h"
struct command {
long op;
@@ -70,8 +69,6 @@ struct command {
};
-
-
void print_usage(char *progname) {
printf(_("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"
@@ -95,12 +92,12 @@ void *mylloc(long size) {
return ptr;
}
-
+static char *progname;
long get_val(char *val) {
long ret;
if (!(sscanf(val, "%ld", &ret) == 1)) {
- perror(_("sscanf error"));
+ fprintf(stderr, _("%s: bad value\n"), progname);
exit(3);
}
return ret;
@@ -113,16 +110,20 @@ long get_onoff(char *val) {
return 0;
}
-
-
int main (int argc, char ** argv) {
int c, fd, irq, status, show_irq, offset = 0, retval;
- char *progname;
- char *filename;
+ char *filename, *p;
struct stat statbuf;
struct command *cmds, *cmdst;
progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
if (argc < 2) print_usage(progname);
cmdst = cmds = mylloc(sizeof(struct command));
diff --git a/testincl b/testincl
new file mode 100755
index 000000000..47c074fa3
--- /dev/null
+++ b/testincl
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# call:
+# COMPILE=...; export COMPILE
+# if ./testincl [-q] "foo.h" ...
+#
+echo=echo
+case $1 in -q)
+ echo=":"
+ shift
+ ;;
+esac
+IFILE="<$1>"
+
+echo "
+#include $IFILE
+main(){ exit(0); }
+" > conftest.c
+eval $COMPILE
+if test -s conftest && ./conftest 2>/dev/null; then
+ res=0
+ $echo "You have $IFILE"
+else
+ res=1
+ $echo "You don't have $IFILE"
+fi
+rm -f conftest conftest.c
+exit $res
diff --git a/text-utils/Makefile b/text-utils/Makefile
index 66fda287e..3c4343bfb 100644
--- a/text-utils/Makefile
+++ b/text-utils/Makefile
@@ -24,31 +24,34 @@ endif
# Where to put datebase files?
-USRLIB= more.help
+MOREHELP= more.help
+MOREHELPFILE=$(MOREHELPDIR)/$(MOREHELP)
+# MOREHELPDIR set in ../MCONFIG
+CFLAGS:=$(CFLAGS) -DMOREHELPFILE=\"$(MOREHELPFILE)\"
all: $(BIN) $(USRBIN)
-# Programs requiring special compilation
-
-NEEDS_NCURSES= ul
-
-ifeq "$(HAVE_TERMCAP)" "no"
-NEEDS_NCURSES:=$(NEEDS_NCURSES) more
-else
-more:
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
-endif
-
-$(NEEDS_NCURSES):
+# more and ul use curses - maybe we can't compile them
ifeq "$(HAVE_NCURSES)" "yes"
+# Have ncurses - make more and ul
+more ul:
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
+more: more.o
+ul: ul.o
else
+# Do not have ncurses - give up on ul
+ul:
@echo $@ not made since it requires ncurses
+ifeq "$(HAVE_TERMCAP)" "yes"
+more: more.o
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
+else
+more:
+ @echo $@ not made since it requires ncurses or termcap
+endif
endif
-
# Rules for hexdump
-
hexdump: hexdump.o conv.o display.o hexsyntax.o odsyntax.o parse.o
hexdump.o: hexdump.c hexdump.h
conv.o: conv.c hexdump.h
@@ -58,24 +61,19 @@ odsyntax.o: odsyntax.c hexdump.h
parse.o: parse.c hexdump.h
# Rules for everything else
-
col: col.o
colcrt: colcrt.o
colrm: colrm.o
+column.o: $(LIB)/errs.h
column: column.o $(ERR_O)
-more: more.o
more.o: more.c $(LIB)/pathnames.h
rev: rev.o
-ifeq "$(HAVE_NCURSES)" "yes"
-ul: ul.o
-endif
-
install install.shadow install.text-utils: all
- $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRLIBDIR) $(MAN1DIR)
+ $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(MOREHELPDIR) $(MAN1DIR)
$(INSTALLBIN) $(BIN) $(BINDIR)
$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
- $(INSTALLDAT) $(USRLIB) $(USRLIBDIR)
+ $(INSTALLDAT) $(MOREHELP) $(MOREHELPDIR)
$(INSTALLMAN) $(MAN1) $(MAN1DIR)
.PHONY: clean distclean
diff --git a/text-utils/col.c b/text-utils/col.c
index f08f51ad8..81026bfd4 100644
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -38,7 +38,9 @@
* Wed Sep 14 22:31:17 1994: patches from Carl Christofferson
* (cchris@connected.com)
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
*
*/
@@ -50,7 +52,8 @@
#include <stdio.h>
#include <unistd.h>
#include "nls.h"
-#include <locale.h>
+
+#include "widechar.h"
#define BS '\b' /* backspace */
#define TAB '\t' /* tab */
@@ -75,7 +78,7 @@ typedef struct char_str {
#define CS_ALTERNATE 2
short c_column; /* column character is in */
CSET c_set; /* character set (currently only 2) */
- char c_char; /* character in question */
+ wchar_t c_char; /* character in question */
} CHAR;
typedef struct line_str LINE;
@@ -108,14 +111,14 @@ int nblank_lines; /* # blanks after last flushed line */
int no_backspaces; /* if not to output any backspaces */
#define PUTC(ch) \
- if (putchar(ch) == EOF) \
+ if (putwchar(ch) == WEOF) \
wrerr();
int main(int argc, char **argv)
{
extern int optind;
extern char *optarg;
- register int ch;
+ register wint_t ch;
CHAR *c;
CSET cur_set; /* current character set */
LINE *l; /* current line */
@@ -170,8 +173,8 @@ int main(int argc, char **argv)
cur_set = last_set = CS_NORMAL;
lines = l = alloc_line();
- while ((ch = getchar()) != EOF) {
- if (!isgraph(ch)) {
+ while ((ch = getwchar()) != WEOF) {
+ if (!iswgraph(ch)) {
switch (ch) {
case BS: /* can't go back further */
if (cur_col == 0)
@@ -182,7 +185,7 @@ int main(int argc, char **argv)
cur_col = 0;
continue;
case ESC: /* just ignore EOF */
- switch(getchar()) {
+ switch(getwchar()) {
case RLF:
cur_line -= 2;
break;
@@ -316,6 +319,8 @@ int main(int argc, char **argv)
/* missing a \n on the last line? */
nblank_lines = 2;
flush_blanks();
+ if (ferror(stdout) || fclose(stdout))
+ return 1;
return 0;
}
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index 1620c2737..55138f161 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -31,16 +31,21 @@
* SUCH DAMAGE.
*/
- /* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
- */
+/*
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
+ */
#include <stdio.h>
#include <unistd.h> /* for close() */
#include <string.h>
#include "nls.h"
-int plus(char c, char d);
+#include "widechar.h"
+
+int plus(wchar_t c, wchar_t d);
void move(int l, int m);
void pflush(int ol);
@@ -58,7 +63,7 @@ void pflush(int ol);
* Option -2 forces printing of all half lines.
*/
-char page[267][132];
+wchar_t page[267][132];
int outline = 1;
int outcol;
@@ -67,13 +72,13 @@ char suppresul;
char printall;
char *progname;
-FILE *f;
int
main(int argc, char **argv)
{
- int c;
- char *cp, *dp;
+ FILE *f;
+ wint_t c;
+ wchar_t *cp, *dp;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@@ -97,9 +102,9 @@ main(int argc, char **argv)
argc--;
argv++;
}
+ f = stdin;
do {
if (argc > 0) {
- close(0);
if (!(f = fopen(argv[0], "r"))) {
fflush(stdout);
perror(argv[0]);
@@ -109,7 +114,7 @@ main(int argc, char **argv)
argv++;
}
for (;;) {
- c = getc(stdin);
+ c = getwc(f);
if (c == -1) {
pflush(outline);
fflush(stdout);
@@ -126,7 +131,7 @@ main(int argc, char **argv)
case '\017':
continue;
case 033:
- c = getc(stdin);
+ c = getwc(f);
switch (c) {
case '9':
if (outline >= 266)
@@ -180,12 +185,16 @@ main(int argc, char **argv)
continue;
}
}
+ if (f != stdin)
+ fclose(f);
} while (argc > 0);
fflush(stdout);
+ if (ferror(stdout) || fclose(stdout))
+ return 1;
return 0;
}
-int plus(char c, char d)
+int plus(wchar_t c, wchar_t d)
{
return (c == '|' && (d == '-' || d == '_'));
@@ -196,7 +205,7 @@ int first;
void pflush(int ol)
{
register int i;
- register char *cp;
+ register wchar_t *cp;
char lastomit;
int l;
@@ -217,10 +226,11 @@ void pflush(int ol)
continue;
}
lastomit = 0;
- printf("%s\n", cp);
+ fputws(cp, stdout);
+ putwchar('\n');
}
- bcopy(page[ol], page, (267 - ol) * 132);
- bzero(page[267- ol], ol * 132);
+ bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
+ bzero(page[267- ol], ol * 132 * sizeof(wchar_t));
outline -= ol;
outcol = 0;
first = 1;
@@ -228,7 +238,7 @@ void pflush(int ol)
void move(int l, int m)
{
- register char *cp, *dp;
+ register wchar_t *cp, *dp;
for (cp = page[l], dp = page[m]; *cp; cp++, dp++) {
switch (*cp) {
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index b17b8fb32..0297ccb53 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -31,35 +31,43 @@
* SUCH DAMAGE.
*/
- /* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
- */
+/*
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
+ */
#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+
+#include "widechar.h"
/*
COLRM removes unwanted columns from a file
Jeff Schriebman UC Berkeley 11-74
*/
-int getn(char *ap);
-
int
main(int argc, char **argv)
{
- register int c, ct, first, last;
+ register int ct, first, last;
+ register wint_t c;
+
+ setlocale(LC_ALL, "");
first = 0;
last = 0;
if (argc > 1)
- first = getn(*++argv);
+ first = atoi(*++argv);
if (argc > 2)
- last = getn(*++argv);
+ last = atoi(*++argv);
start:
ct = 0;
loop1:
- c = getc(stdin);
+ c = getwc(stdin);
if (feof(stdin))
goto fin;
if (c == '\t')
@@ -69,21 +77,21 @@ loop1:
else
ct++;
if (c == '\n') {
- putc(c, stdout);
+ putwc(c, stdout);
goto start;
}
if (!first || ct < first) {
- putc(c, stdout);
+ putwc(c, stdout);
goto loop1;
}
/* Loop getting rid of characters */
while (!last || ct < last) {
- c = getc(stdin);
+ c = getwc(stdin);
if (feof(stdin))
goto fin;
if (c == '\n') {
- putc(c, stdout);
+ putwc(c, stdout);
goto start;
}
if (c == '\t')
@@ -96,26 +104,16 @@ loop1:
/* Output last of the line */
for (;;) {
- c = getc(stdin);
+ c = getwc(stdin);
if (feof(stdin))
break;
- putc(c, stdout);
+ putwc(c, stdout);
if (c == '\n')
goto start;
}
fin:
fflush(stdout);
+ if (ferror(stdout) || fclose(stdout))
+ return 1;
return 0;
}
-
-int getn(char *ap)
-{
- register int n,c;
- register char *p;
-
- p = ap;
- n = 0;
- while ((c = *p++) >= '0' && c <= '9')
- n = n*10 + c - '0';
- return(n);
-}
diff --git a/text-utils/column.1 b/text-utils/column.1
index 05d6a0fd7..6c0230ae0 100644
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -85,8 +85,8 @@ is used to determine the size of
the screen if no other information is available.
.El
.Sh EXAMPLES
-.Dl (printf \&"PERM LINKS OWNER SIZE MONTH DAY HH:MM/YEAR NAME\en\&"\ \&;\ \&\e
-.Dl ls -l \&| sed 1d) \&| column -t
+.Dl (printf \&"PERM LINKS OWNER GROUP SIZE MONTH DAY HH:MM/YEAR\ NAME\en\&"\ \&\e
+.Dl \&; ls -l \&| sed 1d) \&| column -t
.Sh SEE ALSO
.Xr colrm 1 ,
.Xr ls 1 ,
diff --git a/text-utils/column.c b/text-utils/column.c
index 21236b2c8..1ad7b8dd4 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -31,22 +31,37 @@
* SUCH DAMAGE.
*/
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
+/*
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
*/
#include <sys/types.h>
#include <sys/ioctl.h>
#include <ctype.h>
-#include <err.h>
#include <limits.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include "errs.h"
#include "nls.h"
+#include "widechar.h"
+
+#ifdef ENABLE_WIDECHAR
+#define wcs_width(s) wcswidth(s,wcslen(s))
+static wchar_t *mbs_to_wcs(const char *);
+#else
+#define wcs_width(s) strlen(s)
+#define mbs_to_wcs(s) strdup(s)
+static char *mtsafe_strtok(char *, const char *, char **);
+#define wcstok mtsafe_strtok
+#endif
+
void c_columnate __P((void));
void *emalloc __P((int));
void input __P((FILE *));
@@ -60,8 +75,9 @@ int termwidth = 80; /* default terminal width */
int entries; /* number of records */
int eval; /* exit value */
int maxlength; /* longest record */
-char **list; /* array of pointers to records */
-char *separator = "\t "; /* field separator for table option */
+wchar_t **list; /* array of pointers to records */
+wchar_t default_separator[] = { '\t', ' ', 0 };
+wchar_t *separator = default_separator; /* field separator for table option */
int
main(argc, argv)
@@ -96,7 +112,7 @@ main(argc, argv)
termwidth = atoi(optarg);
break;
case 's':
- separator = optarg;
+ separator = mbs_to_wcs(optarg);
break;
case 't':
tflag = 1;
@@ -133,6 +149,8 @@ main(argc, argv)
c_columnate();
else
r_columnate();
+ if (ferror(stdout) || fclose(stdout))
+ eval = 1;
exit(eval);
}
@@ -141,29 +159,30 @@ void
c_columnate()
{
int chcnt, col, cnt, endcol, numcols;
- char **lp;
+ wchar_t **lp;
maxlength = (maxlength + TAB) & ~(TAB - 1);
numcols = termwidth / maxlength;
endcol = maxlength;
for (chcnt = col = 0, lp = list;; ++lp) {
- chcnt += printf("%s", *lp);
+ fputws(*lp, stdout);
+ chcnt += wcs_width(*lp);
if (!--entries)
break;
if (++col == numcols) {
chcnt = col = 0;
endcol = maxlength;
- putchar('\n');
+ putwchar('\n');
} else {
while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) {
- (void)putchar('\t');
+ putwchar('\t');
chcnt = cnt;
}
endcol += maxlength;
}
}
if (chcnt)
- putchar('\n');
+ putwchar('\n');
}
void
@@ -182,16 +201,17 @@ r_columnate()
for (row = 0; row < numrows; ++row) {
endcol = maxlength;
for (base = row, chcnt = col = 0; col < numcols; ++col) {
- chcnt += printf("%s", list[base]);
+ fputws(list[base], stdout);
+ chcnt += wcs_width(list[base]);
if ((base += numrows) >= entries)
break;
while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) {
- (void)putchar('\t');
+ putwchar('\t');
chcnt = cnt;
}
endcol += maxlength;
}
- putchar('\n');
+ putwchar('\n');
}
}
@@ -199,14 +219,16 @@ void
print()
{
int cnt;
- char **lp;
+ wchar_t **lp;
- for (cnt = entries, lp = list; cnt--; ++lp)
- (void)printf("%s\n", *lp);
+ for (cnt = entries, lp = list; cnt--; ++lp) {
+ fputws(*lp, stdout);
+ putwchar('\n');
+ }
}
typedef struct _tbl {
- char **list;
+ wchar_t **list;
int cols, *len;
} TBL;
#define DEFCOLS 25
@@ -215,43 +237,47 @@ void
maketbl()
{
TBL *t;
- int coloff, cnt;
- char *p, **lp;
+ int coloff, cnt, i;
+ wchar_t *p, **lp;
int *lens, maxcols;
TBL *tbl;
- char **cols;
+ wchar_t **cols;
+ wchar_t *wcstok_state;
t = tbl = emalloc(entries * sizeof(TBL));
- cols = emalloc((maxcols = DEFCOLS) * sizeof(char *));
+ cols = emalloc((maxcols = DEFCOLS) * sizeof(wchar_t *));
lens = emalloc(maxcols * sizeof(int));
for (cnt = 0, lp = list; cnt < entries; ++cnt, ++lp, ++t) {
- for (coloff = 0, p = *lp;
- (cols[coloff] = strtok(p, separator)) != NULL;
- p = NULL)
- if (++coloff == maxcols) {
- if (!(cols = realloc(cols, (u_int)maxcols +
- DEFCOLS * sizeof(char *))) ||
- !(lens = realloc(lens,
- (u_int)maxcols + DEFCOLS * sizeof(int))))
- err(1, NULL);
- memset((char *)lens + maxcols * sizeof(int),
- 0, DEFCOLS * sizeof(int));
- maxcols += DEFCOLS;
- }
- t->list = emalloc(coloff * sizeof(char *));
- t->len = emalloc(coloff * sizeof(int));
- for (t->cols = coloff; --coloff >= 0;) {
- t->list[coloff] = cols[coloff];
- t->len[coloff] = strlen(cols[coloff]);
- if (t->len[coloff] > lens[coloff])
- lens[coloff] = t->len[coloff];
+ for (coloff = 0, p = *lp;
+ (cols[coloff] = wcstok(p, separator, &wcstok_state)) != NULL;
+ p = NULL)
+ if (++coloff == maxcols) {
+ if (!(cols = realloc(cols, ((u_int)maxcols + DEFCOLS)
+ * sizeof(wchar_t *))) ||
+ !(lens = realloc(lens, ((u_int)maxcols + DEFCOLS)
+ * sizeof(int))))
+ err_nomsg(1);
+ memset((char *)lens + maxcols * sizeof(int),
+ 0, DEFCOLS * sizeof(int));
+ maxcols += DEFCOLS;
}
+ t->list = emalloc(coloff * sizeof(wchar_t *));
+ t->len = emalloc(coloff * sizeof(int));
+ for (t->cols = coloff; --coloff >= 0;) {
+ t->list[coloff] = cols[coloff];
+ t->len[coloff] = wcs_width(cols[coloff]);
+ if (t->len[coloff] > lens[coloff])
+ lens[coloff] = t->len[coloff];
+ }
}
for (cnt = 0, t = tbl; cnt < entries; ++cnt, ++t) {
- for (coloff = 0; coloff < t->cols - 1; ++coloff)
- (void)printf("%s%*s", t->list[coloff],
- lens[coloff] - t->len[coloff] + 2, " ");
- (void)printf("%s\n", t->list[coloff]);
+ for (coloff = 0; coloff < t->cols - 1; ++coloff) {
+ fputws(t->list[coloff], stdout);
+ for (i = lens[coloff] - t->len[coloff] + 2; i > 0; i--)
+ putwchar(' ');
+ }
+ fputws(t->list[coloff], stdout);
+ putwchar('\n');
}
}
@@ -264,15 +290,15 @@ input(fp)
{
static int maxentry;
int len;
- char *p, buf[MAXLINELEN];
+ wchar_t *p, buf[MAXLINELEN];
if (!list)
- list = emalloc((maxentry = DEFNUM) * sizeof(char *));
- while (fgets(buf, MAXLINELEN, fp)) {
- for (p = buf; *p && isspace(*p); ++p);
+ list = emalloc((maxentry = DEFNUM) * sizeof(wchar_t *));
+ while (fgetws(buf, MAXLINELEN, fp)) {
+ for (p = buf; *p && iswspace(*p); ++p);
if (!*p)
continue;
- if (!(p = strchr(p, '\n'))) {
+ if (!(p = wcschr(p, '\n'))) {
warnx(_("line too long"));
eval = 1;
continue;
@@ -284,13 +310,55 @@ input(fp)
if (entries == maxentry) {
maxentry += DEFNUM;
if (!(list = realloc(list,
- (u_int)maxentry * sizeof(char *))))
- err(1, NULL);
+ (u_int)maxentry * sizeof(wchar_t *))))
+ err_nomsg(1);
}
- list[entries++] = strdup(buf);
+ list[entries++] = wcsdup(buf);
}
}
+#ifdef ENABLE_WIDECHAR
+static wchar_t *mbs_to_wcs(const char *s)
+{
+ size_t n;
+ wchar_t *wcs;
+
+ n = mbstowcs((wchar_t *)0, s, 0);
+ if (n < 0)
+ return NULL;
+ wcs = malloc((n + 1) * sizeof(wchar_t));
+ if (!wcs)
+ return NULL;
+ if (mbstowcs(wcs, s, n + 1) < 0)
+ return NULL;
+ return wcs;
+}
+#endif
+
+#ifndef ENABLE_WIDECHAR
+static char *mtsafe_strtok(char *str, const char *delim, char **ptr)
+{
+ if (str == NULL) {
+ str = *ptr;
+ if (str == NULL)
+ return NULL;
+ }
+ str += strspn(str, delim);
+ if (*str == '\0') {
+ *ptr = NULL;
+ return NULL;
+ } else {
+ char *token_end = strpbrk(str, delim);
+ if (token_end) {
+ *token_end = '\0';
+ *ptr = token_end + 1;
+ } else
+ *ptr = NULL;
+ return str;
+ }
+}
+#endif
+
void *
emalloc(size)
int size;
@@ -298,7 +366,7 @@ emalloc(size)
char *p;
if (!(p = malloc(size)))
- err(1, NULL);
+ err_nomsg(1);
memset(p, 0, size);
return (p);
}
diff --git a/text-utils/more.c b/text-utils/more.c
index 4c2a179b6..771c8d2ae 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -32,9 +32,10 @@
- more nls translatable strings
1999-05-09 aeb - applied a RedHat patch (setjmp->sigsetjmp); without it
a second ^Z would fail.
- 1999-05-09 aeb - undone Kars' work, so that more works without libcurses
- (and hence can be in /bin with libcurses being in /usr/lib which may not
- be mounted). However, when termcap is not present curses can still be used.
+ 1999-05-09 aeb - undone Kars' work, so that more works without
+ libcurses (and hence can be in /bin with libcurses being in /usr/lib
+ which may not be mounted). However, when termcap is not present curses
+ can still be used.
*/
#include <stdio.h>
@@ -56,7 +57,7 @@
#include <locale.h>
#include "nls.h"
-#define HELPFILE "/usr/lib/more.help"
+/* #define MOREHELPFILE "/usr/lib/more.help" */
#define VI "/usr/bin/vi"
#define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m))
@@ -1259,7 +1260,7 @@ int command (char *filename, register FILE *f)
break;
case '?':
case 'h':
- if ((helpf = fopen (HELPFILE, "r")) == NULL)
+ if ((helpf = fopen (MOREHELPFILE, "r")) == NULL)
error (_("Can't open help file"));
if (noscroll) doclear ();
copy_file (helpf);
diff --git a/text-utils/rev.c b/text-utils/rev.c
index dbc25cd80..82b674f25 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -38,7 +38,9 @@
* 3-Jun-1998: Patched by Nicolai Langfeldt to work better on Linux:
* Handle any-length-lines. Code copied from util-linux' setpwnam.c
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
*
*/
@@ -50,6 +52,8 @@
#include <unistd.h>
#include "nls.h"
+#include "widechar.h"
+
void usage __P((void));
void warn __P((const char *, ...));
@@ -58,9 +62,10 @@ main(argc, argv)
int argc;
char *argv[];
{
- register char *filename, *t;
- size_t buflen=512;
- char *p=malloc(buflen);
+ register char *filename;
+ register wchar_t *t;
+ size_t buflen = 512;
+ wchar_t *p = malloc(buflen*sizeof(wchar_t));
size_t len;
FILE *fp;
int ch, rval;
@@ -93,9 +98,9 @@ main(argc, argv)
filename = *argv++;
}
- while (fgets(p, buflen, fp)) {
+ while (fgetws(p, buflen, fp)) {
- len = strlen(p);
+ len = wcslen(p);
/* This is my hack from setpwnam.c -janl */
while (p[len-1] != '\n' && !feof(fp)) {
@@ -104,32 +109,33 @@ main(argc, argv)
/* So now we double the buffer size */
buflen *= 2;
- p = realloc(p, buflen);
+ p = realloc(p, buflen*sizeof(wchar_t));
if (p == NULL) {
fprintf(stderr,_("Unable to allocate bufferspace\n"));
exit(1);
}
/* And fill the rest of the buffer */
- if (fgets(&p[len], buflen/2, fp) == NULL) break;
+ if (fgetws(&p[len], buflen/2, fp) == NULL) break;
- len = strlen(p);
+ len = wcslen(p);
/* That was a lot of work for nothing. Gimme perl! */
}
- t = p + len - 1 - (*(p+len-1)=='\r'
- || *(p+len-1)=='\n');
+ t = p + len - 1 - (*(p+len-1)=='\r' || *(p+len-1)=='\n');
for ( ; t >= p; --t)
- if(strcmp(t, "\0") != 0)
- putchar(*t);
- putchar('\n');
+ if (*t != 0)
+ putwchar(*t);
+ putwchar('\n');
}
+ fflush(fp);
if (ferror(fp)) {
warn("%s: %s", filename, strerror(errno));
rval = 1;
}
- (void)fclose(fp);
+ if (fclose(fp))
+ rval = 1;
} while(*argv);
exit(rval);
}
diff --git a/text-utils/ul.c b/text-utils/ul.c
index a99de9d88..7745cce4d 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -32,12 +32,13 @@
*/
/*
-** modified by Kars de Jong <jongk@cs.utwente.nl> to use terminfo instead
-** of termcap.
- 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- - added Native Language Support
-
-*/
+ * modified by Kars de Jong <jongk@cs.utwente.nl>
+ * to use terminfo instead of termcap.
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * added Native Language Support
+ * 1999-09-19 Bruno Haible <haible@clisp.cons.org>
+ * modified to work correctly in multi-byte locales
+ */
#include <stdio.h>
#include <unistd.h> /* for getopt(), isatty() */
@@ -47,6 +48,21 @@
#include <limits.h> /* for INT_MAX */
#include "nls.h"
+#include "widechar.h"
+
+#ifdef ENABLE_WIDECHAR
+static int put1wc(int c) /* Output an ASCII character as a wide character */
+{
+ if (putwchar(c) == WEOF)
+ return EOF;
+ else
+ return c;
+}
+#define putwp(s) tputs(s,1,put1wc)
+#else
+#define putwp(s) putp(s)
+#endif
+
void filter(FILE *f);
void flushln(void);
void overstrike(void);
@@ -55,7 +71,7 @@ void initbuf(void);
void fwd(void);
void reverse(void);
void initinfo(void);
-void outc(int c);
+void outc(wint_t c);
void setmode(int newmode);
void setcol(int newcol);
@@ -81,7 +97,7 @@ char *CURS_UP, *CURS_RIGHT, *CURS_LEFT,
struct CHAR {
char c_mode;
- char c_char;
+ wchar_t c_char;
} ;
struct CHAR *obuf;
@@ -92,7 +108,7 @@ int halfpos;
int upln;
int iflag;
-#define PRINT(s) if (s == NULL) /* void */; else putp(s)
+#define PRINT(s) if (s == NULL) /* void */; else putwp(s)
int main(int argc, char **argv)
{
@@ -156,14 +172,16 @@ int main(int argc, char **argv)
} else
filter(f);
}
+ if (ferror(stdout) || fclose(stdout))
+ return 1;
return 0;
}
void filter(FILE *f)
{
- int c;
+ wint_t c;
- while ((c = getc(f)) != EOF) switch(c) {
+ while ((c = getwc(f)) != WEOF) switch(c) {
case '\b':
setcol(col - 1);
@@ -186,7 +204,7 @@ void filter(FILE *f)
continue;
case IESC:
- switch (c = getc(f)) {
+ switch (c = getwc(f)) {
case HREV:
if (halfpos == 0) {
@@ -241,11 +259,11 @@ void filter(FILE *f)
case '\f':
flushln();
- putchar('\f');
+ putwchar('\f');
continue;
default:
- if (c < ' ') /* non printing */
+ if (!iswprint(c)) /* non printing */
continue;
if (obuf[col].c_char == '\0') {
obuf[col].c_char = c;
@@ -290,7 +308,7 @@ void flushln()
}
if (must_overstrike && hadmodes)
overstrike();
- putchar('\n');
+ putwchar('\n');
if (iflag && hadmodes)
iattr();
(void)fflush(stdout);
@@ -306,8 +324,12 @@ void flushln()
void overstrike()
{
register int i;
- char lbuf[256];
- register char *cp = lbuf;
+#ifdef __GNUC__
+ register wchar_t *lbuf = __builtin_alloca((maxcol+1)*sizeof(wchar_t));
+#else
+ wchar_t lbuf[256];
+#endif
+ register wchar_t *cp = lbuf;
int hadbold=0;
/* Set up overstrike buffer */
@@ -325,25 +347,29 @@ void overstrike()
hadbold=1;
break;
}
- putchar('\r');
+ putwchar('\r');
for (*cp=' '; *cp==' '; cp--)
*cp = 0;
for (cp=lbuf; *cp; cp++)
- putchar(*cp);
+ putwchar(*cp);
if (hadbold) {
- putchar('\r');
+ putwchar('\r');
for (cp=lbuf; *cp; cp++)
- putchar(*cp=='_' ? ' ' : *cp);
- putchar('\r');
+ putwchar(*cp=='_' ? ' ' : *cp);
+ putwchar('\r');
for (cp=lbuf; *cp; cp++)
- putchar(*cp=='_' ? ' ' : *cp);
+ putwchar(*cp=='_' ? ' ' : *cp);
}
}
void iattr()
{
register int i;
+#ifdef __GNUC__
+ register char *lbuf = __builtin_alloca((maxcol+1)*sizeof(char));
+#else
char lbuf[256];
+#endif
register char *cp = lbuf;
for (i=0; i<maxcol; i++)
@@ -359,8 +385,8 @@ void iattr()
for (*cp=' '; *cp==' '; cp--)
*cp = 0;
for (cp=lbuf; *cp; cp++)
- putchar(*cp);
- putchar('\n');
+ putwchar(*cp);
+ putwchar('\n');
}
void initbuf()
@@ -449,9 +475,9 @@ void initinfo()
static int curmode = 0;
-void outc(int c)
+void outc(wint_t c)
{
- putchar(c);
+ putwchar(c);
if (must_use_uc && (curmode&UNDERL)) {
PRINT(CURS_LEFT);
PRINT(UNDER_CHAR);
diff --git a/version.h b/version.h
deleted file mode 100644
index cea291deb..000000000
--- a/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define UTIL_LINUX_VERSION "2.9v"
-
-const char * const util_linux_version = "util-linux " UTIL_LINUX_VERSION;